diff options
author | Richard Weickelt <richard@weickelt.de> | 2020-11-28 10:57:09 +0100 |
---|---|---|
committer | Richard Weickelt <richard@weickelt.de> | 2020-11-28 10:57:09 +0100 |
commit | 629324365334e3a027f53522e8c63980fa2fe8e5 (patch) | |
tree | 646dda897f6b1179c0b20d2a40f3410ff4f13592 /share/qbs/module-providers/Qt/templates/android_support.qbs | |
parent | 625e6b3256b66e995a7b2f073083e3f7395ce4ba (diff) | |
parent | 578b6d6978d7b42baefd85277c0d332f36142c65 (diff) |
Merge branch '1.18' into master
Change-Id: If77ea1a92f64a4b6910c4755aa03dd96ec5078fb
Diffstat (limited to 'share/qbs/module-providers/Qt/templates/android_support.qbs')
-rw-r--r-- | share/qbs/module-providers/Qt/templates/android_support.qbs | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/share/qbs/module-providers/Qt/templates/android_support.qbs b/share/qbs/module-providers/Qt/templates/android_support.qbs index 1deedb0a7..bdbb0e43b 100644 --- a/share/qbs/module-providers/Qt/templates/android_support.qbs +++ b/share/qbs/module-providers/Qt/templates/android_support.qbs @@ -15,8 +15,9 @@ Module { property stringList extraLibs // qmake: ANDROID_EXTRA_LIBS property bool verboseAndroidDeployQt: false - property string _androidDeployQtFilePath: FileInfo.joinPaths(_qtInstallDir, "bin", + property string _androidDeployQtFilePath: FileInfo.joinPaths(_qtBinaryDir, "bin", "androiddeployqt") + property string _qtBinaryDir property string _qtInstallDir // TODO: Remove in 1.20 // From 1.20 product property used from an export item will point to the @@ -54,9 +55,14 @@ Module { } Properties { condition: _enableSdkSupport && Utilities.versionCompare(version, "5.15") >= 0 + && Utilities.versionCompare(version, "6.0") < 0 java.additionalClassPaths: [FileInfo.joinPaths(_qtInstallDir, "jar", "QtAndroid.jar")] } Properties { + condition: _enableSdkSupport && Utilities.versionCompare(version, "6.0") >= 0 + java.additionalClassPaths: [FileInfo.joinPaths(_qtInstallDir, "jar", "Qt6Android.jar")] + } + Properties { condition: _enableNdkSupport && (Android.ndk.abi === "armeabi-v7a" || Android.ndk.abi === "x86") cpp.defines: "ANDROID_HAS_WSTRING" } @@ -65,11 +71,19 @@ Module { Android.sdk._archInName: _multiAbi Android.sdk._bundledInAssets: _multiAbi } + Properties { + condition: _enableSdkSupport && Utilities.versionCompare(version, "6.0") < 0 + Android.sdk.minimumVersion: "21" + } + Properties { + condition: _enableSdkSupport && Utilities.versionCompare(version, "6.0") >= 0 + Android.sdk.minimumVersion: "23" + } Rule { condition: _enableSdkSupport multiplex: true - property stringList inputTags: "android.nativelibrary" + property stringList inputTags: ["android.nativelibrary", "qrc"] inputsFromDependencies: inputTags inputs: product.aggregate ? [] : inputTags Artifact { @@ -180,6 +194,21 @@ Module { if (Array.isArray(product.qmlImportPaths) && product.qmlImportPaths.length > 0) f.writeLine('"qml-import-paths": "' + product.qmlImportPaths.join(',') + '",'); + if (Utilities.versionCompare(product.Qt.android_support.version, "6.0") >= 0) { + f.writeLine('"qml-importscanner-binary": "' + + product.Qt.core.qmlImportScannerFilePath + '",'); + f.writeLine('"rcc-binary": "' + product.Qt.core.binPath + '/rcc' + '",'); + + if (inputs["qrc"] && inputs["qrc"].length > 0) { + var qrcFiles = []; + var qrcInputs = inputs["qrc"]; + for (i = 0; i < qrcInputs.length; ++i) { + qrcFiles.push(qrcInputs[i].filePath); + } + f.writeLine('"qrcFiles": "' + qrcFiles.join(',') + '",'); + } + } + // QBS-1429 if (!product.Qt.android_support._multiAbi) { f.writeLine('"stdcpp-path": "' + (product.cpp.sharedStlFilePath @@ -191,6 +220,7 @@ Module { '/toolchains/llvm/prebuilt/' + hostArch + '/sysroot/usr/lib/",'); f.writeLine('"application-binary": "' + theBinary.product.targetName + '"'); } + f.writeLine("}"); f.close(); }; |