From cbd688d4102c4df2e6e49fc2b287594c34ee23fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= Date: Thu, 3 Nov 2022 10:37:52 +0100 Subject: Update list of windeployqt modules Added QtCharts, QtDataVisualization, QtRemoteObjects, QtScxml, and QtNetworkAuthorization to the windeployqt module list Task-number: QTBUG-105135 Pick-to: 6.2 6.4 Change-Id: I16f2897583518c4577eeeda2dc0a6f413fef9794 Reviewed-by: Oliver Wolff --- src/tools/windeployqt/main.cpp | 118 ++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 54 deletions(-) (limited to 'src/tools/windeployqt') diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index 0566b578fd..1c2b63682c 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -38,59 +38,64 @@ enum QtModule : quint64 #endif { - QtBluetoothModule = 0x0000000000000001, - 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, - QtOpenGLWidgetsModule = 0x0000000000004000, - QtPositioningModule = 0x0000000000008000, - QtPrintSupportModule = 0x0000000000010000, - QtQmlModule = 0x0000000000020000, - QtQuickModule = 0x0000000000040000, - QtQuickParticlesModule = 0x0000000000080000, - QtScriptModule = 0x0000000000100000, - QtScriptToolsModule = 0x0000000000200000, - QtSensorsModule = 0x0000000000400000, - QtSerialPortModule = 0x0000000000800000, - QtSqlModule = 0x0000000001000000, - QtSvgModule = 0x0000000002000000, - QtSvgWidgetsModule = 0x0000000004000000, - QtTestModule = 0x0000000008000000, - QtWidgetsModule = 0x0000000010000000, - QtWinExtrasModule = 0x0000000020000000, - QtXmlModule = 0x0000000040000000, - QtQuickWidgetsModule = 0x0000000100000000, - QtWebSocketsModule = 0x0000000200000000, - 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, - QtGamePadModule = 0x0001000000000000, - Qt3DAnimationModule = 0x0002000000000000, - QtWebViewModule = 0x0004000000000000, - Qt3DExtrasModule = 0x0008000000000000, - QtShaderToolsModule = 0x0010000000000000, - QtUiToolsModule = 0x0020000000000000, - QtCore5CompatModule = 0x0040000000000000 + QtBluetoothModule = 0x0000000000000001, + 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, + QtOpenGLWidgetsModule = 0x0000000000004000, + QtPositioningModule = 0x0000000000008000, + QtPrintSupportModule = 0x0000000000010000, + QtQmlModule = 0x0000000000020000, + QtQuickModule = 0x0000000000040000, + QtQuickParticlesModule = 0x0000000000080000, + QtScriptModule = 0x0000000000100000, + QtScriptToolsModule = 0x0000000000200000, + QtSensorsModule = 0x0000000000400000, + QtSerialPortModule = 0x0000000000800000, + QtSqlModule = 0x0000000001000000, + QtSvgModule = 0x0000000002000000, + QtSvgWidgetsModule = 0x0000000004000000, + QtTestModule = 0x0000000008000000, + QtWidgetsModule = 0x0000000010000000, + QtWinExtrasModule = 0x0000000020000000, + QtXmlModule = 0x0000000040000000, + QtQuickWidgetsModule = 0x0000000100000000, + QtWebSocketsModule = 0x0000000200000000, + 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, + QtGamePadModule = 0x0001000000000000, + Qt3DAnimationModule = 0x0002000000000000, + QtWebViewModule = 0x0004000000000000, + Qt3DExtrasModule = 0x0008000000000000, + QtShaderToolsModule = 0x0010000000000000, + QtUiToolsModule = 0x0020000000000000, + QtCore5CompatModule = 0x0040000000000000, + QtChartsModule = 0x0080000000000000, + QtDataVisualizationModule = 0x0100000000000000, + QtRemoteObjectsModule = 0x0200000000000000, + QtScxmlModule = 0x0400000000000000, + QtNetworkAuthorizationModule = 0x0800000000000000 }; struct QtModuleEntry { @@ -153,7 +158,12 @@ static QtModuleEntry qtModuleEntries[] = { { QtWebViewModule, "webview", "Qt6WebView", nullptr }, { QtShaderToolsModule, "shadertools", "Qt6ShaderTools", nullptr }, { QtUiToolsModule, "uitools", "Qt6UiTools", nullptr }, - { QtCore5CompatModule, "core5compat", "Qt6Core5Compat", nullptr} + { QtCore5CompatModule, "core5compat", "Qt6Core5Compat", nullptr}, + { QtChartsModule, "charts", "Qt6Charts", nullptr}, + { QtDataVisualizationModule, "datavisualization", "Qt6DataVisualization", nullptr}, + { QtRemoteObjectsModule, "remoteobjects", "Qt6RemoteObjects", nullptr}, + { QtScxmlModule, "scxml", "Qt6Scxml", nullptr}, + { QtNetworkAuthorizationModule, "networkauthorization", "Qt6NetworkAuth", nullptr } }; enum QtPlugin { -- cgit v1.2.3