1 files changed, 12 insertions, 7 deletions
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp
index 9b6a2df57c..0a3f80e75f 100644
--- a/src/plugins/android/androidqtversion.cpp
+++ b/src/plugins/android/androidqtversion.cpp
@@ -42,6 +42,8 @@
 
 #include <proparser/profileevaluator.h>
 
+#include <QRegularExpression>
+
 using namespace ProjectExplorer;
 
 namespace Android {
@@ -124,7 +126,9 @@ Abis AndroidQtVersion::detectQtAbis() const
 
 void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const
 {
-    const AndroidConfig &config =AndroidConfigurations::currentConfig();
+    BaseQtVersion::addToEnvironment(k, env);
+
+    const AndroidConfig &config = AndroidConfigurations::currentConfig();
     // this env vars are used by qmake mkspecs to generate makefiles (check QTDIR/mkspecs/android-g++/qmake.conf for more info)
     env.set(QLatin1String("ANDROID_NDK_HOST"), config.toolchainHost(this));
     env.set(QLatin1String("ANDROID_NDK_ROOT"), config.ndkLocation(this).toUserOutput());
@@ -166,10 +170,11 @@ void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
         m_androidAbis = QStringList{evaluator->value("ANDROID_TARGET_ARCH")};
     const QString androidPlatform = evaluator->value("ANDROID_PLATFORM");
     if (!androidPlatform.isEmpty()) {
-        const QRegExp regex("android-(\\d+)");
-        if (regex.exactMatch(androidPlatform)) {
+        const QRegularExpression regex("android-(\\d+)");
+        const QRegularExpressionMatch match = regex.match(androidPlatform);
+        if (match.hasMatch()) {
             bool ok = false;
-            int tmp = regex.cap(1).toInt(&ok);
+            int tmp = match.captured(1).toInt(&ok);
             if (ok)
                 m_minNdk = tmp;
         }
@@ -177,16 +182,16 @@ void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
     BaseQtVersion::parseMkSpec(evaluator);
 }
 
-QSet<Core::Id> AndroidQtVersion::availableFeatures() const
+QSet<Utils::Id> AndroidQtVersion::availableFeatures() const
 {
-    QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
+    QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
     features.insert(QtSupport::Constants::FEATURE_MOBILE);
     features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
     features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
     return features;
 }
 
-QSet<Core::Id> AndroidQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> AndroidQtVersion::targetDeviceTypes() const
 {
     return {Constants::ANDROID_DEVICE_TYPE};
 }