From 8c33fe9ded700a4b65985dc1b85676cb7f333317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= Date: Thu, 24 Nov 2022 13:48:56 +0100 Subject: Update list of windeployqt modules Added DBus, StateMachine and 3DLogic modules to windeployqt module list Task-number: QTBUG-105135 Pick-to: 6.4 Change-Id: Ied8624e87f62bd655db8b82cf9fe20d72873d823 Reviewed-by: Oliver Wolff --- src/tools/windeployqt/main.cpp | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'src/tools/windeployqt/main.cpp') diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index 8cadc24cf9..3da3b2304d 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -using ModuleBitset = std::bitset<62>; +using ModuleBitset = std::bitset<65>; enum QtModule #if defined(Q_COMPILER_CLASS_ENUM) || defined(Q_CC_MSVC) @@ -102,7 +102,10 @@ enum QtModule QtMqttModule, QtPdfModule, QtPdfQuickModule, - QtPdfWidgetsModule + QtPdfWidgetsModule, + QtDBusModule, + QtStateMachineModule, + Qt3DLogicModule }; struct QtModuleEntry { @@ -165,16 +168,19 @@ static QtModuleEntry qtModuleEntries[] = { { QtWebViewModule, "webview", "Qt6WebView", nullptr }, { QtShaderToolsModule, "shadertools", "Qt6ShaderTools", nullptr }, { QtUiToolsModule, "uitools", "Qt6UiTools", nullptr }, - { QtCore5CompatModule, "core5compat", "Qt6Core5Compat", nullptr}, - { QtChartsModule, "charts", "Qt6Charts", nullptr}, - { QtDataVisualizationModule, "datavisualization", "Qt6DataVisualization", nullptr}, - { QtRemoteObjectsModule, "remoteobjects", "Qt6RemoteObjects", nullptr}, - { QtScxmlModule, "scxml", "Qt6Scxml", 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 }, - { QtMqttModule, "mqtt", "Qt6Mqtt", nullptr}, - { QtPdfModule, "pdf", "Qt6Pdf", nullptr}, - { QtPdfQuickModule, "pdfquick", "Qt6PdfQuick", nullptr}, - { QtPdfWidgetsModule, "pdfwidgets", "Qt6PdfWidgets", nullptr} + { QtMqttModule, "mqtt", "Qt6Mqtt", nullptr }, + { QtPdfModule, "pdf", "Qt6Pdf", nullptr }, + { QtPdfQuickModule, "pdfquick", "Qt6PdfQuick", nullptr }, + { QtPdfWidgetsModule, "pdfwidgets", "Qt6PdfWidgets", nullptr }, + { QtDBusModule, "dbus", "Qt6DBus", nullptr }, + { QtStateMachineModule, "statemachine", "Qt6StateMachine", nullptr }, + { Qt3DLogicModule, "3dlogic", "Qt63DLogic", nullptr } }; enum QtPlugin { -- cgit v1.2.3