Support qmlimport option in windeployqt

This patch adds a new option, -qmlimport, which enables
windeployqt to pass custom QML module import paths to
qmlimportscanner.

Change-Id: Iacde05543ab1f8f85b8306661e4674ad24badce4
Fixes: QTBUG-71045
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

2 files changed, 5 insertions, 3 deletions

diff --git a/src/shared/winutils/qmlutils.cpp b/src/shared/winutils/qmlutils.cpp
index 6fe77e64f..414446499 100644
--- a/src/shared/winutils/qmlutils.cpp
+++ b/src/shared/winutils/qmlutils.cpp
@@ -95,14 +95,16 @@ static void findFileRecursion(const QDir &directory, Platform platform,
     }
 }
 
-QmlImportScanResult runQmlImportScanner(const QString &directory, const QString &qmlImportPath,
+QmlImportScanResult runQmlImportScanner(const QString &directory, const QStringList &qmlImportPaths,
                                         bool usesWidgets, int platform, DebugMatchMode debugMatchMode,
                                         QString *errorMessage)
 {
     Q_UNUSED(usesWidgets);
     QmlImportScanResult result;
     QStringList arguments;
-    arguments << QStringLiteral("-importPath") << qmlImportPath << QStringLiteral("-rootPath") << directory;
+    for (const QString &importPath : qmlImportPaths)
+        arguments << QStringLiteral("-importPath") << importPath;
+    arguments << QStringLiteral("-rootPath") << directory;
     unsigned long exitCode;
     QByteArray stdOut;
     QByteArray stdErr;
diff --git a/src/shared/winutils/qmlutils.h b/src/shared/winutils/qmlutils.h
index 895c7f1de..a05007103 100644
--- a/src/shared/winutils/qmlutils.h
+++ b/src/shared/winutils/qmlutils.h
@@ -57,7 +57,7 @@ struct QmlImportScanResult {
 
 bool operator==(const QmlImportScanResult::Module &m1, const QmlImportScanResult::Module &m2);
 
-QmlImportScanResult runQmlImportScanner(const QString &directory, const QString &qmlImportPath,
+QmlImportScanResult runQmlImportScanner(const QString &directory, const QStringList &qmlImportPaths,
                                         bool usesWidgets, int platform, DebugMatchMode debugMatchMode,
                                         QString *errorMessage);