diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-12-12 15:11:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-12 23:22:38 +0100 |
| commit | 0199b72b8ae6bb2a46118c1f92808f1dca3b9feb (patch) | |
| tree | 35f18b5b1f686ca3d94a86375db88d6ebc6fa0ea | |
| parent | 50a62a83438148208e7d5367a46e268561ffbabb (diff) | |
| download | qttools-0199b72b8ae6bb2a46118c1f92808f1dca3b9feb.tar.gz qttools-0199b72b8ae6bb2a46118c1f92808f1dca3b9feb.tar.bz2 qttools-0199b72b8ae6bb2a46118c1f92808f1dca3b9feb.zip | |
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>
| -rw-r--r-- | src/windeployqt/main.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index fc346e99..b3b1e9ab 100644 --- 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; |