diff options
| author | Raphael Cotty <raphael.cotty@gmail.com> | 2021-10-24 15:24:48 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2021-10-25 05:17:16 +0000 |
| commit | bf8d0f9710d507b047e73cb8da60b1c25ffee1ec (patch) | |
| tree | 41fa605c5297fa5192de01c83979d741a4d0e954 | |
| parent | eef202e5edd0a9d149433ce93105049a3e54fcf0 (diff) | |
| download | qbs-bf8d0f9710d507b047e73cb8da60b1c25ffee1ec.tar.gz | |
Android: correct rcc path for Qt >= 6.2
Change-Id: If7df08112fd2b89503c712418c8d4dc578d25b0e
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/android_support.qbs | 3 | ||||
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/core.qbs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/share/qbs/module-providers/Qt/templates/android_support.qbs b/share/qbs/module-providers/Qt/templates/android_support.qbs index 80315621e..ea19bba4a 100644 --- a/share/qbs/module-providers/Qt/templates/android_support.qbs +++ b/share/qbs/module-providers/Qt/templates/android_support.qbs @@ -16,6 +16,7 @@ Module { property bool verboseAndroidDeployQt: false property string _androidDeployQtFilePath: FileInfo.joinPaths(_qtBinaryDir, "bin", "androiddeployqt") + property string rccFilePath property string _qtBinaryDir property string _qtInstallDir // TODO: Remove in 1.21 @@ -208,7 +209,7 @@ Module { 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' + '",'); + f.writeLine('"rcc-binary": "' + product.Qt.android_support.rccFilePath + '",'); if (inputs["qrc"] && inputs["qrc"].length > 0) { var qrcFiles = []; diff --git a/share/qbs/module-providers/Qt/templates/core.qbs b/share/qbs/module-providers/Qt/templates/core.qbs index e34274cfd..c3b26eb50 100644 --- a/share/qbs/module-providers/Qt/templates/core.qbs +++ b/share/qbs/module-providers/Qt/templates/core.qbs @@ -25,6 +25,7 @@ Module { Qt.android_support._qtBinaryDir: FileInfo.path(binPath) Qt.android_support._qtInstallDir: FileInfo.path(installPath) Qt.android_support.version: version + Qt.android_support.rccFilePath: Rcc.fullPath(product) } // qmlImportScanner is required by androiddeployqt even if the project doesn't // depend on qml. That's why the scannerName must be defined here and not in the |