windeployqt: Automatically add some dependencies.

Automatically add Qt5Qml when passing the command line option -quick,
thus triggering qmlimportscanner. Similar, add Qt5CLucene and Qt5Designer
when Qt5Help or Qt5DesignerComponents are enabled on the command line.

Change-Id: Ie9a51a51581fc4cf855b53bcfd5d526f30ee93a2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index fc346e9..b3b1e9a 100644 (file)
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -327,6 +327,14 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
             options->disabledLibraries |= disabledModules.at(int(i)).second;
     }
 
+    // Add some dependencies
+    if (options->additionalLibraries | QtQuickModule)
+        options->additionalLibraries |= QtQmlModule;
+    if (options->additionalLibraries | QtHelpModule)
+        options->additionalLibraries |= QtCLuceneModule;
+    if (options->additionalLibraries | QtDesignerComponents)
+        options->additionalLibraries |= QtDesignerModule;
+
     if (parser->isSet(jsonOption)) {
         optVerboseLevel = 0;
         options->json = new JsonOutput;