From c810c93018b95319ef2f22629d99e0173d8654aa Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 15 Aug 2022 18:47:31 +0200 Subject: [PATCH] qmake: Fix tool paths generated for androiddeployqt json file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They should contain the executable suffix .exe when androiddeployqt is run on Windows, because androiddeployqt does not add the suffix itself when the tool paths read from the json file. Amends 4fc14b19336531c96f5883ff4b06f9af1ddaa30d Amends 176136ce60f22ac14335b92aaa473e53b9022bc1 Fixes: QTBUG-105133 Fixes: QTCREATORBUG-27868 Change-Id: I8c5bac2fa6c82d122f8a70c5ff2a561298327a34 Reviewed-by: Jörg Bornemann Reviewed-by: Alexey Edelev Reviewed-by: Assam Boudjelthia (cherry picked from commit 64b84977eb281363bb096d602c0706b299b2d926) Reviewed-by: Qt Cherry-pick Bot --- mkspecs/features/android/android_deployment_settings.prf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 037dc23772b..1819a1f52c3 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -62,8 +62,10 @@ contains(TEMPLATE, ".*app"):!build_pass { !isEmpty(ANDROID_EXTRA_LIBS): \ FILE_CONTENT += " \"android-extra-libs\": $$emitString($$join(ANDROID_EXTRA_LIBS, ","))," - FILE_CONTENT += " \"qml-importscanner-binary\": $$emitString($$[QT_HOST_LIBEXECS]/qmlimportscanner)," - FILE_CONTENT += " \"rcc-binary\": $$emitString($$[QT_HOST_LIBEXECS]/rcc)," + tool_extension = "" + contains(QMAKE_HOST.os, Windows): tool_extension = ".exe" + FILE_CONTENT += " \"qml-importscanner-binary\": $$emitString($$[QT_HOST_LIBEXECS]/qmlimportscanner$${tool_extension})," + FILE_CONTENT += " \"rcc-binary\": $$emitString($$[QT_HOST_LIBEXECS]/rcc$${tool_extension})," qml_import_paths = $$(QML2_IMPORT_PATH) qml_import_paths = $$split(qml_import_paths, $$DIRLIST_SEPARATOR)