diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-04-14 14:41:28 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-04-19 15:17:43 +0000 |
| commit | da14fbab9a79dbd1c9e0d9a845a381a712ea0b72 (patch) | |
| tree | 0f9cecbe17596ad1124da07feee3cadcc37078a7 | |
| parent | 3a1e06afe65346630b6a6e3b5ed1cfc048e6dcf9 (diff) | |
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>
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 8 |
1 files 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 |