Android: Fix multiple clang clazy warnings

Change-Id: I2ea6cebd16c09a8a4502f4719d99a9d85e5e7d02
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

1 files changed, 4 insertions, 6 deletions

diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index cf50cee401..739cb6b1cb 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -80,11 +80,8 @@ const QLatin1String AndroidManifestName("AndroidManifest.xml");
 const QLatin1String AndroidDeviceSn("AndroidDeviceSerialNumber");
 const QLatin1String AndroidDeviceAbis("AndroidDeviceAbis");
 const QLatin1String ApiLevelKey("AndroidVersion.ApiLevel");
-const QString packageNameRegEx("(?<token>package: )(.*?)(name=)'(?<target>.*?)'");
-const QString activityRegEx("(?<token>launchable-activity: )(.*?)(name=)'(?<target>.*?)'");
-const QString apkVersionRegEx("(?<token>package: )(.*?)(versionCode=)'(?<target>.*?)'");
-const QString versionCodeRegEx("(?<token>versionCode=)(?<version>\\d*)");
-const QString qtcSignature("This file is generated by QtCreator to be read by androiddeployqt and should not be modified by hand.");
+const char qtcSignature[] = "This file is generated by QtCreator to be read by androiddeployqt "
+                            "and should not be modified by hand.";
 
 static Q_LOGGING_CATEGORY(androidManagerLog, "qtc.android.androidManager", QtWarningMsg)
 
@@ -378,7 +375,8 @@ QString AndroidManager::apkDevicePreferredAbi(const Target *target)
                                 target);
     }
     QStringList apkAbis;
-    for (const auto &abi : QDir{libsPath.toString()}.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
+    const auto libsPaths = QDir{libsPath.toString()}.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    for (const auto &abi : libsPaths)
         if (!QDir{libsPath.pathAppended(abi).toString()}.entryList(QStringList("*.so"), QDir::Files | QDir::NoDotAndDotDot).isEmpty())
             apkAbis << abi;
     return preferredAbi(apkAbis, target);