From 176136ce60f22ac14335b92aaa473e53b9022bc1 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 22 Sep 2020 17:07:55 +0300 Subject: [PATCH] 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 --- mkspecs/features/android/android_deployment_settings.prf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 23caae2f4dd..6ee670b6c6f 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