From a3a20c5697f328850d53b8e26b85f737c75e8b3a Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Fri, 6 Sep 2013 15:14:11 +0200 Subject: [PATCH] Android: Fix unnecessary warnings from qt about .arg Change-Id: I780dcf3ebd174275389620319e2d4b4784c84346 Reviewed-by: Daniel Teske Reviewed-by: BogDan Vatra --- src/plugins/android/androidmanager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 83b76968923..8ed38e3e927 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -914,7 +914,9 @@ QString AndroidManager::loadLocal(ProjectExplorer::Target *target, int apiLevel, while (!libElement.isNull()) { if (libElement.attribute(QLatin1String("bundling")).toInt() == (item == BundledJar ? 1 : 0)) { 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"))) { const QString extends = libElement.attribute(QLatin1String("extends")); if (libs.contains(extends)) { @@ -926,7 +928,9 @@ QString AndroidManager::loadLocal(ProjectExplorer::Target *target, int apiLevel, } 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)) replacedLibs << replacedLib; }