feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix unnecessary warnings from qt about .arg

Browse Source 
Change-Id: I780dcf3ebd174275389620319e2d4b4784c84346
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2013-09-06 15:14:11 +02:00
parent f7c68f6baf
commit a3a20c5697
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidmanager.cpp
View File

@@ -914,7 +914,9 @@ QString AndroidManager::loadLocal(ProjectExplorer::Target *target, int apiLevel,
while (!libElement.isNull()) { while (!libElement.isNull()) {
if (libElement.attribute(QLatin1String("bundling")).toInt() == (item == BundledJar ? 1 : 0)) { if (libElement.attribute(QLatin1String("bundling")).toInt() == (item == BundledJar ? 1 : 0)) {
if (libElement.hasAttribute(attribute)) { if (libElement.hasAttribute(attribute)) {
QString dependencyLib = libElement.attribute(attribute).arg(apiLevel); QString dependencyLib = libElement.attribute(attribute);
if (dependencyLib.contains(QLatin1String("%1")))
dependencyLib = dependencyLib.arg(apiLevel);
if (libElement.hasAttribute(QLatin1String("extends"))) { if (libElement.hasAttribute(QLatin1String("extends"))) {
const QString extends = libElement.attribute(QLatin1String("extends")); const QString extends = libElement.attribute(QLatin1String("extends"));
if (libs.contains(extends)) { if (libs.contains(extends)) {
@@ -926,7 +928,9 @@ QString AndroidManager::loadLocal(ProjectExplorer::Target *target, int apiLevel,
} }
if (libElement.hasAttribute(QLatin1String("replaces"))) { if (libElement.hasAttribute(QLatin1String("replaces"))) {
QString replacedLib = libElement.attribute(QLatin1String("replaces")).arg(apiLevel); QString replacedLib = libElement.attribute(QLatin1String("replaces"));
if (replacedLib.contains(QLatin1String("%1")))
replacedLib = replacedLib.arg(apiLevel);
if (!replacedLibs.contains(replacedLib)) if (!replacedLibs.contains(replacedLib))
replacedLibs << replacedLib; replacedLibs << replacedLib;
} }