From 6c35c877c39f6de57350ad5f8b5a76b30eaed926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= <timothee.keller@qt.io>
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
Change-Id: Id5bbaa4b86f1ec9861ee308cec6deff50704c77f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 7a4b89fb001bf48829db59d34a2d829394a0bbd6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 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 0527d3b7ca0..1fc5cae25f2 100644
--- a/src/tools/windeployqt/main.cpp
+++ b/src/tools/windeployqt/main.cpp
@@ -32,7 +32,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)
@@ -107,7 +107,14 @@ enum QtModule
     QtPositioningQuickModule,
     QtSensorsQuickModule,
     QtWebEngineQuickModule,
-    QtWebViewQuickModule
+    QtWebViewQuickModule,
+    QtQuickControlsModule,
+    QtQuickDialogsModule,
+    QtQuickLayoutsModule,
+    QtQuickShapesModule,
+    QtQuickTestModule,
+    QtQuickTimelineModule,
+    QtQuick3DModule
 };
 
 struct QtModuleEntry {
@@ -186,7 +193,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 {