summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2020-09-30 15:08:28 +0200
committerAlessandro Portale <alessandro.portale@qt.io>2020-09-30 20:18:57 +0200
commit47ae99a07ab5726e5316d56f0ca3ce958cd85ac5 (patch)
treece1884ae1b157b8eab6ec87d7175cc8ec3243371 /src/tools
parenta0195a5beac7a5ad4ce44c0b3339f88c75160822 (diff)
Android: Append .exe suffix to qmlImportScanner in androiddeployqt
Change-Id: I9d67d94eb9c19b36075311ddee20c972a645d28d Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/androiddeployqt/main.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 48c3fa70b2..9f94c2b4ee 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1792,14 +1792,13 @@ 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 {
+ else
qmlImportScanner = options->qtInstallDirectory + QLatin1String("/bin/qmlimportscanner");
#if defined(Q_OS_WIN32)
- qmlImportScanner += QLatin1String(".exe");
+ qmlImportScanner += QLatin1String(".exe");
#endif
- }
if (!QFile::exists(qmlImportScanner)) {
fprintf(stderr, "qmlimportscanner not found: %s\n", qPrintable(qmlImportScanner));