Android: remove ministro deployment option

Task-number: QTCREATORBUG-23761
Change-Id: I5be3c78a009f1747a3ccf7a6bd342969d2b8ece4
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: hjk <hjk@qt.io>

src/plugins/android/androidbuildapkstep.cpp

@@ -85,7 +85,6 @@ const QVersionNumber gradleScriptRevokedSdkVersion(25, 3, 0);
 const char KeystoreLocationKey[] = "KeystoreLocation";
 const char BuildTargetSdkKey[] = "BuildTargetSdk";
 const char VerboseOutputKey[] = "VerboseOutput";
-const char UseMinistroKey[] = "UseMinistro";
 
 static void setupProcessParameters(ProcessParameters *pp,
                                    BuildStep *step,
@@ -234,9 +233,6 @@ bool AndroidBuildApkStep::init()
     if (m_buildAAB)
         arguments << "--aab" <<  "--jarsigner";
 
-    if (m_useMinistro)
-        arguments << "--deployment" << "ministro";
-
     QStringList argumentsPasswordConcealed = arguments;
 
     if (m_signPackage) {
@@ -489,7 +485,6 @@ bool AndroidBuildApkStep::fromMap(const QVariantMap &map)
                                                           sdkManager()->latestAndroidSdkPlatform());
     }
     m_verbose = map.value(VerboseOutputKey).toBool();
-    m_useMinistro = map.value(UseMinistroKey).toBool();
     return ProjectExplorer::BuildStep::fromMap(map);
 }
 
@@ -499,7 +494,6 @@ QVariantMap AndroidBuildApkStep::toMap() const
     map.insert(KeystoreLocationKey, m_keystorePath.toString());
     map.insert(BuildTargetSdkKey, m_buildTargetSdk);
     map.insert(VerboseOutputKey, m_verbose);
-    map.insert(UseMinistroKey, m_useMinistro);
     return map;
 }
 
@@ -596,16 +590,6 @@ void AndroidBuildApkStep::setVerboseOutput(bool verbose)
     m_verbose = verbose;
 }
 
-bool AndroidBuildApkStep::useMinistro() const
-{
-    return m_useMinistro;
-}
-
-void AndroidBuildApkStep::setUseMinistro(bool useMinistro)
-{
-    m_useMinistro = useMinistro;
-}
-
 bool AndroidBuildApkStep::addDebugger() const
 {
     return m_addDebugger;

src/plugins/android/androidbuildapkstep.h

@@ -68,9 +68,6 @@ public:
     bool verboseOutput() const;
     void setVerboseOutput(bool verbose);
 
-    bool useMinistro() const;
-    void setUseMinistro(bool b);
-
     bool addDebugger() const;
     void setAddDebugger(bool debug);
 
@@ -94,7 +91,6 @@ private:
     bool m_buildAAB = false;
     bool m_signPackage = false;
     bool m_verbose = false;
-    bool m_useMinistro = false;
     bool m_openPackageLocation = false;
     bool m_openPackageLocationForRun = false;
     bool m_addDebugger = true;

src/plugins/android/androidbuildapkwidget.cpp

@@ -224,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}) {
@@ -241,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); });

src/plugins/android/androiddeployqtstep.cpp

@@ -108,15 +108,15 @@ public:
         auto resetDefaultDevices = new QPushButton(this);
         resetDefaultDevices->setText(AndroidDeployQtStep::tr("Reset Default Devices"));
 
-        auto installMinistroButton = new QPushButton(this);
+        auto installCustomApkButton = new QPushButton(this);
-        installMinistroButton->setText(AndroidDeployQtStep::tr("Install Ministro from APK"));
+        installCustomApkButton->setText(AndroidDeployQtStep::tr("Install an APK File"));
 
-        connect(installMinistroButton, &QAbstractButton::clicked, this, [this, step] {
+        connect(installCustomApkButton, &QAbstractButton::clicked, this, [this, step] {
-            QString packagePath =
+            const QString packagePath
-                    QFileDialog::getOpenFileName(this,
+                = QFileDialog::getOpenFileName(this,
-                                                 AndroidDeployQtStep::tr("Qt Android Smart Installer"),
+                                               AndroidDeployQtStep::tr("Qt Android Installer"),
-                                                 QDir::homePath(),
+                                               QDir::homePath(),
-                                                 AndroidDeployQtStep::tr("Android package (*.apk)"));
+                                               AndroidDeployQtStep::tr("Android package (*.apk)"));
             if (!packagePath.isEmpty())
                 AndroidManager::installQASIPackage(step->target(), packagePath);
         });
@@ -131,7 +131,7 @@ public:
         auto layout = new QVBoxLayout(this);
         layout->addWidget(uninstallPreviousPackage);
         layout->addWidget(resetDefaultDevices);
-        layout->addWidget(installMinistroButton);
+        layout->addWidget(installCustomApkButton);
     }
 };
 
@@ -252,11 +252,6 @@ bool AndroidDeployQtStep::init()
                                            "--no-build",
                                            "--input", jsonFile});
 
-            if (androidBuildApkStep && androidBuildApkStep->useMinistro()) {
-                qCDebug(deployStepLog) << "Using ministro";
-                m_androiddeployqtArgs.addArgs({"--deployment", "ministro"});
-            }
-
             m_androiddeployqtArgs.addArg("--gradle");
 
             if (androidBuildApkStep && androidBuildApkStep->signPackage()) {