From e629efc82c2e26559159abfe44d8414997bc3d68 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Thu, 14 Apr 2022 14:41:28 +0300
Subject: [PATCH] Android: use libexec path for qmlimportscanner

This should've been done already for Qt 6.2.

Pick-to: 6.2 6.3
Change-Id: I2f943254698a4f0f2742619fd7fcab9ac3a5014a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/tools/androiddeployqt/main.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 8473ddcacc..6067b0472f 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1969,10 +1969,12 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
         fprintf(stdout, "Scanning for QML imports.\n");
 
     QString qmlImportScanner;
-    if (!options->qmlImportScannerBinaryPath.isEmpty())
+    if (!options->qmlImportScannerBinaryPath.isEmpty()) {
         qmlImportScanner = options->qmlImportScannerBinaryPath;
-    else
-        qmlImportScanner = options->qtInstallDirectory + "/bin/qmlimportscanner"_L1;
+    } else {
+        qmlImportScanner = options->qtInstallDirectory + u'/' + defaultLibexecDir()
+                + "/qmlimportscanner"_L1;
+    }
 #if defined(Q_OS_WIN32)
     qmlImportScanner += ".exe"_L1;
 #endif