summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-03-19 11:00:02 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-19 11:21:22 +0100
commit7e4e16437b3cf28f4074a4279fe1203cab73d6e5 (patch)
tree5ad0434acaa8fea740f433d060f8ece0f919eb18
parent167cb8f63095c655e6897b544ee9776aae009a23 (diff)
downloadqttools-7e4e16437b3cf28f4074a4279fe1203cab73d6e5.tar.gz
windeployqt: Add module Qt5MultimediaQuick_p.
Add it as a known module such that it gets an option to enable/disable it and the name matching works for all multimedia modules. Task-number: QTBUG-37576 Change-Id: Iba6a0bd32ad9676d47d20d6a3d75fdb4c1772bcf Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
-rw-r--r--src/windeployqt/main.cpp44
1 files changed, 23 insertions, 21 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 637271805..d45ee55cc 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -73,27 +73,28 @@ enum QtModule
QtHelpModule = 0x200,
QtMultimediaModule = 0x400,
QtMultimediaWidgetsModule = 0x800,
- QtNetworkModule = 0x1000,
- QtNfcModule = 0x2000,
- QtOpenGLModule = 0x4000,
- QtPositioningModule = 0x8000,
- QtPrintSupportModule = 0x10000,
- QtQmlModule = 0x20000,
- QtQuickModule = 0x40000,
- QtQuickParticlesModule = 0x80000,
- QtScriptModule = 0x100000,
- QtScriptToolsModule = 0x200000,
- QtSensorsModule = 0x400000,
- QtSerialPortModule = 0x800000,
- QtSqlModule = 0x1000000,
- QtSvgModule = 0x2000000,
- QtTestModule = 0x4000000,
- QtWidgetsModule = 0x8000000,
- QtWinExtrasModule = 0x10000000,
- QtXmlModule = 0x20000000,
- QtXmlPatternsModule = 0x40000000,
- QtWebKitModule = 0x80000000,
- QtWebKitWidgetsModule = 0x100000000
+ QtMultimediaQuickModule = 0x1000,
+ QtNetworkModule = 0x2000,
+ QtNfcModule = 0x4000,
+ QtOpenGLModule = 0x8000,
+ QtPositioningModule = 0x10000,
+ QtPrintSupportModule = 0x20000,
+ QtQmlModule = 0x40000,
+ QtQuickModule = 0x80000,
+ QtQuickParticlesModule = 0x100000,
+ QtScriptModule = 0x200000,
+ QtScriptToolsModule = 0x400000,
+ QtSensorsModule = 0x800000,
+ QtSerialPortModule = 0x1000000,
+ QtSqlModule = 0x2000000,
+ QtSvgModule = 0x4000000,
+ QtTestModule = 0x8000000,
+ QtWidgetsModule = 0x10000000,
+ QtWinExtrasModule = 0x20000000,
+ QtXmlModule = 0x40000000,
+ QtXmlPatternsModule = 0x80000000,
+ QtWebKitModule = 0x100000000,
+ QtWebKitWidgetsModule = 0x200000000
};
struct QtModuleEntry {
@@ -116,6 +117,7 @@ QtModuleEntry qtModuleEntries[] = {
{ QtHelpModule, "qthelp", "Qt5Help", "qt_help" },
{ QtMultimediaModule, "multimedia", "Qt5Multimedia", "qtmultimedia" },
{ QtMultimediaWidgetsModule, "multimediawidgets", "Qt5MultimediaWidgets", "qtmultimedia" },
+ { QtMultimediaQuickModule, "multimediaquick", "Qt5MultimediaQuick_p", "qtmultimedia" },
{ QtNetworkModule, "network", "Qt5Network", "qtbase" },
{ QtNfcModule, "nfc", "Qt5Nfc", 0 },
{ QtOpenGLModule, "opengl", "Qt5OpenGL", 0 },