1 files changed, 5 insertions, 13 deletions

diff --git a/src/plugins/android/androidbuildapkwidget.cpp b/src/plugins/android/androidbuildapkwidget.cpp
index 66be50dca7..6439279c48 100644
--- a/src/plugins/android/androidbuildapkwidget.cpp
+++ b/src/plugins/android/androidbuildapkwidget.cpp
@@ -38,7 +38,6 @@
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectnodes.h>
-#include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 
 #include <qtsupport/qtkitinformation.h>
@@ -225,12 +224,6 @@ QWidget *AndroidBuildApkWidget::createAdvancedGroup()
     auto verboseOutputCheckBox = new QCheckBox(tr("Verbose output"), group);
     verboseOutputCheckBox->setChecked(m_step->verboseOutput());
 
-    auto ministroOption = new QCheckBox(tr("Use Ministro service to install Qt"), group);
-    ministroOption->setToolTip(tr("Uses the external Ministro application to download and maintain Qt libraries."));
-    ministroOption->setChecked(m_step->useMinistro());
-    connect(ministroOption, &QAbstractButton::clicked,
-            m_step, &AndroidBuildApkStep::setUseMinistro);
-
     auto vbox = new QVBoxLayout(group);
     QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(step()->target()->kit());
     if (version && version->qtVersion() >= QtSupport::QtVersionNumber{5,14}) {
@@ -242,7 +235,6 @@ QWidget *AndroidBuildApkWidget::createAdvancedGroup()
     vbox->addWidget(openPackageLocationCheckBox);
     vbox->addWidget(verboseOutputCheckBox);
     vbox->addWidget(m_addDebuggerCheckBox);
-    vbox->addWidget(ministroOption);
 
     connect(verboseOutputCheckBox, &QAbstractButton::toggled,
             this, [this](bool checked) { m_step->setVerboseOutput(checked); });
@@ -257,7 +249,7 @@ QWidget *AndroidBuildApkWidget::createCreateTemplatesGroup()
 
     auto createAndroidTemplatesButton = new QPushButton(tr("Create Templates"));
     connect(createAndroidTemplatesButton, &QAbstractButton::clicked, this, [this] {
-        CreateAndroidManifestWizard wizard(m_step->buildConfiguration()->buildSystem());
+        CreateAndroidManifestWizard wizard(m_step->buildSystem());
         wizard.exec();
     });
 
@@ -273,7 +265,7 @@ QWidget *AndroidBuildApkWidget::createAdditionalLibrariesGroup()
     auto group = new QGroupBox(tr("Additional Libraries"));
     group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 
-    auto libsModel = new AndroidExtraLibraryListModel(m_step->target(), this);
+    auto libsModel = new AndroidExtraLibraryListModel(m_step->buildSystem(), this);
     connect(libsModel, &AndroidExtraLibraryListModel::enabledChanged, this,
             [this, group](const bool enabled) {
                 group->setEnabled(enabled);
@@ -329,8 +321,8 @@ QWidget *AndroidBuildApkWidget::createAdditionalLibrariesGroup()
     });
 
     Target *target = m_step->target();
-    RunConfiguration *rc = target->activeRunConfiguration();
-    const ProjectNode *node = rc ? target->project()->findNodeForBuildKey(rc->buildKey()) : nullptr;
+    const QString buildKey = target->activeBuildKey();
+    const ProjectNode *node = target->project()->findNodeForBuildKey(buildKey);
     group->setEnabled(node && !node->parseInProgress());
 
     return group;
@@ -406,7 +398,7 @@ void AndroidBuildApkWidget::setCertificates()
 
 void AndroidBuildApkWidget::updateSigningWarning()
 {
-    bool nonRelease = m_step->buildConfiguration()->buildType() != BuildConfiguration::Release;
+    bool nonRelease = m_step->buildType() != BuildConfiguration::Release;
     bool visible = m_step->signPackage() && nonRelease;
     m_signingDebugWarningLabel->setVisible(visible);
 }