Project managers: Replace various uses of ProjectConfiguration::target()

Some were wrong, others unneeded.

Change-Id: I308288e75f8d1b192863171661d72d27f1e6da07
Reviewed-by: hjk <[email protected]>

4 files changed, 16 insertions, 23 deletions

diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 80d55e15c09..0a7a9d03c2e 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -909,7 +909,7 @@ Tasking::GroupItem AndroidBuildApkStep::runRecipe()
             return false;
         }
 
-        const auto androidAbis = applicationAbis(target());
+        const auto androidAbis = applicationAbis(kit());
         const QString buildKey = buildConfiguration()->activeBuildKey();
         const FilePath buildDir = buildDirectory();
         const FilePath androidBuildDir = androidBuildDirectory(buildConfiguration());
@@ -956,7 +956,7 @@ Tasking::GroupItem AndroidBuildApkStep::runRecipe()
         if (targets.isEmpty())
             return inputExists; // qmake does this job for us
 
-        QJsonObject deploySettings = deploymentSettings(target());
+        QJsonObject deploySettings = deploymentSettings(kit());
         QString applicationBinary;
         if (!version->supportsMultipleQtAbis()) {
             QTC_ASSERT(androidAbis.size() == 1, return false);
@@ -1164,7 +1164,7 @@ QVariant AndroidBuildApkStep::data(Utils::Id id) const
         return QVariant::fromValue(AndroidConfig::sdkLocation());
 
     if (id == Constants::AndroidMkSpecAbis)
-        return applicationAbis(target());
+        return applicationAbis(kit());
 
     return AbstractProcessStep::data(id);
 }
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 4a2d03f4312..cf7f6117119 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -176,7 +176,7 @@ bool AndroidDeployQtStep::init()
 
     m_androiddeployqtArgs = {};
 
-    const QStringList androidABIs = applicationAbis(target());
+    const QStringList androidABIs = applicationAbis(kit());
     if (androidABIs.isEmpty()) {
         reportWarningOrError(Tr::tr("No Android architecture (ABI) is set by the project."),
                              Task::Error);
@@ -189,10 +189,6 @@ bool AndroidDeployQtStep::init()
     RunConfiguration *rc = buildConfiguration()->activeRunConfiguration();
     QTC_ASSERT(rc, reportWarningOrError(Tr::tr("The kit's run configuration is invalid."), Task::Error);
             return false);
-    BuildConfiguration *bc = target()->activeBuildConfiguration();
-    QTC_ASSERT(bc, reportWarningOrError(Tr::tr("The kit's build configuration is invalid."),
-                                        Task::Error);
-            return false);
 
     const int minTargetApi = minimumSDK(buildConfiguration());
     qCDebug(deployStepLog) << "Target architecture:" << androidABIs
@@ -297,7 +293,7 @@ bool AndroidDeployQtStep::init()
         if (buildType() == BuildConfiguration::Release)
             m_androiddeployqtArgs.addArgs({"--release"});
 
-        auto androidBuildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
+        auto androidBuildApkStep = stepList()->firstOfType<AndroidBuildApkStep>();
         if (androidBuildApkStep && androidBuildApkStep->signPackage()) {
             // The androiddeployqt tool is not really written to do stand-alone installations.
             // This hack forces it to use the correct filename for the apk file when installing
@@ -307,7 +303,7 @@ bool AndroidDeployQtStep::init()
         }
     }
 
-    m_environment = bc->environment();
+    m_environment = buildConfiguration()->environment();
 
     m_adbPath = AndroidConfig::adbToolPath();
     return true;
@@ -537,11 +533,8 @@ QWidget *AndroidDeployQtStep::createConfigWidget()
             return;
 
         // TODO: Write error messages on all the early returns below.
-        Target *currentTarget = target();
-        if (currentTarget == nullptr)
-            return;
 
-        const QStringList appAbis = applicationAbis(currentTarget);
+        const QStringList appAbis = applicationAbis(kit());
         if (appAbis.isEmpty())
             return;
 
@@ -595,7 +588,7 @@ QWidget *AndroidDeployQtStep::createConfigWidget()
         };
 
         TaskTreeRunner *runner = new TaskTreeRunner;
-        runner->setParent(currentTarget);
+        runner->setParent(target());
         runner->start(recipe);
     });
 
diff --git a/src/plugins/android/androidutils.cpp b/src/plugins/android/androidutils.cpp
index 0156ee818ab..b8c1722cd85 100644
--- a/src/plugins/android/androidutils.cpp
+++ b/src/plugins/android/androidutils.cpp
@@ -223,9 +223,9 @@ QString buildTargetSDK(const BuildConfiguration *bc)
     return fallback;
 }
 
-QStringList applicationAbis(const Target *target)
+QStringList applicationAbis(const Kit *k)
 {
-    auto qt = dynamic_cast<AndroidQtVersion *>(QtSupport::QtKitAspect::qtVersion(target->kit()));
+    auto qt = dynamic_cast<AndroidQtVersion *>(QtSupport::QtKitAspect::qtVersion(k));
     return qt ? qt->androidAbis() : QStringList();
 }
 
@@ -241,13 +241,13 @@ QString archTriplet(const QString &abi)
     return {"arm-linux-androideabi"};
 }
 
-QJsonObject deploymentSettings(const Target *target)
+QJsonObject deploymentSettings(const Kit *k)
 {
-    QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit());
+    QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(k);
     if (!qt)
         return {};
 
-    auto tc = ToolchainKitAspect::cxxToolchain(target->kit());
+    auto tc = ToolchainKitAspect::cxxToolchain(k);
     if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID)
         return {};
     QJsonObject settings;
@@ -256,7 +256,7 @@ QJsonObject deploymentSettings(const Target *target)
     settings["ndk"] = AndroidConfig::ndkLocation(qt).toFSPathString();
     settings["sdk"] = AndroidConfig::sdkLocation().toFSPathString();
     if (!qt->supportsMultipleQtAbis()) {
-        const QStringList abis = applicationAbis(target);
+        const QStringList abis = applicationAbis(k);
         QTC_ASSERT(abis.size() == 1, return {});
         settings["stdcpp-path"] = (AndroidConfig::toolchainPath(qt) / "sysroot/usr/lib"
                                    / archTriplet(abis.first()) / "libc++_shared.so")
diff --git a/src/plugins/android/androidutils.h b/src/plugins/android/androidutils.h
index a640589db02..6e8c5da9355 100644
--- a/src/plugins/android/androidutils.h
+++ b/src/plugins/android/androidutils.h
@@ -49,7 +49,7 @@ int minimumSDK(const ProjectExplorer::BuildConfiguration *bc);
 int minimumSDK(const ProjectExplorer::Kit *kit);
 int defaultMinimumSDK(const QtSupport::QtVersion *qtVersion);
 
-QStringList applicationAbis(const ProjectExplorer::Target *target);
+QStringList applicationAbis(const ProjectExplorer::Kit *k);
 QString archTriplet(const QString &abi);
 
 bool isQt5CmakeProject(const ProjectExplorer::Target *target);
@@ -64,7 +64,7 @@ bool skipInstallationAndPackageSteps(const ProjectExplorer::BuildConfiguration *
 
 QString androidNameForApiLevel(int x);
 
-QJsonObject deploymentSettings(const ProjectExplorer::Target *target);
+QJsonObject deploymentSettings(const ProjectExplorer::Kit *k);
 bool isQtCreatorGenerated(const Utils::FilePath &deploymentFile);
 
 QStringList adbSelector(const QString &serialNumber);