AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: use libexec path for qmlimportscanner

Browse Source 
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>
This commit is contained in:
Assam Boudjelthia 2022-04-14 14:41:28 +03:00
parent 46d047b76c
commit e629efc82c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/androiddeployqt/main.cpp
View File

@ -1969,10 +1969,12 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
fprintf(stdout, "Scanning for QML imports.\n"); fprintf(stdout, "Scanning for QML imports.\n");
QString qmlImportScanner; QString qmlImportScanner;
if (!options->qmlImportScannerBinaryPath.isEmpty()) if (!options->qmlImportScannerBinaryPath.isEmpty()) {
qmlImportScanner = options->qmlImportScannerBinaryPath; qmlImportScanner = options->qmlImportScannerBinaryPath;
else } else {
qmlImportScanner = options->qtInstallDirectory + "/bin/qmlimportscanner"_L1; qmlImportScanner = options->qtInstallDirectory + u'/' + defaultLibexecDir()
+ "/qmlimportscanner"_L1;
}
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN32)
qmlImportScanner += ".exe"_L1; qmlImportScanner += ".exe"_L1;
#endif #endif