From 7a4b89fb001bf48829db59d34a2d829394a0bbd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= Date: Thu, 24 Nov 2022 14:16:44 +0100 Subject: [PATCH] Update list of windeployqt modules Added Quick-controls,dialogs,layouts,shapes,test,timeline,3d- modules to the windeployqt module list Task-number: QTBUG-105135 Pick-to: 6.4 Change-Id: Id5bbaa4b86f1ec9861ee308cec6deff50704c77f Reviewed-by: Oliver Wolff --- src/tools/windeployqt/main.cpp | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index 98c1e5b780c..aa3655e388e 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<69>; +using ModuleBitset = std::bitset<76>; enum QtModule #if defined(Q_COMPILER_CLASS_ENUM) || defined(Q_CC_MSVC) @@ -109,7 +109,14 @@ enum QtModule QtPositioningQuickModule, QtSensorsQuickModule, QtWebEngineQuickModule, - QtWebViewQuickModule + QtWebViewQuickModule, + QtQuickControlsModule, + QtQuickDialogsModule, + QtQuickLayoutsModule, + QtQuickShapesModule, + QtQuickTestModule, + QtQuickTimelineModule, + QtQuick3DModule }; struct QtModuleEntry { @@ -188,7 +195,14 @@ static QtModuleEntry qtModuleEntries[] = { { QtPositioningQuickModule, "positioningquick", "Qt6PositioningQuick", nullptr }, { QtSensorsQuickModule, "sensorsquick", "Qt6SensorsQuick", nullptr }, { QtWebEngineQuickModule, "webenginequick", "Qt6WebEngineQuick", nullptr }, - { QtWebViewQuickModule, "webviewquick", "Qt6WebViewQuick", nullptr } + { QtWebViewQuickModule, "webviewquick", "Qt6WebViewQuick", nullptr }, + { QtQuickControlsModule, "quickcontrols", "Qt6QuickControls2", nullptr }, + { QtQuickDialogsModule, "quickdialogs", "Qt6QuickDialogs2", nullptr }, + { QtQuickLayoutsModule, "quicklayouts", "Qt6QuickLayouts", nullptr }, + { QtQuickShapesModule, "quickshapes", "Qt6QuickShapes", nullptr }, + { QtQuickTestModule, "quicktest", "Qt6QuickTest", nullptr }, + { QtQuickTimelineModule, "quicktimeline", "Qt6QuickTimeline", nullptr }, + { QtQuick3DModule, "quick3d", "Qt6Quick3D", nullptr } }; enum QtPlugin {