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

This should've been done already for Qt 6.2.

Change-Id: I2f943254698a4f0f2742619fd7fcab9ac3a5014a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit e629efc82c2e26559159abfe44d8414997bc3d68)
Reviewed-by: Ivan Solovev <ivan.solovev@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 b417bfa4d1..8a9216af96 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1879,10 +1879,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 + QLatin1String("/bin/qmlimportscanner");
+    } else {
+        qmlImportScanner = options->qtInstallDirectory + QLatin1Char('/') + defaultLibexecDir()
+                + QLatin1String("/qmlimportscanner");
+    }
 #if defined(Q_OS_WIN32)
     qmlImportScanner += QLatin1String(".exe");
 #endif
-- 
cgit v1.2.3