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 <ABBAPOH@gmail.com>

1 files changed, 0 insertions, 53 deletions

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()