From 7a0ae399881b728d4ae088b20c646c8a58114733 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 18 Feb 2019 11:18:05 +0100 Subject: [PATCH] Android: Remove some indirection when finding the minimum NDK One instance had (base) qt version already at hand, the other was inside AndroidQtVersion itself. Also remove the typo in the function name. Change-Id: I8fb0a1cd11751e4dea1f29a99603ea6b0112c49e Reviewed-by: Christian Stenger --- src/plugins/android/androiddebugsupport.cpp | 8 ++++++-- src/plugins/android/androidmanager.cpp | 6 ------ src/plugins/android/androidmanager.h | 1 - src/plugins/android/androidqtversion.cpp | 4 ++-- src/plugins/android/androidqtversion.h | 3 ++- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 837a4dc5374..045e9d3e83d 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -29,6 +29,7 @@ #include "androidglobal.h" #include "androidrunner.h" #include "androidmanager.h" +#include "androidqtversion.h" #include #include @@ -186,8 +187,11 @@ void AndroidDebugSupport::start() gdbServer.setPort(m_runner->gdbServerPort().number()); setRemoteChannel(gdbServer); - int sdkVersion = qMax(AndroidManager::minimumSDK(target->kit()), - AndroidManager::minimumNDK(target->kit())); + auto qt = static_cast(qtVersion); + QTC_CHECK(qt); + const int minimumNdk = qt ? qt->minimumNDK() : 0; + + int sdkVersion = qMax(AndroidManager::minimumSDK(target->kit()), minimumNdk); Utils::FileName sysRoot = AndroidConfigurations::currentConfig().ndkLocation() .appendPath("platforms") .appendPath(QString("android-%1").arg(sdkVersion)) diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 62e9f0591c1..eb689fdf0ba 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -248,12 +248,6 @@ int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit) return minSDKVersion; } -int AndroidManager::minimumNDK(const Kit *kit) -{ - auto qt = static_cast(QtSupport::QtKitAspect::qtVersion(kit)); - return qt->mininmumNDK(); -} - QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target) { if (auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration())) diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index e624f2dd1d4..7766625c943 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -86,7 +86,6 @@ public: static int minimumSDK(ProjectExplorer::Target *target); static int minimumSDK(const ProjectExplorer::Kit *kit); - static int minimumNDK(const ProjectExplorer::Kit *kit); static QString targetArch(ProjectExplorer::Target *target); diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 576e22c8d04..2bfeb60b0e2 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -99,7 +99,7 @@ void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) c env.set(QLatin1String("ANDROID_NDK_HOST"), config.toolchainHost()); env.set(QLatin1String("ANDROID_NDK_ROOT"), config.ndkLocation().toUserOutput()); env.set(QLatin1String("ANDROID_NDK_PLATFORM"), - config.bestNdkPlatformMatch(qMax(AndroidManager::minimumNDK(k), AndroidManager::minimumSDK(k)))); + config.bestNdkPlatformMatch(qMax(minimumNDK(), AndroidManager::minimumSDK(k)))); } Utils::Environment AndroidQtVersion::qmakeRunEnvironment() const @@ -121,7 +121,7 @@ QString AndroidQtVersion::targetArch() const return m_targetArch; } -int AndroidQtVersion::mininmumNDK() const +int AndroidQtVersion::minimumNDK() const { ensureMkSpecParsed(); return m_minNdk; diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h index 7cfcd441236..5a448cf1cc1 100644 --- a/src/plugins/android/androidqtversion.h +++ b/src/plugins/android/androidqtversion.h @@ -55,7 +55,8 @@ public: QString description() const override; QString targetArch() const; - int mininmumNDK() const; + int minimumNDK() const; + protected: void parseMkSpec(ProFileEvaluator *) const override; private: