Qt/Android: Adapt to 6.4 androiddeployqt

Task-number: QTBUG-111558
Change-Id: I728c69635b3946db8a9019fa2fecf076d72d8468
Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

2 files changed, 8 insertions, 3 deletions

diff --git a/changelogs/changes-2.0.0.md b/changelogs/changes-2.0.0.md
index 52bfada7c..93a37ae7f 100644
--- a/changelogs/changes-2.0.0.md
+++ b/changelogs/changes-2.0.0.md
@@ -3,6 +3,9 @@
 * Removed the long-deprecated loadFile() and loadExtension() functions
 * Removed the qmake project files
 
+# Qt support
+* Adapt to androiddeployqt on Windows no longer accepting tool paths without suffix in 6.4 (QTBUG-111558)
+
 # BareMetal support
 * Added support for HPPA architectures
 
diff --git a/share/qbs/module-providers/Qt/templates/android_support.qbs b/share/qbs/module-providers/Qt/templates/android_support.qbs
index 68276070f..66914d11b 100644
--- a/share/qbs/module-providers/Qt/templates/android_support.qbs
+++ b/share/qbs/module-providers/Qt/templates/android_support.qbs
@@ -220,9 +220,11 @@ Module {
                     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.android_support.rccFilePath + '",');
+                    f.writeLine('"qml-importscanner-binary": "'
+                                + product.Qt.core.qmlImportScannerFilePath + FileInfo.executableSuffix()
+                                + '",');
+                    f.writeLine('"rcc-binary": "' + product.Qt.android_support.rccFilePath
+                                + FileInfo.executableSuffix() + '",');
 
                     if (inputs["qrc"] && inputs["qrc"].length > 0) {
                         var qrcFiles = [];