1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Append .exe suffix to qmlImportScanner in androiddeployqt

Browse Source 
Change-Id: I9d67d94eb9c19b36075311ddee20c972a645d28d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale 2020-09-30 15:08:28 +02:00
parent a0195a5bea
commit 47ae99a07a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1792,14 +1792,13 @@ 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 + QLatin1String("/bin/qmlimportscanner"); qmlImportScanner = options->qtInstallDirectory + QLatin1String("/bin/qmlimportscanner");
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN32)
qmlImportScanner += QLatin1String(".exe"); qmlImportScanner += QLatin1String(".exe");
#endif #endif
}
if (!QFile::exists(qmlImportScanner)) { if (!QFile::exists(qmlImportScanner)) {
fprintf(stderr, "qmlimportscanner not found: %s\n", qPrintable(qmlImportScanner)); fprintf(stderr, "qmlimportscanner not found: %s\n", qPrintable(qmlImportScanner));