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>
This commit is contained in:
parent
46d047b76c
commit
e629efc82c
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user