From 47ae99a07ab5726e5316d56f0ca3ce958cd85ac5 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 30 Sep 2020 15:08:28 +0200 Subject: Android: Append .exe suffix to qmlImportScanner in androiddeployqt Change-Id: I9d67d94eb9c19b36075311ddee20c972a645d28d Reviewed-by: Assam Boudjelthia --- src/tools/androiddeployqt/main.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/tools') 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 *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)); -- cgit v1.2.3