diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-03-13 15:09:36 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-03-13 19:34:30 +0000 |
| commit | 8434b070d78841f1196abd01fbf7729e4313204f (patch) | |
| tree | 1bd1d943684c15916e3eaeffb382a5098640390d | |
| parent | 0dd3661080fac1c16234644c4d06a9c28892a813 (diff) | |
| download | qttools-8434b070d78841f1196abd01fbf7729e4313204f.tar.gz | |
windeployqt: Remove the Qt5CLucene module
Change d116ac573d80b6fdfdea4a56b7ae44f84e0ba6ad removed the module.
Change-Id: Id27baf16f5c908283c0d28a28eb5e8f0b8b5dc71
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| -rw-r--r-- | src/windeployqt/main.cpp | 99 |
1 files changed, 47 insertions, 52 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index fac57960d..07c9513e0 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -51,55 +51,53 @@ enum QtModule #endif { QtBluetoothModule = 0x0000000000000001, - QtCLuceneModule = 0x0000000000000002, - QtConcurrentModule = 0x0000000000000004, - QtCoreModule = 0x0000000000000008, - QtDeclarativeModule = 0x0000000000000010, - QtDesignerComponents = 0x0000000000000020, - QtDesignerModule = 0x0000000000000040, - QtGuiModule = 0x0000000000000080, - QtCluceneModule = 0x0000000000000100, - QtHelpModule = 0x0000000000000200, - QtMultimediaModule = 0x0000000000000400, - QtMultimediaWidgetsModule = 0x0000000000000800, - QtMultimediaQuickModule = 0x0000000000001000, - QtNetworkModule = 0x0000000000002000, - QtNfcModule = 0x0000000000004000, - QtOpenGLModule = 0x0000000000008000, - QtPositioningModule = 0x0000000000010000, - QtPrintSupportModule = 0x0000000000020000, - QtQmlModule = 0x0000000000040000, - QtQuickModule = 0x0000000000080000, - QtQuickParticlesModule = 0x0000000000100000, - QtScriptModule = 0x0000000000200000, - QtScriptToolsModule = 0x0000000000400000, - QtSensorsModule = 0x0000000000800000, - QtSerialPortModule = 0x0000000001000000, - QtSqlModule = 0x0000000002000000, - QtSvgModule = 0x0000000004000000, - QtTestModule = 0x0000000008000000, - QtWidgetsModule = 0x0000000010000000, - QtWinExtrasModule = 0x0000000020000000, - QtXmlModule = 0x0000000040000000, - QtXmlPatternsModule = 0x0000000080000000, - QtWebKitModule = 0x0000000100000000, - QtWebKitWidgetsModule = 0x0000000200000000, - QtQuickWidgetsModule = 0x0000000400000000, - QtWebSocketsModule = 0x0000000800000000, - QtEnginioModule = 0x0000001000000000, - QtWebEngineCoreModule = 0x0000002000000000, - QtWebEngineModule = 0x0000004000000000, - QtWebEngineWidgetsModule = 0x0000008000000000, - QtQmlToolingModule = 0x0000010000000000, - Qt3DCoreModule = 0x0000020000000000, - Qt3DRendererModule = 0x0000040000000000, - Qt3DQuickModule = 0x0000080000000000, - Qt3DQuickRendererModule = 0x0000100000000000, - Qt3DInputModule = 0x0000200000000000, - QtLocationModule = 0x0000400000000000, - QtWebChannelModule = 0x0000800000000000, - QtTextToSpeechModule = 0x0001000000000000, - QtSerialBusModule = 0x0002000000000000 + QtConcurrentModule = 0x0000000000000002, + QtCoreModule = 0x0000000000000004, + QtDeclarativeModule = 0x0000000000000008, + QtDesignerComponents = 0x0000000000000010, + QtDesignerModule = 0x0000000000000020, + QtGuiModule = 0x0000000000000040, + QtHelpModule = 0x0000000000000080, + QtMultimediaModule = 0x0000000000000100, + QtMultimediaWidgetsModule = 0x0000000000000200, + QtMultimediaQuickModule = 0x0000000000000400, + QtNetworkModule = 0x0000000000000800, + QtNfcModule = 0x0000000000001000, + QtOpenGLModule = 0x0000000000002000, + QtPositioningModule = 0x0000000000004000, + QtPrintSupportModule = 0x0000000000008000, + QtQmlModule = 0x0000000000010000, + QtQuickModule = 0x0000000000020000, + QtQuickParticlesModule = 0x0000000000040000, + QtScriptModule = 0x0000000000080000, + QtScriptToolsModule = 0x0000000000100000, + QtSensorsModule = 0x0000000000200000, + QtSerialPortModule = 0x0000000000400000, + QtSqlModule = 0x0000000000800000, + QtSvgModule = 0x0000000001000000, + QtTestModule = 0x0000000002000000, + QtWidgetsModule = 0x0000000004000000, + QtWinExtrasModule = 0x0000000008000000, + QtXmlModule = 0x0000000010000000, + QtXmlPatternsModule = 0x0000000020000000, + QtWebKitModule = 0x0000000040000000, + QtWebKitWidgetsModule = 0x0000000080000000, + QtQuickWidgetsModule = 0x0000000100000000, + QtWebSocketsModule = 0x0000000200000000, + QtEnginioModule = 0x0000000400000000, + QtWebEngineCoreModule = 0x0000000800000000, + QtWebEngineModule = 0x0000001000000000, + QtWebEngineWidgetsModule = 0x0000002000000000, + QtQmlToolingModule = 0x0000004000000000, + Qt3DCoreModule = 0x0000008000000000, + Qt3DRendererModule = 0x0000010000000000, + Qt3DQuickModule = 0x0000020000000000, + Qt3DQuickRendererModule = 0x0000040000000000, + Qt3DInputModule = 0x0000080000000000, + QtLocationModule = 0x0000100000000000, + QtWebChannelModule = 0x0000200000000000, + QtTextToSpeechModule = 0x0000400000000000, + QtSerialBusModule = 0x0000800000000000 }; struct QtModuleEntry { @@ -111,7 +109,6 @@ struct QtModuleEntry { static QtModuleEntry qtModuleEntries[] = { { QtBluetoothModule, "bluetooth", "Qt5Bluetooth", 0 }, - { QtCLuceneModule, "clucene", "Qt5CLucene", "qt_help" }, { QtConcurrentModule, "concurrent", "Qt5Concurrent", "qtbase" }, { QtCoreModule, "core", "Qt5Core", "qtbase" }, { QtDeclarativeModule, "declarative", "Qt5Declarative", "qtquick1" }, @@ -537,8 +534,6 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse // Add some dependencies if (options->additionalLibraries & QtQuickModule) options->additionalLibraries |= QtQmlModule; - if (options->additionalLibraries & QtHelpModule) - options->additionalLibraries |= QtCLuceneModule; if (options->additionalLibraries & QtDesignerComponents) options->additionalLibraries |= QtDesignerModule; |