Android: Remove Ministro support

Latest Qt with Ministro is 5.7. So let's remove it form Qbs.

Change-Id: Iee03c06c4c2e5c806dc99025a5bf2c200894ec60
Reviewed-by: Ivan Komissarov <[email protected]>

3 files changed, 27 insertions, 98 deletions

diff --git a/doc/reference/modules/qt-android_support-module.qdoc b/doc/reference/modules/qt-android_support-module.qdoc
index 67348ebc0..f8f8368c5 100644
--- a/doc/reference/modules/qt-android_support-module.qdoc
+++ b/doc/reference/modules/qt-android_support-module.qdoc
@@ -38,17 +38,6 @@
 */
 
 /*!
-    \qmlproperty bool Qt.android_support::useMinistro
-
-    Whether or not to use the Ministro service. If this property is enabled, then
-    the Qt libraries required by your application as well as some other resources
-    will not be packaged into the APK file, but are expected to be present on the
-    device at run time.
-
-    \defaultvalue \c false
-*/
-
-/*!
     \qmlproperty string Qt.android_support::qmlRootDir
 
     The root directory of the product's QML files. This information is passed to
diff --git a/share/qbs/module-providers/Qt/templates/android_support.qbs b/share/qbs/module-providers/Qt/templates/android_support.qbs
index da4c1bd8b..4ce1364ea 100644
--- a/share/qbs/module-providers/Qt/templates/android_support.qbs
+++ b/share/qbs/module-providers/Qt/templates/android_support.qbs
@@ -8,7 +8,6 @@ import qbs.Xml
 
 Module {
     version: @version@
-    property bool useMinistro: false
     property string qmlRootDir: product.sourceDirectory
     property stringList extraPrefixDirs
     property stringList deploymentDependencies // qmake: ANDROID_DEPLOYMENT_DEPENDENCIES
@@ -280,39 +279,33 @@ Module {
             "android.manifest_final", "android.resources", "android.assets", "bundled_jar",
             "android.deployqt_list",
         ]
-        outputArtifacts: {
-            var artifacts = [
-                {
-                    filePath: "AndroidManifest.xml",
-                    fileTags: "android.manifest_final"
-                },
-                {
-                    filePath: product.Qt.android_support._deployQtOutDir + "/res/values/libs.xml",
-                    fileTags: "android.resources"
-                },
-                {
-                    filePath: product.Qt.android_support._deployQtOutDir
-                              + "/res/values/strings.xml",
-                    fileTags: "android.resources"
-                },
-                {
-                    filePath: product.Qt.android_support._deployQtOutDir + "/assets/.dummy",
-                    fileTags: "android.assets"
-                },
-                {
-                    filePath: "deployqt.list",
-                    fileTags: "android.deployqt_list"
-                },
-
-            ];
-            if (!product.Qt.android_support.useMinistro) {
-                artifacts.push({
-                    filePath: FileInfo.joinPaths(product.java.classFilesDir, "QtAndroid.jar"),
-                    fileTags: ["bundled_jar"]
-                });
+        outputArtifacts: [
+            {
+                filePath: "AndroidManifest.xml",
+                fileTags: "android.manifest_final"
+            },
+            {
+                filePath: product.Qt.android_support._deployQtOutDir + "/res/values/libs.xml",
+                fileTags: "android.resources"
+            },
+            {
+                filePath: product.Qt.android_support._deployQtOutDir
+                          + "/res/values/strings.xml",
+                fileTags: "android.resources"
+            },
+            {
+                filePath: product.Qt.android_support._deployQtOutDir + "/assets/.dummy",
+                fileTags: "android.assets"
+            },
+            {
+                filePath: "deployqt.list",
+                fileTags: "android.deployqt_list"
+            },
+            {
+                filePath: FileInfo.joinPaths(product.java.classFilesDir, "QtAndroid.jar"),
+                fileTags: "bundled_jar"
             }
-            return artifacts;
-        }
+        ]
         prepare: {
             var copyCmd = new JavaScriptCommand();
             copyCmd.description = "copying Qt resource templates";
@@ -343,7 +336,7 @@ Module {
             var androidDeployQtArgs = [
                 "--output", product.Qt.android_support._deployQtOutDir,
                 "--input", inputs["qt_androiddeployqt_input"][0].filePath, "--aux-mode",
-                "--deployment", product.Qt.android_support.useMinistro ? "ministro" : "bundled",
+                "--deployment", "bundled",
                 "--android-platform", product.Android.sdk.platform,
             ];
             if (product.Qt.android_support.verboseAndroidDeployQt)
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp
index df48c35e9..c56ee4f43 100644
--- a/tests/auto/blackbox/tst_blackboxandroid.cpp
+++ b/tests/auto/blackbox/tst_blackboxandroid.cpp
@@ -651,27 +651,6 @@ void TestBlackboxAndroid::android_data()
         return expectedFile;
     };
 
-    auto qmlAppMinistroExpectedFiles = [&](bool generateAab, bool enableAapt2) {
-        QByteArrayList expectedFile;
-        if (singleArchQt) {
-            expectedFile << commonFiles(generateAab) + expandArchs(ndkArchsForQt, {
-                        "assets/--Added-by-androiddeployqt--/qt_cache_pregenerated_file_list",
-                        cxxLibPath("libgnustl_shared.so", true),
-                        "lib/${ARCH}/libqmlapp.so"}, generateAab);
-        } else {
-            expectedFile << commonFiles(generateAab) + expandArchs(ndkArchsForQt, {
-                        "assets/android_rcc_bundle.rcc",
-                        cxxLibPath("libgnustl_shared.so", true),
-                        "lib/${ARCH}/libqmlapp_${ARCH}.so"}, generateAab);
-        }
-        if (generateAab)
-            expectedFile << "base/resources.pb" << "base/assets.pb" << "base/native.pb";
-        else
-            expectedFile << "resources.arsc";
-        if (!enableAapt2 && version < qbs::Version(6, 0))
-            expectedFile << "res/layout/splash.xml";
-        return expectedFile;
-    };
     auto qmlAppCustomMetaDataExpectedFiles = [&](bool generateAab, bool enableAapt2) {
         QByteArrayList expectedFile;
         if (singleArchQt) {
@@ -847,38 +826,6 @@ void TestBlackboxAndroid::android_data()
             << enableAapt2 << generateAab << isIncrementalBuild;
     enableAapt2 = false;
     generateAab = false;
-    isIncrementalBuild = true;
-    QTest::newRow("qml app using Ministro")
-            << "qml-app" << QStringList("qmlapp")
-            << (QList<QByteArrayList>() << (QByteArrayList()
-                                            << qmlAppMinistroExpectedFiles(generateAab,
-                                                                           enableAapt2)))
-            << (QStringList() << "modules.Qt.android_support.useMinistro:true"
-                << "modules.Android.sdk.automaticSources:false" << aaptVersion(enableAapt2)
-                << packageType(generateAab))
-            << enableAapt2 << generateAab << isIncrementalBuild;
-    enableAapt2 = true;
-    QTest::newRow("qml app using Ministro aapt2")
-            << "qml-app" << QStringList("qmlapp")
-            << (QList<QByteArrayList>() << qmlAppMinistroExpectedFiles(generateAab,
-                                                                       enableAapt2))
-            << (QStringList() << "modules.Qt.android_support.useMinistro:true"
-                << "modules.Android.sdk.automaticSources:false" << aaptVersion(enableAapt2)
-                << packageType(generateAab))
-            << enableAapt2 << generateAab << isIncrementalBuild;
-    generateAab = true;
-    if (!singleArchQt) {
-        QTest::newRow("qml app using Ministro aab")
-                << "qml-app" << QStringList("qmlapp")
-                << (QList<QByteArrayList>() << qmlAppMinistroExpectedFiles(generateAab,
-                                                                           enableAapt2))
-                << (QStringList() << "modules.Qt.android_support.useMinistro:true"
-                    << "modules.Android.sdk.automaticSources:false" << aaptVersion(enableAapt2)
-                    << packageType(generateAab))
-                << enableAapt2 << generateAab << isIncrementalBuild;
-    }
-    enableAapt2 = false;
-    generateAab = false;
     QTest::newRow("qml app with custom metadata")
             << "qml-app" << QStringList("qmlapp")
             << (QList<QByteArrayList>() << (QByteArrayList()