diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-22 17:07:55 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-23 14:59:07 +0000 |
commit | 176136ce60f22ac14335b92aaa473e53b9022bc1 (patch) | |
tree | 14012a6e46c2c968e96bbbbacdf224c6ab68ce0f | |
parent | 8333ff641457f5c18bfbc6f9b4ec523ae8526b61 (diff) |
Android: add qmlimportscanner and rcc paths to deployment-settings.json
qmlimportscanner and rcc in Qt 6.0 are part of the host installation
and not in the target installation which androiddeployqt expects it to be.
Fixes: QTBUG-86831
Change-Id: I9d7a6fce3d2f109bab933fcfd7fdd5d2c83821a8
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
-rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 23caae2f4d..6ee670b6c6 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -62,6 +62,9 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { !isEmpty(ANDROID_EXTRA_LIBS): \ FILE_CONTENT += " \"android-extra-libs\": $$emitString($$join(ANDROID_EXTRA_LIBS, ","))," + FILE_CONTENT += " \"qml-importscanner-binary\": $$emitString($$[QT_HOST_BINS]/qmlimportscanner)," + FILE_CONTENT += " \"rcc-binary\": $$emitString($$[QT_HOST_BINS]/rcc)," + qml_import_paths = $$(QML2_IMPORT_PATH) qml_import_paths = $$split(qml_import_paths, $$DIRLIST_SEPARATOR) qml_import_paths += $$QML_IMPORT_PATH |