diff options
| author | Raphael Cotty <raphael.cotty@gmail.com> | 2021-05-23 20:50:43 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2021-05-24 11:47:08 +0000 |
| commit | 8ac3865fe9b9cdcd0f58bf0b6e7b08b60a8d374c (patch) | |
| tree | eba92ee617bcd352f170b8994ec8926b90a1d9c6 /share | |
| parent | 0df9ff8e3efa695aed76107673bff9eca355fe13 (diff) | |
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>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/android_support.qbs | 61 |
1 files changed, 27 insertions, 34 deletions
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) |