Update QtQuickControls2 project files

Re-run pro2cmake on all the project files.

Change-Id: I8d349cf34d6cc8e26c76193d9ef220fa85b16bb8
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

18 files changed, 1024 insertions, 945 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5ed902d..fdd80401 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,5 +7,7 @@ project(QtQuickControls2
     LANGUAGES CXX C
 )
 
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets Network Qml Quick QmlTools)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets Network Qml Quick QmlTools
+    OPTIONAL_COMPONENTS QuickTest
+)
 qt_build_repo()
diff --git a/src/imports/.prev_CMakeLists.txt b/src/imports/.prev_CMakeLists.txt
index 11e515dd..9bec7cd4 100644
--- a/src/imports/.prev_CMakeLists.txt
+++ b/src/imports/.prev_CMakeLists.txt
@@ -4,493 +4,7 @@ add_subdirectory(controls)
 add_subdirectory(calendar)
 add_subdirectory(platform)
 add_subdirectory(templates)
-#####################################################################
-## qtquickcontrols2fusionstyleplugin Plugin:
-#####################################################################
-
-add_qml_module(qtquickcontrols2fusionstyleplugin
-    CPP_PLUGIN
-    TARGET_PATH "QtQuick/Controls.2/Fusion"
-    URI "QtQuick.Controls.Fusion"
-    VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
-    RESOURCE_PREFIX "/qt-project.org/imports"
-    SOURCES
-        controls/fusion/qquickfusionbusyindicator.cpp controls/fusion/qquickfusionbusyindicator_p.h
-        controls/fusion/qquickfusiondial.cpp controls/fusion/qquickfusiondial_p.h
-        controls/fusion/qquickfusionknob.cpp controls/fusion/qquickfusionknob_p.h
-        controls/fusion/qquickfusionstyle.cpp controls/fusion/qquickfusionstyle_p.h
-        controls/fusion/qquickfusiontheme.cpp controls/fusion/qquickfusiontheme_p.h
-        controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Qml
-        Qt::Quick
-)
-
-# Resources:
-add_qt_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle"
-    PREFIX
-        "qt-project.org/imports/QtQuick/Controls.2/Fusion"
-    BASE
-        "controls/fusion"
-    FILES
-        images/arrow.png
-        images/arrow@2x.png
-        images/arrow@3x.png
-        images/arrow@4x.png
-        images/checkmark.png
-        images/checkmark@2x.png
-        images/checkmark@3x.png
-        images/checkmark@4x.png
-        images/progressmask.png
-        images/progressmask@2x.png
-        images/progressmask@3x.png
-        images/progressmask@4x.png
-)
-
-
-set(qml_files
-    controls/fusion/ApplicationWindow.qml
-    controls/fusion/BusyIndicator.qml
-    controls/fusion/Button.qml
-    controls/fusion/ButtonPanel.qml
-    controls/fusion/CheckBox.qml
-    controls/fusion/CheckDelegate.qml
-    controls/fusion/CheckIndicator.qml
-    controls/fusion/ComboBox.qml
-    controls/fusion/DelayButton.qml
-    controls/fusion/Dial.qml
-    controls/fusion/Dialog.qml
-    controls/fusion/DialogButtonBox.qml
-    controls/fusion/Drawer.qml
-    controls/fusion/Frame.qml
-    controls/fusion/GroupBox.qml
-    controls/fusion/ItemDelegate.qml
-    controls/fusion/Label.qml
-    controls/fusion/Menu.qml
-    controls/fusion/MenuBar.qml
-    controls/fusion/MenuBarItem.qml
-    controls/fusion/MenuItem.qml
-    controls/fusion/MenuSeparator.qml
-    controls/fusion/Page.qml
-    controls/fusion/PageIndicator.qml
-    controls/fusion/Pane.qml
-    controls/fusion/Popup.qml
-    controls/fusion/ProgressBar.qml
-    controls/fusion/RadioButton.qml
-    controls/fusion/RadioDelegate.qml
-    controls/fusion/RadioIndicator.qml
-    controls/fusion/RangeSlider.qml
-    controls/fusion/RoundButton.qml
-    controls/fusion/ScrollBar.qml
-    controls/fusion/ScrollIndicator.qml
-    controls/fusion/Slider.qml
-    controls/fusion/SliderGroove.qml
-    controls/fusion/SliderHandle.qml
-    controls/fusion/SpinBox.qml
-    controls/fusion/SplitView.qml
-    controls/fusion/SwipeDelegate.qml
-    controls/fusion/SwitchDelegate.qml
-    controls/fusion/SwitchIndicator.qml
-    controls/fusion/Switch.qml
-    controls/fusion/TabBar.qml
-    controls/fusion/TabButton.qml
-    controls/fusion/TextArea.qml
-    controls/fusion/TextField.qml
-    controls/fusion/ToolBar.qml
-    controls/fusion/ToolButton.qml
-    controls/fusion/ToolSeparator.qml
-    controls/fusion/ToolTip.qml
-    controls/fusion/Tumbler.qml
-)
-
-add_qt_resource(qtquickcontrols2fusionstyleplugin qmake_QtQuick_Controls_2_Fusion
-    PREFIX
-        "/qt-project.org/imports/QtQuick/Controls.2/Fusion"
-    FILES
-        ${qml_files}
-)
-
-qt_install_qml_files(qtquickcontrols2fusionstyleplugin
-    FILES ${qml_files}
-)
-
-
-#### Keys ignored in scope 2:.:controls/fusion:controls/fusion/fusion.pro:<TRUE>:
-# CONFIG = "no_cxx_module" "install_qml_files" "builtin_resources" "qtquickcompiler"
-# IMPORT_NAME = "QtQuick.Controls.Fusion"
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# _LOADED = "qml_plugin"
-#####################################################################
-## qtquickcontrols2imaginestyleplugin Plugin:
-#####################################################################
-
-add_qml_module(qtquickcontrols2imaginestyleplugin
-    CPP_PLUGIN
-    TARGET_PATH "QtQuick/Controls.2/Imagine"
-    URI "QtQuick.Controls.Imagine"
-    VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
-    RESOURCE_PREFIX "/qt-project.org/imports"
-    SOURCES
-        controls/imagine/qquickimageselector.cpp controls/imagine/qquickimageselector_p.h
-        controls/imagine/qquickimaginestyle.cpp controls/imagine/qquickimaginestyle_p.h
-        controls/imagine/qquickimaginetheme.cpp controls/imagine/qquickimaginetheme_p.h
-        controls/imagine/qquickninepatchimage.cpp controls/imagine/qquickninepatchimage_p.h
-        controls/imagine/qtquickcontrols2imaginestyleplugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Qml
-        Qt::Quick
-)
-
-set(qml_files
-    controls/imagine/ApplicationWindow.qml
-    controls/imagine/BusyIndicator.qml
-    controls/imagine/Button.qml
-    controls/imagine/CheckBox.qml
-    controls/imagine/CheckDelegate.qml
-    controls/imagine/ComboBox.qml
-    controls/imagine/DelayButton.qml
-    controls/imagine/Dial.qml
-    controls/imagine/Dialog.qml
-    controls/imagine/DialogButtonBox.qml
-    controls/imagine/Drawer.qml
-    controls/imagine/Frame.qml
-    controls/imagine/GroupBox.qml
-    controls/imagine/ItemDelegate.qml
-    controls/imagine/Label.qml
-    controls/imagine/Menu.qml
-    controls/imagine/MenuItem.qml
-    controls/imagine/MenuSeparator.qml
-    controls/imagine/PageIndicator.qml
-    controls/imagine/Page.qml
-    controls/imagine/Pane.qml
-    controls/imagine/Popup.qml
-    controls/imagine/ProgressBar.qml
-    controls/imagine/RadioButton.qml
-    controls/imagine/RadioDelegate.qml
-    controls/imagine/RangeSlider.qml
-    controls/imagine/RoundButton.qml
-    controls/imagine/ScrollBar.qml
-    controls/imagine/ScrollIndicator.qml
-    controls/imagine/Slider.qml
-    controls/imagine/SpinBox.qml
-    controls/imagine/SplitView.qml
-    controls/imagine/StackView.qml
-    controls/imagine/SwipeDelegate.qml
-    controls/imagine/SwipeView.qml
-    controls/imagine/Switch.qml
-    controls/imagine/SwitchDelegate.qml
-    controls/imagine/TextField.qml
-    controls/imagine/TextArea.qml
-    controls/imagine/TabBar.qml
-    controls/imagine/TabButton.qml
-    controls/imagine/ToolBar.qml
-    controls/imagine/ToolButton.qml
-    controls/imagine/ToolSeparator.qml
-    controls/imagine/ToolTip.qml
-    controls/imagine/Tumbler.qml
-)
-
-add_qt_resource(qtquickcontrols2imaginestyleplugin qmake_QtQuick_Controls_2_Imagine
-    PREFIX
-        "/qt-project.org/imports/QtQuick/Controls.2/Imagine"
-    FILES
-        ${qml_files}
-)
-
-qt_install_qml_files(qtquickcontrols2imaginestyleplugin
-    FILES ${qml_files}
-)
-
-
-#### Keys ignored in scope 4:.:controls/imagine:controls/imagine/imagine.pro:<TRUE>:
-# CONFIG = "no_cxx_module" "install_qml_files" "builtin_resources" "qtquickcompiler"
-# IMPORT_NAME = "QtQuick.Controls.Imagine"
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# _LOADED = "qml_plugin"
-# qtquickcontrols2imaginestyle.files = "$$files$$PWD/images/*.png" "$$files$$PWD/images/*.webp"
-# qtquickcontrols2imaginestyle.prefix = "qt-project.org/imports/QtQuick/Controls.2/Imagine"
-#####################################################################
-## qtquickcontrols2materialstyleplugin Plugin:
-#####################################################################
-
-add_qml_module(qtquickcontrols2materialstyleplugin
-    CPP_PLUGIN
-    TARGET_PATH "QtQuick/Controls.2/Material"
-    URI "QtQuick.Controls.Material"
-    VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
-    RESOURCE_PREFIX "/qt-project.org/imports"
-    SOURCES
-        controls/material/qquickmaterialbusyindicator.cpp controls/material/qquickmaterialbusyindicator_p.h
-        controls/material/qquickmaterialprogressbar.cpp controls/material/qquickmaterialprogressbar_p.h
-        controls/material/qquickmaterialripple.cpp controls/material/qquickmaterialripple_p.h
-        controls/material/qquickmaterialstyle.cpp controls/material/qquickmaterialstyle_p.h
-        controls/material/qquickmaterialtheme.cpp controls/material/qquickmaterialtheme_p.h
-        controls/material/qtquickcontrols2materialstyleplugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Qml
-        Qt::Quick
-)
-
-# Resources:
-add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin"
-    PREFIX
-        "/qt-project.org/imports/QtQuick/Controls.2/Material"
-    BASE
-        "controls/material"
-    FILES
-        images/arrow-indicator.png
-        images/arrow-indicator@2x.png
-        images/arrow-indicator@3x.png
-        images/arrow-indicator@4x.png
-        images/check.png
-        images/check@2x.png
-        images/check@3x.png
-        images/check@4x.png
-        images/drop-indicator.png
-        images/drop-indicator@2x.png
-        images/drop-indicator@3x.png
-        images/drop-indicator@4x.png
-        shaders/+glslcore/RectangularGlow.frag
-        shaders/+hlsl/RectangularGlow.frag
-        shaders/RectangularGlow.frag
-)
-
-
-set(qml_files
-    controls/material/ApplicationWindow.qml
-    controls/material/BoxShadow.qml
-    controls/material/BusyIndicator.qml
-    controls/material/Button.qml
-    controls/material/CheckBox.qml
-    controls/material/CheckDelegate.qml
-    controls/material/CheckIndicator.qml
-    controls/material/ComboBox.qml
-    controls/material/CursorDelegate.qml
-    controls/material/DelayButton.qml
-    controls/material/Dial.qml
-    controls/material/Dialog.qml
-    controls/material/DialogButtonBox.qml
-    controls/material/Drawer.qml
-    controls/material/ElevationEffect.qml
-    controls/material/Frame.qml
-    controls/material/GroupBox.qml
-    controls/material/ItemDelegate.qml
-    controls/material/Label.qml
-    controls/material/Menu.qml
-    controls/material/MenuBar.qml
-    controls/material/MenuBarItem.qml
-    controls/material/MenuItem.qml
-    controls/material/MenuSeparator.qml
-    controls/material/Page.qml
-    controls/material/PageIndicator.qml
-    controls/material/Pane.qml
-    controls/material/Popup.qml
-    controls/material/ProgressBar.qml
-    controls/material/RadioButton.qml
-    controls/material/RadioDelegate.qml
-    controls/material/RadioIndicator.qml
-    controls/material/RangeSlider.qml
-    controls/material/RoundButton.qml
-    controls/material/RectangularGlow.qml
-    controls/material/ScrollBar.qml
-    controls/material/ScrollIndicator.qml
-    controls/material/Slider.qml
-    controls/material/SliderHandle.qml
-    controls/material/SpinBox.qml
-    controls/material/SplitView.qml
-    controls/material/StackView.qml
-    controls/material/SwipeDelegate.qml
-    controls/material/SwipeView.qml
-    controls/material/Switch.qml
-    controls/material/SwitchDelegate.qml
-    controls/material/SwitchIndicator.qml
-    controls/material/TabBar.qml
-    controls/material/TabButton.qml
-    controls/material/TextArea.qml
-    controls/material/TextField.qml
-    controls/material/ToolBar.qml
-    controls/material/ToolButton.qml
-    controls/material/ToolSeparator.qml
-    controls/material/ToolTip.qml
-    controls/material/Tumbler.qml
-)
-
-add_qt_resource(qtquickcontrols2materialstyleplugin qmake_QtQuick_Controls_2_Material
-    PREFIX
-        "/qt-project.org/imports/QtQuick/Controls.2/Material"
-    FILES
-        ${qml_files}
-)
-
-qt_install_qml_files(qtquickcontrols2materialstyleplugin
-    FILES ${qml_files}
-)
-
-
-#### Keys ignored in scope 6:.:controls/material:controls/material/material.pro:<TRUE>:
-# CONFIG = "no_cxx_module" "install_qml_files" "builtin_resources" "qtquickcompiler"
-# IMPORT_NAME = "QtQuick.Controls.Material"
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# _LOADED = "qml_plugin"
-#####################################################################
-## qtquickcontrols2universalstyleplugin Plugin:
-#####################################################################
-
-add_qml_module(qtquickcontrols2universalstyleplugin
-    CPP_PLUGIN
-    TARGET_PATH "QtQuick/Controls.2/Universal"
-    URI "QtQuick.Controls.Universal"
-    VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
-    RESOURCE_PREFIX "/qt-project.org/imports"
-    SOURCES
-        controls/universal/qquickuniversalbusyindicator.cpp controls/universal/qquickuniversalbusyindicator_p.h
-        controls/universal/qquickuniversalfocusrectangle.cpp controls/universal/qquickuniversalfocusrectangle_p.h
-        controls/universal/qquickuniversalprogressbar.cpp controls/universal/qquickuniversalprogressbar_p.h
-        controls/universal/qquickuniversalstyle.cpp controls/universal/qquickuniversalstyle_p.h
-        controls/universal/qquickuniversaltheme.cpp controls/universal/qquickuniversaltheme_p.h
-        controls/universal/qtquickcontrols2universalstyleplugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Qml
-        Qt::Quick
-)
-
-# Resources:
-add_qt_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin"
-    PREFIX
-        "qt-project.org/imports/QtQuick/Controls.2/Universal"
-    BASE
-        "controls/universal"
-    FILES
-        images/checkmark.png
-        images/checkmark@2x.png
-        images/checkmark@3x.png
-        images/checkmark@4x.png
-        images/downarrow.png
-        images/downarrow@2x.png
-        images/downarrow@3x.png
-        images/downarrow@4x.png
-        images/leftarrow.png
-        images/leftarrow@2x.png
-        images/leftarrow@3x.png
-        images/leftarrow@4x.png
-        images/rightarrow.png
-        images/rightarrow@2x.png
-        images/rightarrow@3x.png
-        images/rightarrow@4x.png
-)
-
-
-set(qml_files
-    controls/universal/ApplicationWindow.qml
-    controls/universal/BusyIndicator.qml
-    controls/universal/Button.qml
-    controls/universal/CheckBox.qml
-    controls/universal/CheckDelegate.qml
-    controls/universal/CheckIndicator.qml
-    controls/universal/ComboBox.qml
-    controls/universal/DelayButton.qml
-    controls/universal/Dial.qml
-    controls/universal/Dialog.qml
-    controls/universal/DialogButtonBox.qml
-    controls/universal/Drawer.qml
-    controls/universal/Frame.qml
-    controls/universal/GroupBox.qml
-    controls/universal/ItemDelegate.qml
-    controls/universal/Label.qml
-    controls/universal/Menu.qml
-    controls/universal/MenuBar.qml
-    controls/universal/MenuBarItem.qml
-    controls/universal/MenuItem.qml
-    controls/universal/MenuSeparator.qml
-    controls/universal/Page.qml
-    controls/universal/PageIndicator.qml
-    controls/universal/Pane.qml
-    controls/universal/Popup.qml
-    controls/universal/ProgressBar.qml
-    controls/universal/RadioButton.qml
-    controls/universal/RadioDelegate.qml
-    controls/universal/RadioIndicator.qml
-    controls/universal/RangeSlider.qml
-    controls/universal/RoundButton.qml
-    controls/universal/ScrollBar.qml
-    controls/universal/ScrollIndicator.qml
-    controls/universal/Slider.qml
-    controls/universal/SpinBox.qml
-    controls/universal/SplitView.qml
-    controls/universal/StackView.qml
-    controls/universal/SwipeDelegate.qml
-    controls/universal/SwitchDelegate.qml
-    controls/universal/SwitchIndicator.qml
-    controls/universal/Switch.qml
-    controls/universal/TabBar.qml
-    controls/universal/TabButton.qml
-    controls/universal/TextArea.qml
-    controls/universal/TextField.qml
-    controls/universal/ToolBar.qml
-    controls/universal/ToolButton.qml
-    controls/universal/ToolSeparator.qml
-    controls/universal/ToolTip.qml
-    controls/universal/Tumbler.qml
-)
-
-add_qt_resource(qtquickcontrols2universalstyleplugin qmake_QtQuick_Controls_2_Universal
-    PREFIX
-        "/qt-project.org/imports/QtQuick/Controls.2/Universal"
-    FILES
-        ${qml_files}
-)
-
-qt_install_qml_files(qtquickcontrols2universalstyleplugin
-    FILES ${qml_files}
-)
-
-
-#### Keys ignored in scope 8:.:controls/universal:controls/universal/universal.pro:<TRUE>:
-# CONFIG = "no_cxx_module" "install_qml_files" "builtin_resources" "qtquickcompiler"
-# IMPORT_NAME = "QtQuick.Controls.Universal"
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# _LOADED = "qml_plugin"
+add_subdirectory(controls/fusion)
+add_subdirectory(controls/imagine)
+add_subdirectory(controls/material)
+add_subdirectory(controls/universal)
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
index 9afddad3..9bec7cd4 100644
--- a/src/imports/CMakeLists.txt
+++ b/src/imports/CMakeLists.txt
@@ -4,10 +4,7 @@ add_subdirectory(controls)
 add_subdirectory(calendar)
 add_subdirectory(platform)
 add_subdirectory(templates)
-
-# special case begin
-# NOTE: The pro2cmake project will emebed the projects from controls/fusion,
-# controls/imagine, controls/material and controls/universal in this
-# CMakeLists.txt. This is not the correct behavior and should be removed.
-# A special case has been added in controls' CMakeLists.txt to address this.
-# special case end
+add_subdirectory(controls/fusion)
+add_subdirectory(controls/imagine)
+add_subdirectory(controls/material)
+add_subdirectory(controls/universal)
diff --git a/src/imports/calendar/CMakeLists.txt b/src/imports/calendar/CMakeLists.txt
index c16a3113..01fb2a71 100644
--- a/src/imports/calendar/CMakeLists.txt
+++ b/src/imports/calendar/CMakeLists.txt
@@ -5,9 +5,9 @@
 #####################################################################
 
 add_qml_module(qtlabscalendarplugin
-    CPP_PLUGIN
     URI "Qt.labs.calendar"
     VERSION "1.0"
+    CLASSNAME QtLabsCalendarPlugin
     SOURCES
         qquickcalendar.cpp qquickcalendar_p.h
         qquickcalendarmodel.cpp qquickcalendarmodel_p.h
@@ -34,34 +34,35 @@ add_qml_module(qtlabscalendarplugin
         Qt::Quick
 )
 
-set(qml_files
-    DayOfWeekRow.qml
-    MonthGrid.qml
-    WeekNumberColumn.qml
-)
-
-add_qt_resource(qtlabscalendarplugin qmake_Qt_labs_calendar
-    FILES
-        ${qml_files}
-)
-
-qt_install_qml_files(qtlabscalendarplugin
-    FILES ${qml_files}
-)
-
-
 #### Keys ignored in scope 1:.:.:calendar.pro:<TRUE>:
-# CONFIG = "no_cxx_module"
 # IMPORT_VERSION = "1.0"
 # OTHER_FILES = "qmldir"
+# TARGETPATH = "Qt/labs/calendar"
 # _LOADED = "qml_plugin"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:calendar.pro:NOT static:
-# CONFIG = "qmlcache"
-add_qt_docs(
+set(qml_files
+    "DayOfWeekRow.qml"
+    "MonthGrid.qml"
+    "WeekNumberColumn.qml"
+)
+set_source_files_properties(DayOfWeekRow.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "1.0"
+)
+set_source_files_properties(MonthGrid.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "1.0"
+)
+set_source_files_properties(WeekNumberColumn.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "1.0"
+)
+
+qt6_target_qml_files(qtlabscalendarplugin
+    FILES
+        ${qml_files}
+)
+add_qt_docs(qtlabscalendarplugin
     doc/qtlabscalendar.qdocconf
 )
 
diff --git a/src/imports/controls/.prev_CMakeLists.txt b/src/imports/controls/.prev_CMakeLists.txt
index 84f9573c..30d8a0b8 100644
--- a/src/imports/controls/.prev_CMakeLists.txt
+++ b/src/imports/controls/.prev_CMakeLists.txt
@@ -5,11 +5,14 @@
 #####################################################################
 
 add_qml_module(qtquickcontrols2plugin
-    CPP_PLUGIN
     TARGET_PATH "QtQuick/Controls.2"
     URI "QtQuick.Controls"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
-    RESOURCE_PREFIX "/qt-project.org/imports"
+    DESIGNER_SUPPORTED
+    CLASSNAME QtQuickControls2Plugin
+    DEPENDENCIES
+        QtQuick.Templates/2.5
+    SKIP_TYPE_REGISTRATION
     SOURCES
         qquickdefaultbusyindicator.cpp qquickdefaultbusyindicator_p.h
         qquickdefaultdial.cpp qquickdefaultdial_p.h
@@ -35,112 +38,110 @@ add_qml_module(qtquickcontrols2plugin
 )
 
 # Resources:
-add_qt_resource(qtquickcontrols2plugin "qtquickcontrols2plugin"
-    PREFIX
-        "/qt-project.org/imports/QtQuick/Controls.2"
-    FILES
-        images/arrow-indicator.png
-        images/arrow-indicator@2x.png
-        images/arrow-indicator@3x.png
-        images/arrow-indicator@4x.png
-        images/check.png
-        images/check@2x.png
-        images/check@3x.png
-        images/check@4x.png
-        images/dial-indicator.png
-        images/dial-indicator@2x.png
-        images/dial-indicator@3x.png
-        images/dial-indicator@4x.png
-        images/double-arrow.png
-        images/double-arrow@2x.png
-        images/double-arrow@3x.png
-        images/double-arrow@4x.png
-        images/drop-indicator.png
-        images/drop-indicator@2x.png
-        images/drop-indicator@3x.png
-        images/drop-indicator@4x.png
-)
-
-
-set(qml_files
-    AbstractButton.qml
-    Action.qml
-    ActionGroup.qml
-    ApplicationWindow.qml
-    BusyIndicator.qml
-    Button.qml
-    ButtonGroup.qml
-    CheckBox.qml
-    CheckDelegate.qml
-    ComboBox.qml
-    Container.qml
-    Control.qml
-    DelayButton.qml
-    Dial.qml
-    Dialog.qml
-    DialogButtonBox.qml
-    Drawer.qml
-    Frame.qml
-    GroupBox.qml
-    ItemDelegate.qml
-    Label.qml
-    Menu.qml
-    MenuBar.qml
-    MenuBarItem.qml
-    MenuItem.qml
-    MenuSeparator.qml
-    Page.qml
-    PageIndicator.qml
-    Pane.qml
-    Popup.qml
-    ProgressBar.qml
-    RadioButton.qml
-    RadioDelegate.qml
-    RangeSlider.qml
-    RoundButton.qml
-    ScrollBar.qml
-    ScrollIndicator.qml
-    ScrollView.qml
-    Slider.qml
-    SpinBox.qml
-    SplitView.qml
-    StackView.qml
-    SwipeDelegate.qml
-    Switch.qml
-    SwitchDelegate.qml
-    SwipeView.qml
-    TabBar.qml
-    TabButton.qml
-    TextArea.qml
-    TextField.qml
-    ToolBar.qml
-    ToolButton.qml
-    ToolSeparator.qml
-    ToolTip.qml
-    Tumbler.qml
+set(qtquickcontrols2plugin_resource_files
+    "images/arrow-indicator.png"
+    "images/arrow-indicator@2x.png"
+    "images/arrow-indicator@3x.png"
+    "images/arrow-indicator@4x.png"
+    "images/check.png"
+    "images/check@2x.png"
+    "images/check@3x.png"
+    "images/check@4x.png"
+    "images/dial-indicator.png"
+    "images/dial-indicator@2x.png"
+    "images/dial-indicator@3x.png"
+    "images/dial-indicator@4x.png"
+    "images/double-arrow.png"
+    "images/double-arrow@2x.png"
+    "images/double-arrow@3x.png"
+    "images/double-arrow@4x.png"
+    "images/drop-indicator.png"
+    "images/drop-indicator@2x.png"
+    "images/drop-indicator@3x.png"
+    "images/drop-indicator@4x.png"
 )
 
-add_qt_resource(qtquickcontrols2plugin qmake_QtQuick_Controls_2
+add_qt_resource(qtquickcontrols2plugin "qtquickcontrols2plugin"
     PREFIX
         "/qt-project.org/imports/QtQuick/Controls.2"
     FILES
-        ${qml_files}
-)
-
-qt_install_qml_files(qtquickcontrols2plugin
-    FILES ${qml_files}
+        ${qtquickcontrols2plugin_resource_files}
 )
 
 
 #### Keys ignored in scope 1:.:.:controls.pro:<TRUE>:
-# CONFIG = "no_cxx_module" "install_qml_files" "builtin_resources" "qtquickcompiler"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir" "$$QML_FILES" "$$files$$PWD/snippets/*.qml" "$$files$$PWD/src/*.qdoc" "$$files$$PWD/src/calendar/*.qdoc" "$$files$$PWD/src/templates/*.qdoc"
+# OTHER_FILES = "qmldir" "$$QML_FILES" "$$PWD/snippets/*.qml" "$$PWD/src/*.qdoc" "$$PWD/src/calendar/*.qdoc" "$$PWD/src/templates/*.qdoc"
+# TARGETPATH = "QtQuick/Controls.2"
 # _LOADED = "qml_plugin"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-default)"
 
 ## Scopes:
 #####################################################################
-add_qt_docs(
+
+set(qml_files
+    "AbstractButton.qml"
+    "Action.qml"
+    "ActionGroup.qml"
+    "ApplicationWindow.qml"
+    "BusyIndicator.qml"
+    "Button.qml"
+    "ButtonGroup.qml"
+    "CheckBox.qml"
+    "CheckDelegate.qml"
+    "ComboBox.qml"
+    "Container.qml"
+    "Control.qml"
+    "DelayButton.qml"
+    "Dial.qml"
+    "Dialog.qml"
+    "DialogButtonBox.qml"
+    "Drawer.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ItemDelegate.qml"
+    "Label.qml"
+    "Menu.qml"
+    "MenuBar.qml"
+    "MenuBarItem.qml"
+    "MenuItem.qml"
+    "MenuSeparator.qml"
+    "Page.qml"
+    "PageIndicator.qml"
+    "Pane.qml"
+    "Popup.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "RadioDelegate.qml"
+    "RangeSlider.qml"
+    "RoundButton.qml"
+    "ScrollBar.qml"
+    "ScrollIndicator.qml"
+    "ScrollView.qml"
+    "Slider.qml"
+    "SpinBox.qml"
+    "SplitView.qml"
+    "StackView.qml"
+    "SwipeDelegate.qml"
+    "Switch.qml"
+    "SwitchDelegate.qml"
+    "SwipeView.qml"
+    "TabBar.qml"
+    "TabButton.qml"
+    "TextArea.qml"
+    "TextField.qml"
+    "ToolBar.qml"
+    "ToolButton.qml"
+    "ToolSeparator.qml"
+    "ToolTip.qml"
+    "Tumbler.qml"
+)
+
+qt6_target_qml_files(qtquickcontrols2plugin
+    FILES
+        ${qml_files}
+)
+add_qt_docs(qtquickcontrols2plugin
     doc/qtquickcontrols.qdocconf
 )
 
diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt
index 5e8256cf..abb531fc 100644
--- a/src/imports/controls/CMakeLists.txt
+++ b/src/imports/controls/CMakeLists.txt
@@ -5,10 +5,14 @@
 #####################################################################
 
 add_qml_module(qtquickcontrols2plugin
-    CPP_PLUGIN
     TARGET_PATH "QtQuick/Controls.2"
     URI "QtQuick.Controls"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+    DESIGNER_SUPPORTED
+    CLASSNAME QtQuickControls2Plugin
+    DEPENDENCIES
+        QtQuick.Templates/2.5
+    SKIP_TYPE_REGISTRATION
     SOURCES
         qquickdefaultbusyindicator.cpp qquickdefaultbusyindicator_p.h
         qquickdefaultdial.cpp qquickdefaultdial_p.h
@@ -34,114 +38,108 @@ add_qml_module(qtquickcontrols2plugin
 )
 
 # Resources:
-add_qt_resource(qtquickcontrols2plugin "qtquickcontrols2plugin"
-    FILES
-        images/arrow-indicator.png
-        images/arrow-indicator@2x.png
-        images/arrow-indicator@3x.png
-        images/arrow-indicator@4x.png
-        images/check.png
-        images/check@2x.png
-        images/check@3x.png
-        images/check@4x.png
-        images/dial-indicator.png
-        images/dial-indicator@2x.png
-        images/dial-indicator@3x.png
-        images/dial-indicator@4x.png
-        images/double-arrow.png
-        images/double-arrow@2x.png
-        images/double-arrow@3x.png
-        images/double-arrow@4x.png
-        images/drop-indicator.png
-        images/drop-indicator@2x.png
-        images/drop-indicator@3x.png
-        images/drop-indicator@4x.png
+set(qtquickcontrols2plugin_resource_files
+    "images/arrow-indicator.png"
+    "images/arrow-indicator@2x.png"
+    "images/arrow-indicator@3x.png"
+    "images/arrow-indicator@4x.png"
+    "images/check.png"
+    "images/check@2x.png"
+    "images/check@3x.png"
+    "images/check@4x.png"
+    "images/dial-indicator.png"
+    "images/dial-indicator@2x.png"
+    "images/dial-indicator@3x.png"
+    "images/dial-indicator@4x.png"
+    "images/double-arrow.png"
+    "images/double-arrow@2x.png"
+    "images/double-arrow@3x.png"
+    "images/double-arrow@4x.png"
+    "images/drop-indicator.png"
+    "images/drop-indicator@2x.png"
+    "images/drop-indicator@3x.png"
+    "images/drop-indicator@4x.png"
 )
 
-
-set(qml_files
-    AbstractButton.qml
-    Action.qml
-    ActionGroup.qml
-    ApplicationWindow.qml
-    BusyIndicator.qml
-    Button.qml
-    ButtonGroup.qml
-    CheckBox.qml
-    CheckDelegate.qml
-    ComboBox.qml
-    Container.qml
-    Control.qml
-    DelayButton.qml
-    Dial.qml
-    Dialog.qml
-    DialogButtonBox.qml
-    Drawer.qml
-    Frame.qml
-    GroupBox.qml
-    ItemDelegate.qml
-    Label.qml
-    Menu.qml
-    MenuBar.qml
-    MenuBarItem.qml
-    MenuItem.qml
-    MenuSeparator.qml
-    Page.qml
-    PageIndicator.qml
-    Pane.qml
-    Popup.qml
-    ProgressBar.qml
-    RadioButton.qml
-    RadioDelegate.qml
-    RangeSlider.qml
-    RoundButton.qml
-    ScrollBar.qml
-    ScrollIndicator.qml
-    ScrollView.qml
-    Slider.qml
-    SpinBox.qml
-    SplitView.qml
-    StackView.qml
-    SwipeDelegate.qml
-    Switch.qml
-    SwitchDelegate.qml
-    SwipeView.qml
-    TabBar.qml
-    TabButton.qml
-    TextArea.qml
-    TextField.qml
-    ToolBar.qml
-    ToolButton.qml
-    ToolSeparator.qml
-    ToolTip.qml
-    Tumbler.qml
-)
-
-add_qt_resource(qtquickcontrols2plugin qmake_QtQuick_Controls_2
+add_qt_resource(qtquickcontrols2plugin "qtquickcontrols2plugin"
     FILES
-        ${qml_files}
-)
-
-qt_install_qml_files(qtquickcontrols2plugin
-    FILES ${qml_files}
+        ${qtquickcontrols2plugin_resource_files}
 )
 
 
 #### Keys ignored in scope 1:.:.:controls.pro:<TRUE>:
-# CONFIG = "no_cxx_module" "install_qml_files" "builtin_resources" "qtquickcompiler"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir" "$$QML_FILES" "$$files$$PWD/snippets/*.qml" "$$files$$PWD/src/*.qdoc" "$$files$$PWD/src/calendar/*.qdoc" "$$files$$PWD/src/templates/*.qdoc"
+# OTHER_FILES = "qmldir" "$$QML_FILES" "$$PWD/snippets/*.qml" "$$PWD/src/*.qdoc" "$$PWD/src/calendar/*.qdoc" "$$PWD/src/templates/*.qdoc"
+# TARGETPATH = "QtQuick/Controls.2"
 # _LOADED = "qml_plugin"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-default)"
 
 ## Scopes:
 #####################################################################
-add_qt_docs(
+
+set(qml_files
+    "AbstractButton.qml"
+    "Action.qml"
+    "ActionGroup.qml"
+    "ApplicationWindow.qml"
+    "BusyIndicator.qml"
+    "Button.qml"
+    "ButtonGroup.qml"
+    "CheckBox.qml"
+    "CheckDelegate.qml"
+    "ComboBox.qml"
+    "Container.qml"
+    "Control.qml"
+    "DelayButton.qml"
+    "Dial.qml"
+    "Dialog.qml"
+    "DialogButtonBox.qml"
+    "Drawer.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ItemDelegate.qml"
+    "Label.qml"
+    "Menu.qml"
+    "MenuBar.qml"
+    "MenuBarItem.qml"
+    "MenuItem.qml"
+    "MenuSeparator.qml"
+    "Page.qml"
+    "PageIndicator.qml"
+    "Pane.qml"
+    "Popup.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "RadioDelegate.qml"
+    "RangeSlider.qml"
+    "RoundButton.qml"
+    "ScrollBar.qml"
+    "ScrollIndicator.qml"
+    "ScrollView.qml"
+    "Slider.qml"
+    "SpinBox.qml"
+    "SplitView.qml"
+    "StackView.qml"
+    "SwipeDelegate.qml"
+    "Switch.qml"
+    "SwitchDelegate.qml"
+    "SwipeView.qml"
+    "TabBar.qml"
+    "TabButton.qml"
+    "TextArea.qml"
+    "TextField.qml"
+    "ToolBar.qml"
+    "ToolButton.qml"
+    "ToolSeparator.qml"
+    "ToolTip.qml"
+    "Tumbler.qml"
+)
+
+qt6_target_qml_files(qtquickcontrols2plugin
+    FILES
+        ${qml_files}
+)
+add_qt_docs(qtquickcontrols2plugin
     doc/qtquickcontrols.qdocconf
 )
 
-# special case begin
-add_subdirectory(fusion)
-add_subdirectory(imagine)
-add_subdirectory(material)
-add_subdirectory(universal)
-# special case end
diff --git a/src/imports/controls/fusion/.prev_CMakeLists.txt b/src/imports/controls/fusion/.prev_CMakeLists.txt
new file mode 100644
index 00000000..f2b3cd5e
--- /dev/null
+++ b/src/imports/controls/fusion/.prev_CMakeLists.txt
@@ -0,0 +1,132 @@
+# Generated from fusion.pro.
+
+#####################################################################
+## qtquickcontrols2fusionstyleplugin Plugin:
+#####################################################################
+
+add_qml_module(qtquickcontrols2fusionstyleplugin
+    TARGET_PATH "QtQuick/Controls.2/Fusion"
+    URI "QtQuick.Controls.Fusion"
+    VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtQuickControls2FusionStylePlugin
+    DEPENDENCIES
+        QtQuick.Controls/2.5
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        qquickfusionbusyindicator.cpp qquickfusionbusyindicator_p.h
+        qquickfusiondial.cpp qquickfusiondial_p.h
+        qquickfusionknob.cpp qquickfusionknob_p.h
+        qquickfusionstyle.cpp qquickfusionstyle_p.h
+        qquickfusiontheme.cpp qquickfusiontheme_p.h
+        qtquickcontrols2fusionstyleplugin.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2Private
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
+
+# Resources:
+set(qtquickcontrols2fusionstyle_resource_files
+    "images/arrow.png"
+    "images/arrow@2x.png"
+    "images/arrow@3x.png"
+    "images/arrow@4x.png"
+    "images/checkmark.png"
+    "images/checkmark@2x.png"
+    "images/checkmark@3x.png"
+    "images/checkmark@4x.png"
+    "images/progressmask.png"
+    "images/progressmask@2x.png"
+    "images/progressmask@3x.png"
+    "images/progressmask@4x.png"
+)
+
+add_qt_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle"
+    PREFIX
+        "/qt-project.org/imports/QtQuick/Controls.2/Fusion"
+    FILES
+        ${qtquickcontrols2fusionstyle_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:fusion.pro:<TRUE>:
+# IMPORT_NAME = "QtQuick.Controls.Fusion"
+# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
+# OTHER_FILES = "qmldir" "$$QML_FILES"
+# TARGETPATH = "QtQuick/Controls.2/Fusion"
+# _LOADED = "qml_plugin"
+
+set(qml_files
+    "ApplicationWindow.qml"
+    "BusyIndicator.qml"
+    "Button.qml"
+    "ButtonPanel.qml"
+    "CheckBox.qml"
+    "CheckDelegate.qml"
+    "CheckIndicator.qml"
+    "ComboBox.qml"
+    "DelayButton.qml"
+    "Dial.qml"
+    "Dialog.qml"
+    "DialogButtonBox.qml"
+    "Drawer.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ItemDelegate.qml"
+    "Label.qml"
+    "Menu.qml"
+    "MenuBar.qml"
+    "MenuBarItem.qml"
+    "MenuItem.qml"
+    "MenuSeparator.qml"
+    "Page.qml"
+    "PageIndicator.qml"
+    "Pane.qml"
+    "Popup.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "RadioDelegate.qml"
+    "RadioIndicator.qml"
+    "RangeSlider.qml"
+    "RoundButton.qml"
+    "ScrollBar.qml"
+    "ScrollIndicator.qml"
+    "Slider.qml"
+    "SliderGroove.qml"
+    "SliderHandle.qml"
+    "SpinBox.qml"
+    "SplitView.qml"
+    "SwipeDelegate.qml"
+    "SwitchDelegate.qml"
+    "SwitchIndicator.qml"
+    "Switch.qml"
+    "TabBar.qml"
+    "TabButton.qml"
+    "TextArea.qml"
+    "TextField.qml"
+    "ToolBar.qml"
+    "ToolButton.qml"
+    "ToolSeparator.qml"
+    "ToolTip.qml"
+    "Tumbler.qml"
+)
+
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SOURCE_INSTALL TRUE
+)
+
+qt6_target_qml_files(qtquickcontrols2fusionstyleplugin
+    FILES
+        ${qml_files}
+)
diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt
index 3607f27c..581dc739 100644
--- a/src/imports/controls/fusion/CMakeLists.txt
+++ b/src/imports/controls/fusion/CMakeLists.txt
@@ -5,10 +5,13 @@
 #####################################################################
 
 add_qml_module(qtquickcontrols2fusionstyleplugin
-    CPP_PLUGIN
     TARGET_PATH "QtQuick/Controls.2/Fusion"
     URI "QtQuick.Controls.Fusion"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtQuickControls2FusionStylePlugin
+    DEPENDENCIES
+        QtQuick.Controls/2.5
+    SKIP_TYPE_REGISTRATION
     SOURCES
         qquickfusionbusyindicator.cpp qquickfusionbusyindicator_p.h
         qquickfusiondial.cpp qquickfusiondial_p.h
@@ -34,93 +37,93 @@ add_qml_module(qtquickcontrols2fusionstyleplugin
 )
 
 # Resources:
+set(qtquickcontrols2fusionstyle_resource_files
+    "images/arrow.png"
+    "images/arrow@2x.png"
+    "images/arrow@3x.png"
+    "images/arrow@4x.png"
+    "images/checkmark.png"
+    "images/checkmark@2x.png"
+    "images/checkmark@3x.png"
+    "images/checkmark@4x.png"
+    "images/progressmask.png"
+    "images/progressmask@2x.png"
+    "images/progressmask@3x.png"
+    "images/progressmask@4x.png"
+)
+
 add_qt_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle"
     PREFIX
-        "qt-project.org/imports/QtQuick/Controls.2/Fusion"
+        "/qt-project.org/imports/QtQuick/Controls.2/Fusion"
     FILES
-        images/arrow.png
-        images/arrow@2x.png
-        images/arrow@3x.png
-        images/arrow@4x.png
-        images/checkmark.png
-        images/checkmark@2x.png
-        images/checkmark@3x.png
-        images/checkmark@4x.png
-        images/progressmask.png
-        images/progressmask@2x.png
-        images/progressmask@3x.png
-        images/progressmask@4x.png
+        ${qtquickcontrols2fusionstyle_resource_files}
 )
 
 
+#### Keys ignored in scope 1:.:.:fusion.pro:<TRUE>:
+# IMPORT_NAME = "QtQuick.Controls.Fusion"
+# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
+# OTHER_FILES = "qmldir" "$$QML_FILES"
+# TARGETPATH = "QtQuick/Controls.2/Fusion"
+# _LOADED = "qml_plugin"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-fusion)"
+
 set(qml_files
-    ApplicationWindow.qml
-    BusyIndicator.qml
-    Button.qml
-    ButtonPanel.qml
-    CheckBox.qml
-    CheckDelegate.qml
-    CheckIndicator.qml
-    ComboBox.qml
-    DelayButton.qml
-    Dial.qml
-    Dialog.qml
-    DialogButtonBox.qml
-    Drawer.qml
-    Frame.qml
-    GroupBox.qml
-    ItemDelegate.qml
-    Label.qml
-    Menu.qml
-    MenuBar.qml
-    MenuBarItem.qml
-    MenuItem.qml
-    MenuSeparator.qml
-    Page.qml
-    PageIndicator.qml
-    Pane.qml
-    Popup.qml
-    ProgressBar.qml
-    RadioButton.qml
-    RadioDelegate.qml
-    RadioIndicator.qml
-    RangeSlider.qml
-    RoundButton.qml
-    ScrollBar.qml
-    ScrollIndicator.qml
-    Slider.qml
-    SliderGroove.qml
-    SliderHandle.qml
-    SpinBox.qml
-    SplitView.qml
-    SwipeDelegate.qml
-    SwitchDelegate.qml
-    SwitchIndicator.qml
-    Switch.qml
-    TabBar.qml
-    TabButton.qml
-    TextArea.qml
-    TextField.qml
-    ToolBar.qml
-    ToolButton.qml
-    ToolSeparator.qml
-    ToolTip.qml
-    Tumbler.qml
+    "ApplicationWindow.qml"
+    "BusyIndicator.qml"
+    "Button.qml"
+    "ButtonPanel.qml"
+    "CheckBox.qml"
+    "CheckDelegate.qml"
+    "CheckIndicator.qml"
+    "ComboBox.qml"
+    "DelayButton.qml"
+    "Dial.qml"
+    "Dialog.qml"
+    "DialogButtonBox.qml"
+    "Drawer.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ItemDelegate.qml"
+    "Label.qml"
+    "Menu.qml"
+    "MenuBar.qml"
+    "MenuBarItem.qml"
+    "MenuItem.qml"
+    "MenuSeparator.qml"
+    "Page.qml"
+    "PageIndicator.qml"
+    "Pane.qml"
+    "Popup.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "RadioDelegate.qml"
+    "RadioIndicator.qml"
+    "RangeSlider.qml"
+    "RoundButton.qml"
+    "ScrollBar.qml"
+    "ScrollIndicator.qml"
+    "Slider.qml"
+    "SliderGroove.qml"
+    "SliderHandle.qml"
+    "SpinBox.qml"
+    "SplitView.qml"
+    "SwipeDelegate.qml"
+    "SwitchDelegate.qml"
+    "SwitchIndicator.qml"
+    "Switch.qml"
+    "TabBar.qml"
+    "TabButton.qml"
+    "TextArea.qml"
+    "TextField.qml"
+    "ToolBar.qml"
+    "ToolButton.qml"
+    "ToolSeparator.qml"
+    "ToolTip.qml"
+    "Tumbler.qml"
 )
 
-add_qt_resource(qtquickcontrols2fusionstyleplugin qmake_QtQuick_Controls_2_Fusion
+qt6_target_qml_files(qtquickcontrols2fusionstyleplugin
     FILES
         ${qml_files}
 )
-
-qt_install_qml_files(qtquickcontrols2fusionstyleplugin
-    FILES ${qml_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:fusion.pro:<TRUE>:
-# CONFIG = "no_cxx_module" "install_qml_files" "builtin_resources" "qtquickcompiler"
-# IMPORT_NAME = "QtQuick.Controls.Fusion"
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/controls/imagine/.prev_CMakeLists.txt b/src/imports/controls/imagine/.prev_CMakeLists.txt
new file mode 100644
index 00000000..b2a50e05
--- /dev/null
+++ b/src/imports/controls/imagine/.prev_CMakeLists.txt
@@ -0,0 +1,126 @@
+# Generated from imagine.pro.
+
+#####################################################################
+## qtquickcontrols2imaginestyleplugin Plugin:
+#####################################################################
+
+add_qml_module(qtquickcontrols2imaginestyleplugin
+    TARGET_PATH "QtQuick/Controls.2/Imagine"
+    URI "QtQuick.Controls.Imagine"
+    VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtQuickControls2ImagineStylePlugin
+    DEPENDENCIES
+        QtQuick.Controls/2.5
+        QtGraphicalEffects/1.0
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        qquickimageselector.cpp qquickimageselector_p.h
+        qquickimaginestyle.cpp qquickimaginestyle_p.h
+        qquickimaginetheme.cpp qquickimaginetheme_p.h
+        qquickninepatchimage.cpp qquickninepatchimage_p.h
+        qtquickcontrols2imaginestyleplugin.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2Private
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
+
+file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "images/*.png")
+foreach(file IN LISTS resource_glob_0)
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+endforeach()
+
+file(GLOB resource_glob_1 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "images/*.webp")
+foreach(file IN LISTS resource_glob_1)
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+endforeach()
+
+# Resources:
+set(qmake_qtquickcontrols2imaginestyle_resource_files
+    ${resource_glob_0}
+    ${resource_glob_1}
+)
+
+add_qt_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle"
+    PREFIX
+        "qt-project.org/imports/QtQuick/Controls.2/Imagine"
+    FILES
+        ${qmake_qtquickcontrols2imaginestyle_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:imagine.pro:<TRUE>:
+# IMPORT_NAME = "QtQuick.Controls.Imagine"
+# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
+# OTHER_FILES = "qmldir" "$$QML_FILES"
+# TARGETPATH = "QtQuick/Controls.2/Imagine"
+# _LOADED = "qml_plugin"
+
+set(qml_files
+    "ApplicationWindow.qml"
+    "BusyIndicator.qml"
+    "Button.qml"
+    "CheckBox.qml"
+    "CheckDelegate.qml"
+    "ComboBox.qml"
+    "DelayButton.qml"
+    "Dial.qml"
+    "Dialog.qml"
+    "DialogButtonBox.qml"
+    "Drawer.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ItemDelegate.qml"
+    "Label.qml"
+    "Menu.qml"
+    "MenuItem.qml"
+    "MenuSeparator.qml"
+    "PageIndicator.qml"
+    "Page.qml"
+    "Pane.qml"
+    "Popup.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "RadioDelegate.qml"
+    "RangeSlider.qml"
+    "RoundButton.qml"
+    "ScrollBar.qml"
+    "ScrollIndicator.qml"
+    "Slider.qml"
+    "SpinBox.qml"
+    "SplitView.qml"
+    "StackView.qml"
+    "SwipeDelegate.qml"
+    "SwipeView.qml"
+    "Switch.qml"
+    "SwitchDelegate.qml"
+    "TextField.qml"
+    "TextArea.qml"
+    "TabBar.qml"
+    "TabButton.qml"
+    "ToolBar.qml"
+    "ToolButton.qml"
+    "ToolSeparator.qml"
+    "ToolTip.qml"
+    "Tumbler.qml"
+)
+
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SOURCE_INSTALL TRUE
+)
+
+qt6_target_qml_files(qtquickcontrols2imaginestyleplugin
+    FILES
+        ${qml_files}
+)
diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt
index bc89f88a..98661788 100644
--- a/src/imports/controls/imagine/CMakeLists.txt
+++ b/src/imports/controls/imagine/CMakeLists.txt
@@ -5,10 +5,14 @@
 #####################################################################
 
 add_qml_module(qtquickcontrols2imaginestyleplugin
-    CPP_PLUGIN
     TARGET_PATH "QtQuick/Controls.2/Imagine"
     URI "QtQuick.Controls.Imagine"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtQuickControls2ImagineStylePlugin
+    DEPENDENCIES
+        QtQuick.Controls/2.5
+        QtGraphicalEffects/1.0
+    SKIP_TYPE_REGISTRATION
     SOURCES
         qquickimageselector.cpp qquickimageselector_p.h
         qquickimaginestyle.cpp qquickimaginestyle_p.h
@@ -32,70 +36,88 @@ add_qml_module(qtquickcontrols2imaginestyleplugin
         Qt::Quick
 )
 
-set(qml_files
-    ApplicationWindow.qml
-    BusyIndicator.qml
-    Button.qml
-    CheckBox.qml
-    CheckDelegate.qml
-    ComboBox.qml
-    DelayButton.qml
-    Dial.qml
-    Dialog.qml
-    DialogButtonBox.qml
-    Drawer.qml
-    Frame.qml
-    GroupBox.qml
-    ItemDelegate.qml
-    Label.qml
-    Menu.qml
-    MenuItem.qml
-    MenuSeparator.qml
-    PageIndicator.qml
-    Page.qml
-    Pane.qml
-    Popup.qml
-    ProgressBar.qml
-    RadioButton.qml
-    RadioDelegate.qml
-    RangeSlider.qml
-    RoundButton.qml
-    ScrollBar.qml
-    ScrollIndicator.qml
-    Slider.qml
-    SpinBox.qml
-    SplitView.qml
-    StackView.qml
-    SwipeDelegate.qml
-    SwipeView.qml
-    Switch.qml
-    SwitchDelegate.qml
-    TextField.qml
-    TextArea.qml
-    TabBar.qml
-    TabButton.qml
-    ToolBar.qml
-    ToolButton.qml
-    ToolSeparator.qml
-    ToolTip.qml
-    Tumbler.qml
-)
+file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "images/*.png")
+foreach(file IN LISTS resource_glob_0)
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+endforeach()
 
-add_qt_resource(qtquickcontrols2imaginestyleplugin qmake_QtQuick_Controls_2_Imagine
-    FILES
-        ${qml_files}
+file(GLOB resource_glob_1 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "images/*.webp")
+foreach(file IN LISTS resource_glob_1)
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+endforeach()
+
+# Resources:
+set(qmake_qtquickcontrols2imaginestyle_resource_files
+    ${resource_glob_0}
+    ${resource_glob_1}
 )
 
-qt_install_qml_files(qtquickcontrols2imaginestyleplugin
-    FILES ${qml_files}
+add_qt_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle"
+    PREFIX
+        "qt-project.org/imports/QtQuick/Controls.2/Imagine"
+    FILES
+        ${qmake_qtquickcontrols2imaginestyle_resource_files}
 )
 
 
 #### Keys ignored in scope 1:.:.:imagine.pro:<TRUE>:
-# CONFIG = "no_cxx_module" "install_qml_files" "builtin_resources" "qtquickcompiler"
 # IMPORT_NAME = "QtQuick.Controls.Imagine"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # OTHER_FILES = "qmldir" "$$QML_FILES"
+# TARGETPATH = "QtQuick/Controls.2/Imagine"
 # _LOADED = "qml_plugin"
-# qtquickcontrols2imaginestyle.files = "$$files$$PWD/images/*.png" "$$files$$PWD/images/*.webp"
-# qtquickcontrols2imaginestyle.prefix = "qt-project.org/imports/QtQuick/Controls.2/Imagine"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-imagine)"
+
+set(qml_files
+    "ApplicationWindow.qml"
+    "BusyIndicator.qml"
+    "Button.qml"
+    "CheckBox.qml"
+    "CheckDelegate.qml"
+    "ComboBox.qml"
+    "DelayButton.qml"
+    "Dial.qml"
+    "Dialog.qml"
+    "DialogButtonBox.qml"
+    "Drawer.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ItemDelegate.qml"
+    "Label.qml"
+    "Menu.qml"
+    "MenuItem.qml"
+    "MenuSeparator.qml"
+    "PageIndicator.qml"
+    "Page.qml"
+    "Pane.qml"
+    "Popup.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "RadioDelegate.qml"
+    "RangeSlider.qml"
+    "RoundButton.qml"
+    "ScrollBar.qml"
+    "ScrollIndicator.qml"
+    "Slider.qml"
+    "SpinBox.qml"
+    "SplitView.qml"
+    "StackView.qml"
+    "SwipeDelegate.qml"
+    "SwipeView.qml"
+    "Switch.qml"
+    "SwitchDelegate.qml"
+    "TextField.qml"
+    "TextArea.qml"
+    "TabBar.qml"
+    "TabButton.qml"
+    "ToolBar.qml"
+    "ToolButton.qml"
+    "ToolSeparator.qml"
+    "ToolTip.qml"
+    "Tumbler.qml"
+)
+
+qt6_target_qml_files(qtquickcontrols2imaginestyleplugin
+    FILES
+        ${qml_files}
+)
diff --git a/src/imports/controls/material/.prev_CMakeLists.txt b/src/imports/controls/material/.prev_CMakeLists.txt
new file mode 100644
index 00000000..3cf6d5d2
--- /dev/null
+++ b/src/imports/controls/material/.prev_CMakeLists.txt
@@ -0,0 +1,140 @@
+# Generated from material.pro.
+
+#####################################################################
+## qtquickcontrols2materialstyleplugin Plugin:
+#####################################################################
+
+add_qml_module(qtquickcontrols2materialstyleplugin
+    TARGET_PATH "QtQuick/Controls.2/Material"
+    URI "QtQuick.Controls.Material"
+    VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtQuickControls2MaterialStylePlugin
+    DEPENDENCIES
+        QtQuick.Controls/2.5
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        qquickmaterialbusyindicator.cpp qquickmaterialbusyindicator_p.h
+        qquickmaterialprogressbar.cpp qquickmaterialprogressbar_p.h
+        qquickmaterialripple.cpp qquickmaterialripple_p.h
+        qquickmaterialstyle.cpp qquickmaterialstyle_p.h
+        qquickmaterialtheme.cpp qquickmaterialtheme_p.h
+        qtquickcontrols2materialstyleplugin.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2Private
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
+
+# Resources:
+set(qtquickcontrols2materialstyleplugin_resource_files
+    "images/arrow-indicator.png"
+    "images/arrow-indicator@2x.png"
+    "images/arrow-indicator@3x.png"
+    "images/arrow-indicator@4x.png"
+    "images/check.png"
+    "images/check@2x.png"
+    "images/check@3x.png"
+    "images/check@4x.png"
+    "images/drop-indicator.png"
+    "images/drop-indicator@2x.png"
+    "images/drop-indicator@3x.png"
+    "images/drop-indicator@4x.png"
+    "shaders/+glslcore/RectangularGlow.frag"
+    "shaders/+hlsl/RectangularGlow.frag"
+    "shaders/+qsb/RectangularGlow.frag"
+    "shaders/RectangularGlow.frag"
+)
+
+add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin"
+    PREFIX
+        "/qt-project.org/imports/QtQuick/Controls.2/Material"
+    FILES
+        ${qtquickcontrols2materialstyleplugin_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:material.pro:<TRUE>:
+# IMPORT_NAME = "QtQuick.Controls.Material"
+# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
+# OTHER_FILES = "qmldir" "$$QML_FILES"
+# TARGETPATH = "QtQuick/Controls.2/Material"
+# _LOADED = "qml_plugin"
+
+set(qml_files
+    "ApplicationWindow.qml"
+    "BoxShadow.qml"
+    "BusyIndicator.qml"
+    "Button.qml"
+    "CheckBox.qml"
+    "CheckDelegate.qml"
+    "CheckIndicator.qml"
+    "ComboBox.qml"
+    "CursorDelegate.qml"
+    "DelayButton.qml"
+    "Dial.qml"
+    "Dialog.qml"
+    "DialogButtonBox.qml"
+    "Drawer.qml"
+    "ElevationEffect.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ItemDelegate.qml"
+    "Label.qml"
+    "Menu.qml"
+    "MenuBar.qml"
+    "MenuBarItem.qml"
+    "MenuItem.qml"
+    "MenuSeparator.qml"
+    "Page.qml"
+    "PageIndicator.qml"
+    "Pane.qml"
+    "Popup.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "RadioDelegate.qml"
+    "RadioIndicator.qml"
+    "RangeSlider.qml"
+    "RoundButton.qml"
+    "RectangularGlow.qml"
+    "ScrollBar.qml"
+    "ScrollIndicator.qml"
+    "Slider.qml"
+    "SliderHandle.qml"
+    "SpinBox.qml"
+    "SplitView.qml"
+    "StackView.qml"
+    "SwipeDelegate.qml"
+    "SwipeView.qml"
+    "Switch.qml"
+    "SwitchDelegate.qml"
+    "SwitchIndicator.qml"
+    "TabBar.qml"
+    "TabButton.qml"
+    "TextArea.qml"
+    "TextField.qml"
+    "ToolBar.qml"
+    "ToolButton.qml"
+    "ToolSeparator.qml"
+    "ToolTip.qml"
+    "Tumbler.qml"
+)
+
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SOURCE_INSTALL TRUE
+)
+
+qt6_target_qml_files(qtquickcontrols2materialstyleplugin
+    FILES
+        ${qml_files}
+)
diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt
index c1c964b2..ae5ffe83 100644
--- a/src/imports/controls/material/CMakeLists.txt
+++ b/src/imports/controls/material/CMakeLists.txt
@@ -5,10 +5,13 @@
 #####################################################################
 
 add_qml_module(qtquickcontrols2materialstyleplugin
-    CPP_PLUGIN
     TARGET_PATH "QtQuick/Controls.2/Material"
     URI "QtQuick.Controls.Material"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtQuickControls2MaterialStylePlugin
+    DEPENDENCIES
+        QtQuick.Controls/2.5
+    SKIP_TYPE_REGISTRATION
     SOURCES
         qquickmaterialbusyindicator.cpp qquickmaterialbusyindicator_p.h
         qquickmaterialprogressbar.cpp qquickmaterialprogressbar_p.h
@@ -61,6 +64,14 @@ add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialsty
 )
 
 
+#### Keys ignored in scope 1:.:.:material.pro:<TRUE>:
+# IMPORT_NAME = "QtQuick.Controls.Material"
+# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
+# OTHER_FILES = "qmldir" "$$QML_FILES"
+# TARGETPATH = "QtQuick/Controls.2/Material"
+# _LOADED = "qml_plugin"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-material)"
+
 set(qml_files
     "ApplicationWindow.qml"
     "BoxShadow.qml"
@@ -120,18 +131,7 @@ set(qml_files
     "Tumbler.qml"
 )
 
-add_qt_resource(qtquickcontrols2materialstyleplugin qmake_QtQuick_Controls_2_Material
+qt6_target_qml_files(qtquickcontrols2materialstyleplugin
     FILES
         ${qml_files}
 )
-
-qt_install_qml_files(qtquickcontrols2materialstyleplugin
-    FILES ${qml_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:material.pro:<TRUE>:
-# IMPORT_NAME = "QtQuick.Controls.Material"
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/controls/universal/.prev_CMakeLists.txt b/src/imports/controls/universal/.prev_CMakeLists.txt
new file mode 100644
index 00000000..c14876da
--- /dev/null
+++ b/src/imports/controls/universal/.prev_CMakeLists.txt
@@ -0,0 +1,134 @@
+# Generated from universal.pro.
+
+#####################################################################
+## qtquickcontrols2universalstyleplugin Plugin:
+#####################################################################
+
+add_qml_module(qtquickcontrols2universalstyleplugin
+    TARGET_PATH "QtQuick/Controls.2/Universal"
+    URI "QtQuick.Controls.Universal"
+    VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtQuickControls2UniversalStylePlugin
+    DEPENDENCIES
+        QtQuick.Controls/2.5
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        qquickuniversalbusyindicator.cpp qquickuniversalbusyindicator_p.h
+        qquickuniversalfocusrectangle.cpp qquickuniversalfocusrectangle_p.h
+        qquickuniversalprogressbar.cpp qquickuniversalprogressbar_p.h
+        qquickuniversalstyle.cpp qquickuniversalstyle_p.h
+        qquickuniversaltheme.cpp qquickuniversaltheme_p.h
+        qtquickcontrols2universalstyleplugin.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2Private
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
+
+# Resources:
+set(qtquickcontrols2universalstyleplugin_resource_files
+    "images/checkmark.png"
+    "images/checkmark@2x.png"
+    "images/checkmark@3x.png"
+    "images/checkmark@4x.png"
+    "images/downarrow.png"
+    "images/downarrow@2x.png"
+    "images/downarrow@3x.png"
+    "images/downarrow@4x.png"
+    "images/leftarrow.png"
+    "images/leftarrow@2x.png"
+    "images/leftarrow@3x.png"
+    "images/leftarrow@4x.png"
+    "images/rightarrow.png"
+    "images/rightarrow@2x.png"
+    "images/rightarrow@3x.png"
+    "images/rightarrow@4x.png"
+)
+
+add_qt_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin"
+    PREFIX
+        "/qt-project.org/imports/QtQuick/Controls.2/Universal"
+    FILES
+        ${qtquickcontrols2universalstyleplugin_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:universal.pro:<TRUE>:
+# IMPORT_NAME = "QtQuick.Controls.Universal"
+# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
+# OTHER_FILES = "qmldir" "$$QML_FILES"
+# TARGETPATH = "QtQuick/Controls.2/Universal"
+# _LOADED = "qml_plugin"
+
+set(qml_files
+    "ApplicationWindow.qml"
+    "BusyIndicator.qml"
+    "Button.qml"
+    "CheckBox.qml"
+    "CheckDelegate.qml"
+    "CheckIndicator.qml"
+    "ComboBox.qml"
+    "DelayButton.qml"
+    "Dial.qml"
+    "Dialog.qml"
+    "DialogButtonBox.qml"
+    "Drawer.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ItemDelegate.qml"
+    "Label.qml"
+    "Menu.qml"
+    "MenuBar.qml"
+    "MenuBarItem.qml"
+    "MenuItem.qml"
+    "MenuSeparator.qml"
+    "Page.qml"
+    "PageIndicator.qml"
+    "Pane.qml"
+    "Popup.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "RadioDelegate.qml"
+    "RadioIndicator.qml"
+    "RangeSlider.qml"
+    "RoundButton.qml"
+    "ScrollBar.qml"
+    "ScrollIndicator.qml"
+    "Slider.qml"
+    "SpinBox.qml"
+    "SplitView.qml"
+    "StackView.qml"
+    "SwipeDelegate.qml"
+    "SwitchDelegate.qml"
+    "SwitchIndicator.qml"
+    "Switch.qml"
+    "TabBar.qml"
+    "TabButton.qml"
+    "TextArea.qml"
+    "TextField.qml"
+    "ToolBar.qml"
+    "ToolButton.qml"
+    "ToolSeparator.qml"
+    "ToolTip.qml"
+    "Tumbler.qml"
+)
+
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SOURCE_INSTALL TRUE
+)
+
+qt6_target_qml_files(qtquickcontrols2universalstyleplugin
+    FILES
+        ${qml_files}
+)
diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt
index b9b66221..3f4ef34b 100644
--- a/src/imports/controls/universal/CMakeLists.txt
+++ b/src/imports/controls/universal/CMakeLists.txt
@@ -5,10 +5,13 @@
 #####################################################################
 
 add_qml_module(qtquickcontrols2universalstyleplugin
-    CPP_PLUGIN
     TARGET_PATH "QtQuick/Controls.2/Universal"
     URI "QtQuick.Controls.Universal"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtQuickControls2UniversalStylePlugin
+    DEPENDENCIES
+        QtQuick.Controls/2.5
+    SKIP_TYPE_REGISTRATION
     SOURCES
         qquickuniversalbusyindicator.cpp qquickuniversalbusyindicator_p.h
         qquickuniversalfocusrectangle.cpp qquickuniversalfocusrectangle_p.h
@@ -34,95 +37,95 @@ add_qml_module(qtquickcontrols2universalstyleplugin
 )
 
 # Resources:
+set(qtquickcontrols2universalstyleplugin_resource_files
+    "images/checkmark.png"
+    "images/checkmark@2x.png"
+    "images/checkmark@3x.png"
+    "images/checkmark@4x.png"
+    "images/downarrow.png"
+    "images/downarrow@2x.png"
+    "images/downarrow@3x.png"
+    "images/downarrow@4x.png"
+    "images/leftarrow.png"
+    "images/leftarrow@2x.png"
+    "images/leftarrow@3x.png"
+    "images/leftarrow@4x.png"
+    "images/rightarrow.png"
+    "images/rightarrow@2x.png"
+    "images/rightarrow@3x.png"
+    "images/rightarrow@4x.png"
+)
+
 add_qt_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin"
     PREFIX
-        "qt-project.org/imports/QtQuick/Controls.2/Universal"
+        "/qt-project.org/imports/QtQuick/Controls.2/Universal"
     FILES
-        images/checkmark.png
-        images/checkmark@2x.png
-        images/checkmark@3x.png
-        images/checkmark@4x.png
-        images/downarrow.png
-        images/downarrow@2x.png
-        images/downarrow@3x.png
-        images/downarrow@4x.png
-        images/leftarrow.png
-        images/leftarrow@2x.png
-        images/leftarrow@3x.png
-        images/leftarrow@4x.png
-        images/rightarrow.png
-        images/rightarrow@2x.png
-        images/rightarrow@3x.png
-        images/rightarrow@4x.png
+        ${qtquickcontrols2universalstyleplugin_resource_files}
 )
 
 
+#### Keys ignored in scope 1:.:.:universal.pro:<TRUE>:
+# IMPORT_NAME = "QtQuick.Controls.Universal"
+# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
+# OTHER_FILES = "qmldir" "$$QML_FILES"
+# TARGETPATH = "QtQuick/Controls.2/Universal"
+# _LOADED = "qml_plugin"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-universal)"
+
 set(qml_files
-    ApplicationWindow.qml
-    BusyIndicator.qml
-    Button.qml
-    CheckBox.qml
-    CheckDelegate.qml
-    CheckIndicator.qml
-    ComboBox.qml
-    DelayButton.qml
-    Dial.qml
-    Dialog.qml
-    DialogButtonBox.qml
-    Drawer.qml
-    Frame.qml
-    GroupBox.qml
-    ItemDelegate.qml
-    Label.qml
-    Menu.qml
-    MenuBar.qml
-    MenuBarItem.qml
-    MenuItem.qml
-    MenuSeparator.qml
-    Page.qml
-    PageIndicator.qml
-    Pane.qml
-    Popup.qml
-    ProgressBar.qml
-    RadioButton.qml
-    RadioDelegate.qml
-    RadioIndicator.qml
-    RangeSlider.qml
-    RoundButton.qml
-    ScrollBar.qml
-    ScrollIndicator.qml
-    Slider.qml
-    SpinBox.qml
-    SplitView.qml
-    StackView.qml
-    SwipeDelegate.qml
-    SwitchDelegate.qml
-    SwitchIndicator.qml
-    Switch.qml
-    TabBar.qml
-    TabButton.qml
-    TextArea.qml
-    TextField.qml
-    ToolBar.qml
-    ToolButton.qml
-    ToolSeparator.qml
-    ToolTip.qml
-    Tumbler.qml
+    "ApplicationWindow.qml"
+    "BusyIndicator.qml"
+    "Button.qml"
+    "CheckBox.qml"
+    "CheckDelegate.qml"
+    "CheckIndicator.qml"
+    "ComboBox.qml"
+    "DelayButton.qml"
+    "Dial.qml"
+    "Dialog.qml"
+    "DialogButtonBox.qml"
+    "Drawer.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ItemDelegate.qml"
+    "Label.qml"
+    "Menu.qml"
+    "MenuBar.qml"
+    "MenuBarItem.qml"
+    "MenuItem.qml"
+    "MenuSeparator.qml"
+    "Page.qml"
+    "PageIndicator.qml"
+    "Pane.qml"
+    "Popup.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "RadioDelegate.qml"
+    "RadioIndicator.qml"
+    "RangeSlider.qml"
+    "RoundButton.qml"
+    "ScrollBar.qml"
+    "ScrollIndicator.qml"
+    "Slider.qml"
+    "SpinBox.qml"
+    "SplitView.qml"
+    "StackView.qml"
+    "SwipeDelegate.qml"
+    "SwitchDelegate.qml"
+    "SwitchIndicator.qml"
+    "Switch.qml"
+    "TabBar.qml"
+    "TabButton.qml"
+    "TextArea.qml"
+    "TextField.qml"
+    "ToolBar.qml"
+    "ToolButton.qml"
+    "ToolSeparator.qml"
+    "ToolTip.qml"
+    "Tumbler.qml"
 )
 
-add_qt_resource(qtquickcontrols2universalstyleplugin qmake_QtQuick_Controls_2_Universal
+qt6_target_qml_files(qtquickcontrols2universalstyleplugin
     FILES
         ${qml_files}
 )
-
-qt_install_qml_files(qtquickcontrols2universalstyleplugin
-    FILES ${qml_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:universal.pro:<TRUE>:
-# CONFIG = "no_cxx_module" "install_qml_files" "builtin_resources" "qtquickcompiler"
-# IMPORT_NAME = "QtQuick.Controls.Universal"
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/platform/CMakeLists.txt b/src/imports/platform/CMakeLists.txt
index 2a1e5205..fdcd46c9 100644
--- a/src/imports/platform/CMakeLists.txt
+++ b/src/imports/platform/CMakeLists.txt
@@ -5,9 +5,10 @@
 #####################################################################
 
 add_qml_module(qtlabsplatformplugin
-    CPP_PLUGIN
     URI "Qt.labs.platform"
     VERSION "1.0"
+    CLASSNAME QtLabsPlatformPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         qquickplatformcolordialog.cpp qquickplatformcolordialog_p.h
         qquickplatformdialog.cpp qquickplatformdialog_p.h
@@ -40,7 +41,6 @@ add_qml_module(qtlabsplatformplugin
 )
 
 #### Keys ignored in scope 1:.:.:platform.pro:<TRUE>:
-# CONFIG = "no_cxx_module"
 # IMPORT_VERSION = "1.0"
 # OTHER_FILES = "qmldir"
 # TARGETPATH = "Qt/labs/platform"
@@ -96,7 +96,7 @@ extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_systemtrayicon
     SOURCES
         qquickplatformsystemtrayicon.cpp qquickplatformsystemtrayicon_p.h
 )
-add_qt_docs(
+add_qt_docs(qtlabsplatformplugin
     doc/qtlabsplatform.qdocconf
 )
 
diff --git a/src/imports/templates/CMakeLists.txt b/src/imports/templates/CMakeLists.txt
index fe91f792..f2ceae84 100644
--- a/src/imports/templates/CMakeLists.txt
+++ b/src/imports/templates/CMakeLists.txt
@@ -5,10 +5,13 @@
 #####################################################################
 
 add_qml_module(qtquicktemplates2plugin
-    CPP_PLUGIN
     TARGET_PATH "QtQuick/Templates.2"
     URI "QtQuick.Templates"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QtQuickTemplates2Plugin
+    DEPENDENCIES
+        QtQuick.Window/2.2
+    SKIP_TYPE_REGISTRATION
     SOURCES
         qtquicktemplates2plugin.cpp
     DEFINES
@@ -28,7 +31,6 @@ add_qml_module(qtquicktemplates2plugin
 )
 
 #### Keys ignored in scope 1:.:.:templates.pro:<TRUE>:
-# CONFIG = "no_cxx_module"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # OTHER_FILES = "qmldir"
 # TARGETPATH = "QtQuick/Templates.2"
diff --git a/src/quickcontrols2/CMakeLists.txt b/src/quickcontrols2/CMakeLists.txt
index cda0f8d2..7c4aaf1f 100644
--- a/src/quickcontrols2/CMakeLists.txt
+++ b/src/quickcontrols2/CMakeLists.txt
@@ -35,6 +35,8 @@ add_qt_module(QuickControls2
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
     PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
         Qt::Quick
 )
 
diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates2/CMakeLists.txt
index 64b5fcad..3cc21ac9 100644
--- a/src/quicktemplates2/CMakeLists.txt
+++ b/src/quicktemplates2/CMakeLists.txt
@@ -122,6 +122,8 @@ add_qt_module(QuickTemplates2
         Qt::QmlPrivate
         Qt::QuickPrivate
     PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
         Qt::Quick
 )