2454 files changed, 769 insertions, 1724 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b11240bc3..deb79c7b66 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,8 @@
 # Generated from src.pro.
 
 add_subdirectory(quicktemplates2)
-add_subdirectory(quickcontrols2)
 add_subdirectory(quickcontrols2impl)
+add_subdirectory(quickcontrols2)
 add_subdirectory(quickdialogs2)
-add_subdirectory(imports)
+add_subdirectory(quicknativestyle)
+add_subdirectory(labs)
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
deleted file mode 100644
index d056a8998e..0000000000
--- a/src/imports/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated from imports.pro.
-
-add_subdirectory(controls)
-add_subdirectory(controlsimpl)
-add_subdirectory(dialogs)
-add_subdirectory(platform)
-add_subdirectory(templates)
-add_subdirectory(nativestyle)
-add_subdirectory(controls/basic)
-add_subdirectory(controls/basic/impl)
-add_subdirectory(controls/fusion)
-add_subdirectory(controls/fusion/impl)
-add_subdirectory(controls/imagine)
-add_subdirectory(controls/imagine/impl)
-add_subdirectory(controls/material)
-add_subdirectory(controls/material/impl)
-add_subdirectory(controls/universal)
-add_subdirectory(controls/universal/impl)
-if(MACOS)
-    add_subdirectory(controls/macos)
-endif()
-if(WIN32)
-    add_subdirectory(controls/windows)
-endif()
diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt
deleted file mode 100644
index 38454f9922..0000000000
--- a/src/imports/controls/CMakeLists.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-# Generated from controls.pro.
-
-#####################################################################
-## qtquickcontrols2plugin Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(qtquickcontrols2plugin
-    URI "QtQuick.Controls"
-    VERSION "${PROJECT_VERSION}"
-    DESIGNER_SUPPORTED
-    CLASSNAME QtQuickControls2Plugin
-    SKIP_TYPE_REGISTRATION
-    IMPORTS
-        QtQuick.Controls.impl/auto
-    OPTIONAL_IMPORTS
-        QtQuick.Controls.Basic/auto
-        QtQuick.Controls.Fusion/auto
-        QtQuick.Controls.Material/auto
-        QtQuick.Controls.Imagine/auto
-        QtQuick.Controls.Universal/auto
-        QtQuick.Controls.Windows/auto
-        QtQuick.Controls.macOS/auto
-    SOURCES
-        qtquickcontrols2plugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2ImplPrivate
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-)
-
-#### Keys ignored in scope 1:.:.:controls.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$PWD/snippets/*.qml" "$$PWD/src/*.qdoc" "$$PWD/src/templates/*.qdoc"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls"
-
-## Scopes:
-#####################################################################
-
-if(QT_FEATURE_quick_designer)
-    get_target_property(__aux_qml_files_install_base qtquickcontrols2plugin QT_QML_MODULE_INSTALL_DIR)
-
-    file(GLOB_RECURSE __aux_qml_glob_files
-        RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-        "designer/images/*.png")
-    qt_path_join(__aux_qml_files_install_dir "${__aux_qml_files_install_base}" "designer/images")
-
-    qt_copy_or_install(
-        FILES
-            ${__aux_qml_glob_files}
-        DESTINATION "${__aux_qml_files_install_dir}")
-
-    qt_path_join(__aux_qml_files_install_dir "${__aux_qml_files_install_base}" "designer")
-
-    qt_copy_or_install(
-        FILES
-            designer/AbstractButtonSection.qml
-            designer/BusyIndicatorSpecifics.qml
-            designer/ButtonSection.qml
-            designer/ButtonSpecifics.qml
-            designer/CheckBoxSpecifics.qml
-            designer/CheckDelegateSpecifics.qml
-            designer/CheckSection.qml
-            designer/ComboBoxSpecifics.qml
-            designer/ContainerSection.qml
-            designer/ControlSection.qml
-            designer/ControlSpecifics.qml
-            designer/DelayButtonSpecifics.qml
-            designer/DialSpecifics.qml
-            designer/FrameSpecifics.qml
-            designer/GroupBoxSpecifics.qml
-            designer/InsetSection.qml
-            designer/ItemDelegateSection.qml
-            designer/ItemDelegateSpecifics.qml
-            designer/LabelSpecifics.qml
-            designer/PaddingSection.qml
-            designer/PageIndicatorSpecifics.qml
-            designer/PageSpecifics.qml
-            designer/PaneSection.qml
-            designer/PaneSpecifics.qml
-            designer/ProgressBarSpecifics.qml
-            designer/RadioButtonSpecifics.qml
-            designer/RadioDelegateSpecifics.qml
-            designer/RangeSliderSpecifics.qml
-            designer/RoundButtonSpecifics.qml
-            designer/ScrollViewSpecifics.qml
-            designer/SliderSpecifics.qml
-            designer/SpinBoxSpecifics.qml
-            designer/StackViewSpecifics.qml
-            designer/SwipeDelegateSpecifics.qml
-            designer/SwipeViewSpecifics.qml
-            designer/SwitchDelegateSpecifics.qml
-            designer/SwitchSpecifics.qml
-            designer/TabBarSpecifics.qml
-            designer/TabButtonSpecifics.qml
-            designer/TextAreaSpecifics.qml
-            designer/TextFieldSpecifics.qml
-            designer/ToolBarSpecifics.qml
-            designer/ToolButtonSpecifics.qml
-            designer/ToolSeparatorSpecifics.qml
-            designer/TumblerSpecifics.qml
-            designer/qtquickcontrols2.metainfo
-        DESTINATION "${__aux_qml_files_install_dir}")
-endif()
-qt_internal_add_docs(qtquickcontrols2plugin
-    doc/qtquickcontrols.qdocconf
-)
-
diff --git a/src/imports/controls/basic/impl/qtquickcontrols2basicstyleimplplugin.cpp b/src/imports/controls/basic/impl/qtquickcontrols2basicstyleimplplugin.cpp
deleted file mode 100644
index b39bdb5c1f..0000000000
--- a/src/imports/controls/basic/impl/qtquickcontrols2basicstyleimplplugin.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQml/qqmlextensionplugin.h>
-
-extern void qml_register_types_QtQuick_Controls_Basic_impl();
-
-QT_BEGIN_NAMESPACE
-
-class QtQuickControls2BasicStyleImplPlugin : public QQmlEngineExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QtQuickControls2BasicStyleImplPlugin(QObject *parent = nullptr);
-};
-
-QtQuickControls2BasicStyleImplPlugin::QtQuickControls2BasicStyleImplPlugin(QObject *parent)
-    : QQmlEngineExtensionPlugin(parent)
-{
-    volatile auto registration = &::qml_register_types_QtQuick_Controls_Basic_impl;
-    Q_UNUSED(registration);
-}
-
-QT_END_NAMESPACE
-
-#include "qtquickcontrols2basicstyleimplplugin.moc"
diff --git a/src/imports/controls/fusion/impl/CMakeLists.txt b/src/imports/controls/fusion/impl/CMakeLists.txt
deleted file mode 100644
index d80e69e807..0000000000
--- a/src/imports/controls/fusion/impl/CMakeLists.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-# Generated from fusion-impl.pro.
-
-#####################################################################
-## qtquickcontrols2fusionstyleimplplugin Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(qtquickcontrols2fusionstyleimplplugin
-    URI "QtQuick.Controls.Fusion.impl"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2FusionStyleImplPlugin
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
-    SOURCES
-        qquickfusionbusyindicator.cpp qquickfusionbusyindicator_p.h
-        qquickfusiondial.cpp qquickfusiondial_p.h
-        qquickfusionknob.cpp qquickfusionknob_p.h
-        qtquickcontrols2fusionstyleimplplugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::QmlPrivate
-        Qt::QuickControls2ImplPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-)
-
-#### Keys ignored in scope 1:.:.:fusion-impl.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_FILES = "$$PWD/ButtonPanel.qml" "$$PWD/CheckIndicator.qml" "$$PWD/RadioIndicator.qml" "$$PWD/SliderGroove.qml" "$$PWD/SliderHandle.qml" "$$PWD/SwitchIndicator.qml"
-# QML_IMPORT_NAME = "QtQuick.Controls.Fusion.impl"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# QT_FOR_CONFIG = "quickcontrols2-private"
-# TARGETPATH = "QtQuick/Controls/Fusion/impl"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-fusion)"
-
-set(qml_files
-    "ButtonPanel.qml"
-    "CheckIndicator.qml"
-    "RadioIndicator.qml"
-    "SliderGroove.qml"
-    "SliderHandle.qml"
-    "SwitchIndicator.qml"
-)
-set_source_files_properties(ButtonPanel.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.3"
-)
-set_source_files_properties(CheckIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.3"
-)
-set_source_files_properties(RadioIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.3"
-)
-set_source_files_properties(SliderGroove.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.3"
-)
-set_source_files_properties(SliderHandle.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.3"
-)
-set_source_files_properties(SwitchIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.3"
-)
-
-qt6_target_qml_files(qtquickcontrols2fusionstyleimplplugin
-    FILES
-        ${qml_files}
-)
diff --git a/src/imports/controls/fusion/impl/qtquickcontrols2fusionstyleimplplugin.cpp b/src/imports/controls/fusion/impl/qtquickcontrols2fusionstyleimplplugin.cpp
deleted file mode 100644
index 5b02409f23..0000000000
--- a/src/imports/controls/fusion/impl/qtquickcontrols2fusionstyleimplplugin.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQml/qqmlextensionplugin.h>
-
-extern void qml_register_types_QtQuick_Controls_Fusion_impl();
-
-QT_BEGIN_NAMESPACE
-
-class QtQuickControls2FusionStyleImplPlugin : public QQmlEngineExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QtQuickControls2FusionStyleImplPlugin(QObject *parent = nullptr);
-};
-
-QtQuickControls2FusionStyleImplPlugin::QtQuickControls2FusionStyleImplPlugin(QObject *parent)
-    : QQmlEngineExtensionPlugin(parent)
-{
-    volatile auto registration = &qml_register_types_QtQuick_Controls_Fusion_impl;
-    Q_UNUSED(registration);
-}
-
-QT_END_NAMESPACE
-
-#include "qtquickcontrols2fusionstyleimplplugin.moc"
diff --git a/src/imports/controls/imagine/impl/qtquickcontrols2imaginestyleimplplugin.cpp b/src/imports/controls/imagine/impl/qtquickcontrols2imaginestyleimplplugin.cpp
deleted file mode 100644
index d3b7f94eae..0000000000
--- a/src/imports/controls/imagine/impl/qtquickcontrols2imaginestyleimplplugin.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQml/qqmlextensionplugin.h>
-
-extern void qml_register_types_QtQuick_Controls_Imagine_impl();
-
-QT_BEGIN_NAMESPACE
-
-class QtQuickControls2ImagineStyleImplPlugin : public QQmlEngineExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QtQuickControls2ImagineStyleImplPlugin(QObject *parent = nullptr);
-};
-
-QtQuickControls2ImagineStyleImplPlugin::QtQuickControls2ImagineStyleImplPlugin(QObject *parent)
-    : QQmlEngineExtensionPlugin(parent)
-{
-    volatile auto registration = &qml_register_types_QtQuick_Controls_Imagine_impl;
-    Q_UNUSED(registration);
-}
-
-QT_END_NAMESPACE
-
-#include "qtquickcontrols2imaginestyleimplplugin.moc"
diff --git a/src/imports/controls/macos/CMakeLists.txt b/src/imports/controls/macos/CMakeLists.txt
deleted file mode 100644
index bdd45a2992..0000000000
--- a/src/imports/controls/macos/CMakeLists.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-# Generated from macos.pro.
-
-#####################################################################
-## qtquickcontrols2macosstyleplugin Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(qtquickcontrols2macosstyleplugin
-    URI "QtQuick.Controls.macOS"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2MacOSStylePlugin
-    IMPORTS
-        QtQuick.Controls.Fusion/auto
-    PAST_MAJOR_VERSIONS 2
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
-    SOURCES
-        qtquickcontrols2macosstyleplugin.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
-        Qt::QuickControls2
-        Qt::QuickTemplates2
-)
-
-#### Keys ignored in scope 1:.:.:macos.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.macOS"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# QML_PAST_MAJOR_VERSIONS = "2"
-# TARGETPATH = "QtQuick/Controls/macOS"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-macos)"
-
-set(qml_files
-    "Button.qml"
-    "Slider.qml"
-    "GroupBox.qml"
-    "CheckBox.qml"
-    "RadioButton.qml"
-    "SpinBox.qml"
-    "TextField.qml"
-    "Frame.qml"
-    "TextArea.qml"
-    "ComboBox.qml"
-    "ScrollView.qml"
-    "ScrollBar.qml"
-    "ProgressBar.qml"
-    "Dial.qml"
-)
-set_source_files_properties(Button.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Slider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(GroupBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SpinBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextField.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Frame.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextArea.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ComboBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ProgressBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Dial.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-
-qt6_target_qml_files(qtquickcontrols2macosstyleplugin
-    FILES
-        ${qml_files}
-)
diff --git a/src/imports/controls/material/impl/CMakeLists.txt b/src/imports/controls/material/impl/CMakeLists.txt
deleted file mode 100644
index 01ab82213b..0000000000
--- a/src/imports/controls/material/impl/CMakeLists.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-# Generated from material-impl.pro.
-
-#####################################################################
-## qtquickcontrols2materialstyleimplplugin Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(qtquickcontrols2materialstyleimplplugin
-    URI "QtQuick.Controls.Material.impl"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2MaterialStyleImplPlugin
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
-    SOURCES
-        qquickmaterialbusyindicator.cpp qquickmaterialbusyindicator_p.h
-        qquickmaterialprogressbar.cpp qquickmaterialprogressbar_p.h
-        qquickmaterialripple.cpp qquickmaterialripple_p.h
-        qtquickcontrols2materialstyleimplplugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::QmlPrivate
-        Qt::QuickControls2ImplPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-)
-
-#### Keys ignored in scope 1:.:.:material-impl.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_FILES = "$$PWD/BoxShadow.qml" "$$PWD/CheckIndicator.qml" "$$PWD/CursorDelegate.qml" "$$PWD/ElevationEffect.qml" "$$PWD/RadioIndicator.qml" "$$PWD/RectangularGlow.qml" "$$PWD/SliderHandle.qml" "$$PWD/SwitchIndicator.qml"
-# QML_IMPORT_NAME = "QtQuick.Controls.Material.impl"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# QT_FOR_CONFIG = "quickcontrols2-private"
-# TARGETPATH = "QtQuick/Controls/Material/impl"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-material)"
-
-set(qml_files
-    "BoxShadow.qml"
-    "CheckIndicator.qml"
-    "CursorDelegate.qml"
-    "ElevationEffect.qml"
-    "RadioIndicator.qml"
-    "RectangularGlow.qml"
-    "SliderHandle.qml"
-    "SwitchIndicator.qml"
-)
-set_source_files_properties(BoxShadow.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-set_source_files_properties(CheckIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-set_source_files_properties(CursorDelegate.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-set_source_files_properties(ElevationEffect.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-set_source_files_properties(RadioIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-set_source_files_properties(RectangularGlow.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-set_source_files_properties(SliderHandle.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-set_source_files_properties(SwitchIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-
-qt6_target_qml_files(qtquickcontrols2materialstyleimplplugin
-    FILES
-        ${qml_files}
-)
diff --git a/src/imports/controls/material/impl/qtquickcontrols2materialstyleimplplugin.cpp b/src/imports/controls/material/impl/qtquickcontrols2materialstyleimplplugin.cpp
deleted file mode 100644
index 6ac920b14d..0000000000
--- a/src/imports/controls/material/impl/qtquickcontrols2materialstyleimplplugin.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQml/qqmlextensionplugin.h>
-
-extern void qml_register_types_QtQuick_Controls_Material_impl();
-
-QT_BEGIN_NAMESPACE
-
-class QtQuickControls2MaterialStyleImplPlugin : public QQmlEngineExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QtQuickControls2MaterialStyleImplPlugin(QObject *parent = nullptr);
-};
-
-QtQuickControls2MaterialStyleImplPlugin::QtQuickControls2MaterialStyleImplPlugin(QObject *parent)
-    : QQmlEngineExtensionPlugin(parent)
-{
-    volatile auto registration = &qml_register_types_QtQuick_Controls_Material_impl;
-    Q_UNUSED(registration);
-}
-
-QT_END_NAMESPACE
-
-#include "qtquickcontrols2materialstyleimplplugin.moc"
diff --git a/src/imports/controls/universal/impl/qtquickcontrols2universalstyleimplplugin.cpp b/src/imports/controls/universal/impl/qtquickcontrols2universalstyleimplplugin.cpp
deleted file mode 100644
index 91c4326115..0000000000
--- a/src/imports/controls/universal/impl/qtquickcontrols2universalstyleimplplugin.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQml/qqmlextensionplugin.h>
-
-extern void qml_register_types_QtQuick_Controls_Universal_impl();
-
-QT_BEGIN_NAMESPACE
-
-class QtQuickControls2UniversalStyleImplPlugin : public QQmlEngineExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QtQuickControls2UniversalStyleImplPlugin(QObject *parent = nullptr);
-};
-
-QtQuickControls2UniversalStyleImplPlugin::QtQuickControls2UniversalStyleImplPlugin(QObject *parent)
-    : QQmlEngineExtensionPlugin(parent)
-{
-    volatile auto registration = &qml_register_types_QtQuick_Controls_Universal_impl;
-    Q_UNUSED(registration);
-}
-
-QT_END_NAMESPACE
-
-#include "qtquickcontrols2universalstyleimplplugin.moc"
diff --git a/src/imports/controls/windows/CMakeLists.txt b/src/imports/controls/windows/CMakeLists.txt
deleted file mode 100644
index 0b55291939..0000000000
--- a/src/imports/controls/windows/CMakeLists.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-# Generated from windows.pro.
-
-#####################################################################
-## qtquickcontrols2windowsstyleplugin Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(qtquickcontrols2windowsstyleplugin
-    URI "QtQuick.Controls.Windows"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2WindowsStylePlugin
-    IMPORTS
-        QtQuick.Controls.Fusion/auto
-    PAST_MAJOR_VERSIONS 2
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
-    SOURCES
-        qtquickcontrols2windowsstyleplugin.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
-        Qt::QuickControls2
-        Qt::QuickTemplates2
-)
-
-#### Keys ignored in scope 1:.:.:windows.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.Windows"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# QML_PAST_MAJOR_VERSIONS = "2"
-# TARGETPATH = "QtQuick/Controls/Windows"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-windows)"
-
-set(qml_files
-    "Button.qml"
-    "CheckBox.qml"
-    "ComboBox.qml"
-    "Frame.qml"
-    "GroupBox.qml"
-    "ProgressBar.qml"
-    "RadioButton.qml"
-    "Slider.qml"
-    "SpinBox.qml"
-    "TextArea.qml"
-    "TextField.qml"
-    "ScrollBar.qml"
-    "ScrollView.qml"
-)
-set_source_files_properties(Button.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(CheckBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ComboBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Frame.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(GroupBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ProgressBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(RadioButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(Slider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(SpinBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextArea.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(TextField.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(ScrollView.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-
-qt6_target_qml_files(qtquickcontrols2windowsstyleplugin
-    FILES
-        ${qml_files}
-)
diff --git a/src/imports/controlsimpl/CMakeLists.txt b/src/imports/controlsimpl/CMakeLists.txt
deleted file mode 100644
index 06c6179bb3..0000000000
--- a/src/imports/controlsimpl/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated from controlsimpl.pro.
-
-#####################################################################
-## qtquickcontrols2implplugin Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(qtquickcontrols2implplugin
-    URI "QtQuick.Controls.impl"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2ImplPlugin
-    DEPENDENCIES
-        QtQuick/auto
-    SKIP_TYPE_REGISTRATION
-    SOURCES
-        qtquickcontrols2implplugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2ImplPrivate
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-)
-
-#### Keys ignored in scope 1:.:.:controlsimpl.pro:<TRUE>:
-# OTHER_FILES = "qmldir"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls/impl"
diff --git a/src/imports/controlsimpl/qtquickcontrols2implplugin.cpp b/src/imports/controlsimpl/qtquickcontrols2implplugin.cpp
deleted file mode 100644
index d5f29f5c0d..0000000000
--- a/src/imports/controlsimpl/qtquickcontrols2implplugin.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQml/qqmlextensionplugin.h>
-#include <QtQuickControls2Impl/private/qtquickcontrols2implglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QtQuickControls2ImplPlugin : public QQmlEngineExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QtQuickControls2ImplPlugin(QObject *parent = nullptr);
-};
-
-QtQuickControls2ImplPlugin::QtQuickControls2ImplPlugin(QObject *parent) : QQmlEngineExtensionPlugin(parent)
-{
-    volatile auto registration = &qml_register_types_QtQuick_Controls_impl;
-    Q_UNUSED(registration)
-}
-
-QT_END_NAMESPACE
-
-#include "qtquickcontrols2implplugin.moc"
diff --git a/src/imports/dialogs/CMakeLists.txt b/src/imports/dialogs/CMakeLists.txt
deleted file mode 100644
index f96fd9ff73..0000000000
--- a/src/imports/dialogs/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-qt_internal_add_qml_module(qtquickdialogsplugin
-    URI "QtQuick.Dialogs"
-    VERSION "${CMAKE_PROJECT_VERSION}"
-    CLASSNAME QtQuickDialogsPlugin
-    SKIP_TYPE_REGISTRATION
-    SOURCES
-        qtquickdialogsplugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    INCLUDE_DIRECTORIES
-        quick
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickDialogs2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-)
-
-qt_internal_add_docs(qtquickdialogsplugin
-    doc/qtquickdialogs.qdocconf
-)
diff --git a/src/imports/dialogs/qmldir b/src/imports/dialogs/qmldir
deleted file mode 100644
index 11d5bcdfe0..0000000000
--- a/src/imports/dialogs/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module QtQuick.Dialogs
-plugin qtquickdialogsplugin
-classname QtQuickDialogsPlugin
diff --git a/src/imports/dialogs/qtquickdialogsplugin.cpp b/src/imports/dialogs/qtquickdialogsplugin.cpp
deleted file mode 100644
index 9bc06c256f..0000000000
--- a/src/imports/dialogs/qtquickdialogsplugin.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Labs Templates module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQml/qqmlextensionplugin.h>
-#include <QtQml/qqml.h>
-#include <QtQuickDialogs2/private/qtquickdialogs2global_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QtQuickDialogsPlugin: public QQmlEngineExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QtQuickDialogsPlugin(QObject *parent = nullptr);
-};
-
-QtQuickDialogsPlugin::QtQuickDialogsPlugin(QObject *parent) : QQmlEngineExtensionPlugin(parent)
-{
-    volatile auto registration = &qml_register_types_QtQuick_Dialogs;
-    Q_UNUSED(registration)
-}
-
-QT_END_NAMESPACE
-
-#include "qtquickdialogsplugin.moc"
diff --git a/src/imports/templates/CMakeLists.txt b/src/imports/templates/CMakeLists.txt
deleted file mode 100644
index ada7cb595d..0000000000
--- a/src/imports/templates/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated from templates.pro.
-
-#####################################################################
-## qtquicktemplates2plugin Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(qtquicktemplates2plugin
-    URI "QtQuick.Templates"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickTemplates2Plugin
-    DEPENDENCIES
-        QtQuick/auto
-    SKIP_TYPE_REGISTRATION
-    SOURCES
-        qtquicktemplates2plugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-)
-
-#### Keys ignored in scope 1:.:.:templates.pro:<TRUE>:
-# OTHER_FILES = "qmldir"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Templates"
diff --git a/src/labs/CMakeLists.txt b/src/labs/CMakeLists.txt
new file mode 100644
index 0000000000..72b278fe98
--- /dev/null
+++ b/src/labs/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(platform)
+
diff --git a/src/imports/platform/CMakeLists.txt b/src/labs/platform/CMakeLists.txt
index 07c991567e..e1ddc4ee3f 100644
--- a/src/imports/platform/CMakeLists.txt
+++ b/src/labs/platform/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from platform.pro.
-
 #####################################################################
 ## qtlabsplatformplugin Plugin:
 #####################################################################
@@ -7,9 +5,10 @@
 qt_internal_add_qml_module(qtlabsplatformplugin
     URI "Qt.labs.platform"
     VERSION "1.1"
-    CLASSNAME QtLabsPlatformPlugin
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
+    CLASS_NAME QtLabsPlatformPlugin
+    PLUGIN_TARGET qtlabsplatformplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
     SOURCES
         qquickplatformcolordialog.cpp qquickplatformcolordialog_p.h
         qquickplatformdialog.cpp qquickplatformdialog_p.h
@@ -42,14 +41,6 @@ qt_internal_add_qml_module(qtlabsplatformplugin
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:platform.pro:<TRUE>:
-# IMPORT_VERSION = "1.1"
-# OTHER_FILES = "qmldir"
-# TARGETPATH = "Qt/labs/platform"
-
-## Scopes:
-#####################################################################
-
 qt_internal_extend_target(qtlabsplatformplugin CONDITION TARGET Qt::Widgets
     SOURCES
         widgets/qwidgetplatform_p.h
@@ -97,7 +88,7 @@ qt_internal_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_systemtrayic
     SOURCES
         qquickplatformsystemtrayicon.cpp qquickplatformsystemtrayicon_p.h
 )
+
 qt_internal_add_docs(qtlabsplatformplugin
     doc/qtlabsplatform.qdocconf
 )
-
diff --git a/src/imports/platform/doc/images/qtlabsplatform-colordialog-gtk.png b/src/labs/platform/doc/images/qtlabsplatform-colordialog-gtk.png
index 12197f7f74..12197f7f74 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-colordialog-gtk.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-colordialog-gtk.png
diff --git a/src/imports/platform/doc/images/qtlabsplatform-filedialog-gtk.png b/src/labs/platform/doc/images/qtlabsplatform-filedialog-gtk.png
index 9360d747a2..9360d747a2 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-filedialog-gtk.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-filedialog-gtk.png
diff --git a/src/imports/platform/doc/images/qtlabsplatform-folderdialog-gtk.png b/src/labs/platform/doc/images/qtlabsplatform-folderdialog-gtk.png
index 45f0585c5d..45f0585c5d 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-folderdialog-gtk.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-folderdialog-gtk.png
diff --git a/src/imports/platform/doc/images/qtlabsplatform-fontdialog-gtk.png b/src/labs/platform/doc/images/qtlabsplatform-fontdialog-gtk.png
index 0c6217bdb4..0c6217bdb4 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-fontdialog-gtk.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-fontdialog-gtk.png
diff --git a/src/imports/platform/doc/images/qtlabsplatform-menu.png b/src/labs/platform/doc/images/qtlabsplatform-menu.png
index 7945b45fbe..7945b45fbe 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-menu.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-menu.png
diff --git a/src/imports/platform/doc/images/qtlabsplatform-menubar.png b/src/labs/platform/doc/images/qtlabsplatform-menubar.png
index 7faa81412b..7faa81412b 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-menubar.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-menubar.png
diff --git a/src/imports/platform/doc/images/qtlabsplatform-messagedialog-android.png b/src/labs/platform/doc/images/qtlabsplatform-messagedialog-android.png
index 3986694f7d..3986694f7d 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-messagedialog-android.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-messagedialog-android.png
diff --git a/src/imports/platform/doc/images/qtlabsplatform-messagedialog-informative-android.png b/src/labs/platform/doc/images/qtlabsplatform-messagedialog-informative-android.png
index b2d3cd37cb..b2d3cd37cb 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-messagedialog-informative-android.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-messagedialog-informative-android.png
diff --git a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-menu.png b/src/labs/platform/doc/images/qtlabsplatform-systemtrayicon-menu.png
index 670df8ed13..670df8ed13 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-menu.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-systemtrayicon-menu.png
diff --git a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-message.png b/src/labs/platform/doc/images/qtlabsplatform-systemtrayicon-message.png
index beaeed92c4..beaeed92c4 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon-message.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-systemtrayicon-message.png
diff --git a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon.png b/src/labs/platform/doc/images/qtlabsplatform-systemtrayicon.png
index 2f7a851c88..2f7a851c88 100644
--- a/src/imports/platform/doc/images/qtlabsplatform-systemtrayicon.png
+++ b/src/labs/platform/doc/images/qtlabsplatform-systemtrayicon.png
diff --git a/src/imports/platform/doc/qtlabsplatform.qdocconf b/src/labs/platform/doc/qtlabsplatform.qdocconf
index 54ed82046d..54ed82046d 100644
--- a/src/imports/platform/doc/qtlabsplatform.qdocconf
+++ b/src/labs/platform/doc/qtlabsplatform.qdocconf
diff --git a/src/imports/platform/doc/src/includes/widgets.qdocinc b/src/labs/platform/doc/src/includes/widgets.qdocinc
index 44ebba6de6..44ebba6de6 100644
--- a/src/imports/platform/doc/src/includes/widgets.qdocinc
+++ b/src/labs/platform/doc/src/includes/widgets.qdocinc
diff --git a/src/imports/platform/doc/src/qt6-changes.qdoc b/src/labs/platform/doc/src/qt6-changes.qdoc
index de1c7a292f..de1c7a292f 100644
--- a/src/imports/platform/doc/src/qt6-changes.qdoc
+++ b/src/labs/platform/doc/src/qt6-changes.qdoc
diff --git a/src/imports/platform/doc/src/qtlabsplatform-index.qdoc b/src/labs/platform/doc/src/qtlabsplatform-index.qdoc
index c6eff0baa0..c6eff0baa0 100644
--- a/src/imports/platform/doc/src/qtlabsplatform-index.qdoc
+++ b/src/labs/platform/doc/src/qtlabsplatform-index.qdoc
diff --git a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc b/src/labs/platform/doc/src/qtlabsplatform-qmltypes.qdoc
index 51b7601a35..51b7601a35 100644
--- a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc
+++ b/src/labs/platform/doc/src/qtlabsplatform-qmltypes.qdoc
diff --git a/src/imports/platform/platform.pri b/src/labs/platform/platform.pri
index ec6e8616b8..ec6e8616b8 100644
--- a/src/imports/platform/platform.pri
+++ b/src/labs/platform/platform.pri
diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/labs/platform/qquickplatformcolordialog.cpp
index 04a5e079bd..04a5e079bd 100644
--- a/src/imports/platform/qquickplatformcolordialog.cpp
+++ b/src/labs/platform/qquickplatformcolordialog.cpp
diff --git a/src/imports/platform/qquickplatformcolordialog_p.h b/src/labs/platform/qquickplatformcolordialog_p.h
index 1df047d9b0..1df047d9b0 100644
--- a/src/imports/platform/qquickplatformcolordialog_p.h
+++ b/src/labs/platform/qquickplatformcolordialog_p.h
diff --git a/src/imports/platform/qquickplatformdialog.cpp b/src/labs/platform/qquickplatformdialog.cpp
index 06a26237c1..06a26237c1 100644
--- a/src/imports/platform/qquickplatformdialog.cpp
+++ b/src/labs/platform/qquickplatformdialog.cpp
diff --git a/src/imports/platform/qquickplatformdialog_p.h b/src/labs/platform/qquickplatformdialog_p.h
index 55a549375e..55a549375e 100644
--- a/src/imports/platform/qquickplatformdialog_p.h
+++ b/src/labs/platform/qquickplatformdialog_p.h
diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/labs/platform/qquickplatformfiledialog.cpp
index 8bfcfc931b..8bfcfc931b 100644
--- a/src/imports/platform/qquickplatformfiledialog.cpp
+++ b/src/labs/platform/qquickplatformfiledialog.cpp
diff --git a/src/imports/platform/qquickplatformfiledialog_p.h b/src/labs/platform/qquickplatformfiledialog_p.h
index b867f3c897..b867f3c897 100644
--- a/src/imports/platform/qquickplatformfiledialog_p.h
+++ b/src/labs/platform/qquickplatformfiledialog_p.h
diff --git a/src/imports/platform/qquickplatformfolderdialog.cpp b/src/labs/platform/qquickplatformfolderdialog.cpp
index a28dc828e9..a28dc828e9 100644
--- a/src/imports/platform/qquickplatformfolderdialog.cpp
+++ b/src/labs/platform/qquickplatformfolderdialog.cpp
diff --git a/src/imports/platform/qquickplatformfolderdialog_p.h b/src/labs/platform/qquickplatformfolderdialog_p.h
index 69878cb94c..69878cb94c 100644
--- a/src/imports/platform/qquickplatformfolderdialog_p.h
+++ b/src/labs/platform/qquickplatformfolderdialog_p.h
diff --git a/src/imports/platform/qquickplatformfontdialog.cpp b/src/labs/platform/qquickplatformfontdialog.cpp
index f3eca2c33a..f3eca2c33a 100644
--- a/src/imports/platform/qquickplatformfontdialog.cpp
+++ b/src/labs/platform/qquickplatformfontdialog.cpp
diff --git a/src/imports/platform/qquickplatformfontdialog_p.h b/src/labs/platform/qquickplatformfontdialog_p.h
index e794647706..e794647706 100644
--- a/src/imports/platform/qquickplatformfontdialog_p.h
+++ b/src/labs/platform/qquickplatformfontdialog_p.h
diff --git a/src/imports/platform/qquickplatformicon.cpp b/src/labs/platform/qquickplatformicon.cpp
index 7096ff8ae8..7096ff8ae8 100644
--- a/src/imports/platform/qquickplatformicon.cpp
+++ b/src/labs/platform/qquickplatformicon.cpp
diff --git a/src/imports/platform/qquickplatformicon_p.h b/src/labs/platform/qquickplatformicon_p.h
index 9add9d6e72..9add9d6e72 100644
--- a/src/imports/platform/qquickplatformicon_p.h
+++ b/src/labs/platform/qquickplatformicon_p.h
diff --git a/src/imports/platform/qquickplatformiconloader.cpp b/src/labs/platform/qquickplatformiconloader.cpp
index c7b699b2ce..c7b699b2ce 100644
--- a/src/imports/platform/qquickplatformiconloader.cpp
+++ b/src/labs/platform/qquickplatformiconloader.cpp
diff --git a/src/imports/platform/qquickplatformiconloader_p.h b/src/labs/platform/qquickplatformiconloader_p.h
index d284a5130e..d284a5130e 100644
--- a/src/imports/platform/qquickplatformiconloader_p.h
+++ b/src/labs/platform/qquickplatformiconloader_p.h
diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/labs/platform/qquickplatformmenu.cpp
index 16dffd5ea8..16dffd5ea8 100644
--- a/src/imports/platform/qquickplatformmenu.cpp
+++ b/src/labs/platform/qquickplatformmenu.cpp
diff --git a/src/imports/platform/qquickplatformmenu_p.h b/src/labs/platform/qquickplatformmenu_p.h
index fc66b61b45..fc66b61b45 100644
--- a/src/imports/platform/qquickplatformmenu_p.h
+++ b/src/labs/platform/qquickplatformmenu_p.h
diff --git a/src/imports/platform/qquickplatformmenubar.cpp b/src/labs/platform/qquickplatformmenubar.cpp
index 3b1f4b7420..3b1f4b7420 100644
--- a/src/imports/platform/qquickplatformmenubar.cpp
+++ b/src/labs/platform/qquickplatformmenubar.cpp
diff --git a/src/imports/platform/qquickplatformmenubar_p.h b/src/labs/platform/qquickplatformmenubar_p.h
index e644c86c8d..e644c86c8d 100644
--- a/src/imports/platform/qquickplatformmenubar_p.h
+++ b/src/labs/platform/qquickplatformmenubar_p.h
diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/labs/platform/qquickplatformmenuitem.cpp
index 4f61d4237f..4f61d4237f 100644
--- a/src/imports/platform/qquickplatformmenuitem.cpp
+++ b/src/labs/platform/qquickplatformmenuitem.cpp
diff --git a/src/imports/platform/qquickplatformmenuitem_p.h b/src/labs/platform/qquickplatformmenuitem_p.h
index 01b7482d8f..01b7482d8f 100644
--- a/src/imports/platform/qquickplatformmenuitem_p.h
+++ b/src/labs/platform/qquickplatformmenuitem_p.h
diff --git a/src/imports/platform/qquickplatformmenuitemgroup.cpp b/src/labs/platform/qquickplatformmenuitemgroup.cpp
index fcfcc664bc..fcfcc664bc 100644
--- a/src/imports/platform/qquickplatformmenuitemgroup.cpp
+++ b/src/labs/platform/qquickplatformmenuitemgroup.cpp
diff --git a/src/imports/platform/qquickplatformmenuitemgroup_p.h b/src/labs/platform/qquickplatformmenuitemgroup_p.h
index 7407d26639..7407d26639 100644
--- a/src/imports/platform/qquickplatformmenuitemgroup_p.h
+++ b/src/labs/platform/qquickplatformmenuitemgroup_p.h
diff --git a/src/imports/platform/qquickplatformmenuseparator.cpp b/src/labs/platform/qquickplatformmenuseparator.cpp
index f29d5b9edf..f29d5b9edf 100644
--- a/src/imports/platform/qquickplatformmenuseparator.cpp
+++ b/src/labs/platform/qquickplatformmenuseparator.cpp
diff --git a/src/imports/platform/qquickplatformmenuseparator_p.h b/src/labs/platform/qquickplatformmenuseparator_p.h
index 9fe973c5bf..9fe973c5bf 100644
--- a/src/imports/platform/qquickplatformmenuseparator_p.h
+++ b/src/labs/platform/qquickplatformmenuseparator_p.h
diff --git a/src/imports/platform/qquickplatformmessagedialog.cpp b/src/labs/platform/qquickplatformmessagedialog.cpp
index f2e0970ced..f2e0970ced 100644
--- a/src/imports/platform/qquickplatformmessagedialog.cpp
+++ b/src/labs/platform/qquickplatformmessagedialog.cpp
diff --git a/src/imports/platform/qquickplatformmessagedialog_p.h b/src/labs/platform/qquickplatformmessagedialog_p.h
index 9434a927d7..9434a927d7 100644
--- a/src/imports/platform/qquickplatformmessagedialog_p.h
+++ b/src/labs/platform/qquickplatformmessagedialog_p.h
diff --git a/src/imports/platform/qquickplatformstandardpaths.cpp b/src/labs/platform/qquickplatformstandardpaths.cpp
index a6fff1c016..a6fff1c016 100644
--- a/src/imports/platform/qquickplatformstandardpaths.cpp
+++ b/src/labs/platform/qquickplatformstandardpaths.cpp
diff --git a/src/imports/platform/qquickplatformstandardpaths_p.h b/src/labs/platform/qquickplatformstandardpaths_p.h
index e2f4e11e44..e2f4e11e44 100644
--- a/src/imports/platform/qquickplatformstandardpaths_p.h
+++ b/src/labs/platform/qquickplatformstandardpaths_p.h
diff --git a/src/imports/platform/qquickplatformsystemtrayicon.cpp b/src/labs/platform/qquickplatformsystemtrayicon.cpp
index b97e379fbc..b97e379fbc 100644
--- a/src/imports/platform/qquickplatformsystemtrayicon.cpp
+++ b/src/labs/platform/qquickplatformsystemtrayicon.cpp
diff --git a/src/imports/platform/qquickplatformsystemtrayicon_p.h b/src/labs/platform/qquickplatformsystemtrayicon_p.h
index d7cc46c0a4..d7cc46c0a4 100644
--- a/src/imports/platform/qquickplatformsystemtrayicon_p.h
+++ b/src/labs/platform/qquickplatformsystemtrayicon_p.h
diff --git a/src/imports/platform/qtlabsplatformplugin.cpp b/src/labs/platform/qtlabsplatformplugin.cpp
index 90bdb12186..90bdb12186 100644
--- a/src/imports/platform/qtlabsplatformplugin.cpp
+++ b/src/labs/platform/qtlabsplatformplugin.cpp
diff --git a/src/imports/platform/widgets/qwidgetplatform_p.h b/src/labs/platform/widgets/qwidgetplatform_p.h
index cbdaa24a1e..cbdaa24a1e 100644
--- a/src/imports/platform/widgets/qwidgetplatform_p.h
+++ b/src/labs/platform/widgets/qwidgetplatform_p.h
diff --git a/src/imports/platform/widgets/qwidgetplatformcolordialog.cpp b/src/labs/platform/widgets/qwidgetplatformcolordialog.cpp
index 6c0043aef6..6c0043aef6 100644
--- a/src/imports/platform/widgets/qwidgetplatformcolordialog.cpp
+++ b/src/labs/platform/widgets/qwidgetplatformcolordialog.cpp
diff --git a/src/imports/platform/widgets/qwidgetplatformcolordialog_p.h b/src/labs/platform/widgets/qwidgetplatformcolordialog_p.h
index 09ed5a1e7c..09ed5a1e7c 100644
--- a/src/imports/platform/widgets/qwidgetplatformcolordialog_p.h
+++ b/src/labs/platform/widgets/qwidgetplatformcolordialog_p.h
diff --git a/src/imports/platform/widgets/qwidgetplatformdialog.cpp b/src/labs/platform/widgets/qwidgetplatformdialog.cpp
index 3a206839e2..3a206839e2 100644
--- a/src/imports/platform/widgets/qwidgetplatformdialog.cpp
+++ b/src/labs/platform/widgets/qwidgetplatformdialog.cpp
diff --git a/src/imports/platform/widgets/qwidgetplatformdialog_p.h b/src/labs/platform/widgets/qwidgetplatformdialog_p.h
index d4f27655ea..d4f27655ea 100644
--- a/src/imports/platform/widgets/qwidgetplatformdialog_p.h
+++ b/src/labs/platform/widgets/qwidgetplatformdialog_p.h
diff --git a/src/imports/platform/widgets/qwidgetplatformfiledialog.cpp b/src/labs/platform/widgets/qwidgetplatformfiledialog.cpp
index 21ac652761..21ac652761 100644
--- a/src/imports/platform/widgets/qwidgetplatformfiledialog.cpp
+++ b/src/labs/platform/widgets/qwidgetplatformfiledialog.cpp
diff --git a/src/imports/platform/widgets/qwidgetplatformfiledialog_p.h b/src/labs/platform/widgets/qwidgetplatformfiledialog_p.h
index 3dba603845..3dba603845 100644
--- a/src/imports/platform/widgets/qwidgetplatformfiledialog_p.h
+++ b/src/labs/platform/widgets/qwidgetplatformfiledialog_p.h
diff --git a/src/imports/platform/widgets/qwidgetplatformfontdialog.cpp b/src/labs/platform/widgets/qwidgetplatformfontdialog.cpp
index 315e7c73aa..315e7c73aa 100644
--- a/src/imports/platform/widgets/qwidgetplatformfontdialog.cpp
+++ b/src/labs/platform/widgets/qwidgetplatformfontdialog.cpp
diff --git a/src/imports/platform/widgets/qwidgetplatformfontdialog_p.h b/src/labs/platform/widgets/qwidgetplatformfontdialog_p.h
index e5d13b31e6..e5d13b31e6 100644
--- a/src/imports/platform/widgets/qwidgetplatformfontdialog_p.h
+++ b/src/labs/platform/widgets/qwidgetplatformfontdialog_p.h
diff --git a/src/imports/platform/widgets/qwidgetplatformmenu.cpp b/src/labs/platform/widgets/qwidgetplatformmenu.cpp
index f04620a395..f04620a395 100644
--- a/src/imports/platform/widgets/qwidgetplatformmenu.cpp
+++ b/src/labs/platform/widgets/qwidgetplatformmenu.cpp
diff --git a/src/imports/platform/widgets/qwidgetplatformmenu_p.h b/src/labs/platform/widgets/qwidgetplatformmenu_p.h
index 9d1ef57e2f..9d1ef57e2f 100644
--- a/src/imports/platform/widgets/qwidgetplatformmenu_p.h
+++ b/src/labs/platform/widgets/qwidgetplatformmenu_p.h
diff --git a/src/imports/platform/widgets/qwidgetplatformmenuitem.cpp b/src/labs/platform/widgets/qwidgetplatformmenuitem.cpp
index ea4de57f70..ea4de57f70 100644
--- a/src/imports/platform/widgets/qwidgetplatformmenuitem.cpp
+++ b/src/labs/platform/widgets/qwidgetplatformmenuitem.cpp
diff --git a/src/imports/platform/widgets/qwidgetplatformmenuitem_p.h b/src/labs/platform/widgets/qwidgetplatformmenuitem_p.h
index 43b3fc174e..43b3fc174e 100644
--- a/src/imports/platform/widgets/qwidgetplatformmenuitem_p.h
+++ b/src/labs/platform/widgets/qwidgetplatformmenuitem_p.h
diff --git a/src/imports/platform/widgets/qwidgetplatformmessagedialog.cpp b/src/labs/platform/widgets/qwidgetplatformmessagedialog.cpp
index 365692dccd..365692dccd 100644
--- a/src/imports/platform/widgets/qwidgetplatformmessagedialog.cpp
+++ b/src/labs/platform/widgets/qwidgetplatformmessagedialog.cpp
diff --git a/src/imports/platform/widgets/qwidgetplatformmessagedialog_p.h b/src/labs/platform/widgets/qwidgetplatformmessagedialog_p.h
index 6581337ab3..6581337ab3 100644
--- a/src/imports/platform/widgets/qwidgetplatformmessagedialog_p.h
+++ b/src/labs/platform/widgets/qwidgetplatformmessagedialog_p.h
diff --git a/src/imports/platform/widgets/qwidgetplatformsystemtrayicon.cpp b/src/labs/platform/widgets/qwidgetplatformsystemtrayicon.cpp
index e406ff0331..e406ff0331 100644
--- a/src/imports/platform/widgets/qwidgetplatformsystemtrayicon.cpp
+++ b/src/labs/platform/widgets/qwidgetplatformsystemtrayicon.cpp
diff --git a/src/imports/platform/widgets/qwidgetplatformsystemtrayicon_p.h b/src/labs/platform/widgets/qwidgetplatformsystemtrayicon_p.h
index 11ea5377b3..11ea5377b3 100644
--- a/src/imports/platform/widgets/qwidgetplatformsystemtrayicon_p.h
+++ b/src/labs/platform/widgets/qwidgetplatformsystemtrayicon_p.h
diff --git a/src/imports/platform/widgets/widgets.pri b/src/labs/platform/widgets/widgets.pri
index 54ad7187cc..54ad7187cc 100644
--- a/src/imports/platform/widgets/widgets.pri
+++ b/src/labs/platform/widgets/widgets.pri
diff --git a/src/quickcontrols2/CMakeLists.txt b/src/quickcontrols2/CMakeLists.txt
index 4ac2d05191..77659a2a45 100644
--- a/src/quickcontrols2/CMakeLists.txt
+++ b/src/quickcontrols2/CMakeLists.txt
@@ -1,10 +1,25 @@
-# Generated from quickcontrols2.pro.
-
 #####################################################################
 ## QuickControls2 Module:
 #####################################################################
 
-qt_internal_add_module(QuickControls2
+qt_internal_add_qml_module(QuickControls2
+    URI "QtQuick.Controls"
+    VERSION "${PROJECT_VERSION}"
+    DESIGNER_SUPPORTED
+    CLASS_NAME QtQuickControls2Plugin
+    PLUGIN_TARGET qtquickcontrols2plugin
+    IMPORTS
+        QtQuick.Controls.impl/auto
+    OPTIONAL_IMPORTS
+        QtQuick.Controls.Basic/auto
+        QtQuick.Controls.Fusion/auto
+        QtQuick.Controls.Material/auto
+        QtQuick.Controls.Imagine/auto
+        QtQuick.Controls.Universal/auto
+        QtQuick.Controls.Windows/auto
+        QtQuick.Controls.macOS/auto
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
     SOURCES
         qquickdummyregistration_p.h
         qquickstyle.cpp qquickstyle.h qquickstyle_p.h
@@ -25,19 +40,33 @@ qt_internal_add_module(QuickControls2
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:quickcontrols2.pro:<TRUE>:
-# MODULE = "quickcontrols2"
-# QMLTYPES_FILENAME = "plugins.qmltypes"
-# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Controls"
-# QML_IMPORT_NAME = "QtQuick.Controls"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-
-set_target_properties(QuickControls2 PROPERTIES
-    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
-    QT_QML_MODULE_VERSION ${PROJECT_VERSION}
-    QT_QML_MODULE_URI QtQuick.Controls
-    QT_QMLTYPES_FILENAME plugins.qmltypes
-    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Controls"
+qt_internal_extend_target(qtquickcontrols2plugin
+    SOURCES
+        qtquickcontrols2plugin.cpp
+    LIBRARIES
+        Qt::QuickControls2ImplPrivate
+        Qt::QuickControls2Private
+        Qt::QuickTemplates2Private
 )
 
-qt6_qml_type_registration(QuickControls2)
+if(QT_FEATURE_quick_designer)
+    add_subdirectory(designer)
+endif()
+
+add_subdirectory(basic)
+add_subdirectory(fusion)
+add_subdirectory(imagine)
+add_subdirectory(material)
+add_subdirectory(universal)
+
+if(MACOS)
+    add_subdirectory(macos)
+endif()
+
+if(WIN32)
+    add_subdirectory(windows)
+endif()
+
+qt_internal_add_docs(QuickControls2
+    doc/qtquickcontrols.qdocconf
+)
diff --git a/src/imports/controls/basic/AbstractButton.qml b/src/quickcontrols2/basic/AbstractButton.qml
index a4855c2197..a4855c2197 100644
--- a/src/imports/controls/basic/AbstractButton.qml
+++ b/src/quickcontrols2/basic/AbstractButton.qml
diff --git a/src/imports/controls/basic/Action.qml b/src/quickcontrols2/basic/Action.qml
index bb66fc8fb5..bb66fc8fb5 100644
--- a/src/imports/controls/basic/Action.qml
+++ b/src/quickcontrols2/basic/Action.qml
diff --git a/src/imports/controls/basic/ActionGroup.qml b/src/quickcontrols2/basic/ActionGroup.qml
index 70170f0e4e..70170f0e4e 100644
--- a/src/imports/controls/basic/ActionGroup.qml
+++ b/src/quickcontrols2/basic/ActionGroup.qml
diff --git a/src/imports/controls/basic/ApplicationWindow.qml b/src/quickcontrols2/basic/ApplicationWindow.qml
index ac50d5fa79..ac50d5fa79 100644
--- a/src/imports/controls/basic/ApplicationWindow.qml
+++ b/src/quickcontrols2/basic/ApplicationWindow.qml
diff --git a/src/imports/controls/basic/BusyIndicator.qml b/src/quickcontrols2/basic/BusyIndicator.qml
index 0c51c9a280..0c51c9a280 100644
--- a/src/imports/controls/basic/BusyIndicator.qml
+++ b/src/quickcontrols2/basic/BusyIndicator.qml
diff --git a/src/imports/controls/basic/Button.qml b/src/quickcontrols2/basic/Button.qml
index f657a0d243..f657a0d243 100644
--- a/src/imports/controls/basic/Button.qml
+++ b/src/quickcontrols2/basic/Button.qml
diff --git a/src/imports/controls/basic/ButtonGroup.qml b/src/quickcontrols2/basic/ButtonGroup.qml
index fadc538a49..fadc538a49 100644
--- a/src/imports/controls/basic/ButtonGroup.qml
+++ b/src/quickcontrols2/basic/ButtonGroup.qml
diff --git a/src/imports/controls/basic/CMakeLists.txt b/src/quickcontrols2/basic/CMakeLists.txt
index ee7dc6c88b..0067a53f8a 100644
--- a/src/imports/controls/basic/CMakeLists.txt
+++ b/src/quickcontrols2/basic/CMakeLists.txt
@@ -1,75 +1,7 @@
-# Generated from basic.pro.
-
 #####################################################################
 ## qtquickcontrols2basicstyleplugin Plugin:
 #####################################################################
 
-qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin
-    URI "QtQuick.Controls.Basic"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2BasicStylePlugin
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
-    SOURCES
-        qquickbasicstyle.cpp qquickbasicstyle_p.h
-        qquickbasictheme.cpp qquickbasictheme_p.h
-        qtquickcontrols2basicstyleplugin.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(qtquickcontrols2basicstyleplugin_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"
-)
-
-qt_internal_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin"
-    PREFIX
-        "/qt-project.org/imports/QtQuick/Controls/Basic"
-    FILES
-        ${qtquickcontrols2basicstyleplugin_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:basic.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.Basic"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls/Basic"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-basic)"
-
 set(qml_files
     "AbstractButton.qml"
     "Action.qml"
@@ -301,7 +233,65 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
 
-qt6_target_qml_files(qtquickcontrols2basicstyleplugin
-    FILES
+qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin
+    URI "QtQuick.Controls.Basic"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickControls2BasicStylePlugin
+    PLUGIN_TARGET qtquickcontrols2basicstyleplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
+    SOURCES
+        qquickbasicstyle.cpp qquickbasicstyle_p.h
+        qquickbasictheme.cpp qquickbasictheme_p.h
+        qtquickcontrols2basicstyleplugin.cpp
+    QML_FILES
         ${qml_files}
+    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(qtquickcontrols2basicstyleplugin_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"
+)
+
+qt_internal_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin"
+    PREFIX
+        "/qt-project.org/imports/QtQuick/Controls/Basic"
+    FILES
+        ${qtquickcontrols2basicstyleplugin_resource_files}
 )
+
+add_subdirectory(impl)
diff --git a/src/imports/controls/basic/CheckBox.qml b/src/quickcontrols2/basic/CheckBox.qml
index 6465460d33..6465460d33 100644
--- a/src/imports/controls/basic/CheckBox.qml
+++ b/src/quickcontrols2/basic/CheckBox.qml
diff --git a/src/imports/controls/basic/CheckDelegate.qml b/src/quickcontrols2/basic/CheckDelegate.qml
index 1a1827e30c..1a1827e30c 100644
--- a/src/imports/controls/basic/CheckDelegate.qml
+++ b/src/quickcontrols2/basic/CheckDelegate.qml
diff --git a/src/imports/controls/basic/ComboBox.qml b/src/quickcontrols2/basic/ComboBox.qml
index 6a1924ed10..6a1924ed10 100644
--- a/src/imports/controls/basic/ComboBox.qml
+++ b/src/quickcontrols2/basic/ComboBox.qml
diff --git a/src/imports/controls/basic/Container.qml b/src/quickcontrols2/basic/Container.qml
index 939190755c..939190755c 100644
--- a/src/imports/controls/basic/Container.qml
+++ b/src/quickcontrols2/basic/Container.qml
diff --git a/src/imports/controls/basic/Control.qml b/src/quickcontrols2/basic/Control.qml
index 7a68a43166..7a68a43166 100644
--- a/src/imports/controls/basic/Control.qml
+++ b/src/quickcontrols2/basic/Control.qml
diff --git a/src/imports/controls/basic/DelayButton.qml b/src/quickcontrols2/basic/DelayButton.qml
index 367384c031..367384c031 100644
--- a/src/imports/controls/basic/DelayButton.qml
+++ b/src/quickcontrols2/basic/DelayButton.qml
diff --git a/src/imports/controls/basic/Dial.qml b/src/quickcontrols2/basic/Dial.qml
index 8450e9f9e5..8450e9f9e5 100644
--- a/src/imports/controls/basic/Dial.qml
+++ b/src/quickcontrols2/basic/Dial.qml
diff --git a/src/imports/controls/basic/Dialog.qml b/src/quickcontrols2/basic/Dialog.qml
index 1f2b4fbb6a..1f2b4fbb6a 100644
--- a/src/imports/controls/basic/Dialog.qml
+++ b/src/quickcontrols2/basic/Dialog.qml
diff --git a/src/imports/controls/basic/DialogButtonBox.qml b/src/quickcontrols2/basic/DialogButtonBox.qml
index e4cdbd14de..e4cdbd14de 100644
--- a/src/imports/controls/basic/DialogButtonBox.qml
+++ b/src/quickcontrols2/basic/DialogButtonBox.qml
diff --git a/src/imports/controls/basic/Drawer.qml b/src/quickcontrols2/basic/Drawer.qml
index 0d286f9910..0d286f9910 100644
--- a/src/imports/controls/basic/Drawer.qml
+++ b/src/quickcontrols2/basic/Drawer.qml
diff --git a/src/imports/controls/basic/Frame.qml b/src/quickcontrols2/basic/Frame.qml
index 22f2980612..22f2980612 100644
--- a/src/imports/controls/basic/Frame.qml
+++ b/src/quickcontrols2/basic/Frame.qml
diff --git a/src/imports/controls/basic/GroupBox.qml b/src/quickcontrols2/basic/GroupBox.qml
index 27ff8ce6e4..27ff8ce6e4 100644
--- a/src/imports/controls/basic/GroupBox.qml
+++ b/src/quickcontrols2/basic/GroupBox.qml
diff --git a/src/imports/controls/basic/HorizontalHeaderView.qml b/src/quickcontrols2/basic/HorizontalHeaderView.qml
index e52145932f..e52145932f 100644
--- a/src/imports/controls/basic/HorizontalHeaderView.qml
+++ b/src/quickcontrols2/basic/HorizontalHeaderView.qml
diff --git a/src/imports/controls/basic/ItemDelegate.qml b/src/quickcontrols2/basic/ItemDelegate.qml
index 3a1cb298b9..3a1cb298b9 100644
--- a/src/imports/controls/basic/ItemDelegate.qml
+++ b/src/quickcontrols2/basic/ItemDelegate.qml
diff --git a/src/imports/controls/basic/Label.qml b/src/quickcontrols2/basic/Label.qml
index 9d7dfdfdf0..9d7dfdfdf0 100644
--- a/src/imports/controls/basic/Label.qml
+++ b/src/quickcontrols2/basic/Label.qml
diff --git a/src/imports/controls/basic/Menu.qml b/src/quickcontrols2/basic/Menu.qml
index 475e58ccb8..475e58ccb8 100644
--- a/src/imports/controls/basic/Menu.qml
+++ b/src/quickcontrols2/basic/Menu.qml
diff --git a/src/imports/controls/basic/MenuBar.qml b/src/quickcontrols2/basic/MenuBar.qml
index 79199d121f..79199d121f 100644
--- a/src/imports/controls/basic/MenuBar.qml
+++ b/src/quickcontrols2/basic/MenuBar.qml
diff --git a/src/imports/controls/basic/MenuBarItem.qml b/src/quickcontrols2/basic/MenuBarItem.qml
index e7fd1c0bea..e7fd1c0bea 100644
--- a/src/imports/controls/basic/MenuBarItem.qml
+++ b/src/quickcontrols2/basic/MenuBarItem.qml
diff --git a/src/imports/controls/basic/MenuItem.qml b/src/quickcontrols2/basic/MenuItem.qml
index ab1f12f5a9..ab1f12f5a9 100644
--- a/src/imports/controls/basic/MenuItem.qml
+++ b/src/quickcontrols2/basic/MenuItem.qml
diff --git a/src/imports/controls/basic/MenuSeparator.qml b/src/quickcontrols2/basic/MenuSeparator.qml
index bc17dc391f..bc17dc391f 100644
--- a/src/imports/controls/basic/MenuSeparator.qml
+++ b/src/quickcontrols2/basic/MenuSeparator.qml
diff --git a/src/imports/controls/basic/Page.qml b/src/quickcontrols2/basic/Page.qml
index ff75ee4ef4..ff75ee4ef4 100644
--- a/src/imports/controls/basic/Page.qml
+++ b/src/quickcontrols2/basic/Page.qml
diff --git a/src/imports/controls/basic/PageIndicator.qml b/src/quickcontrols2/basic/PageIndicator.qml
index bd5ef29067..bd5ef29067 100644
--- a/src/imports/controls/basic/PageIndicator.qml
+++ b/src/quickcontrols2/basic/PageIndicator.qml
diff --git a/src/imports/controls/basic/Pane.qml b/src/quickcontrols2/basic/Pane.qml
index 181db9e44f..181db9e44f 100644
--- a/src/imports/controls/basic/Pane.qml
+++ b/src/quickcontrols2/basic/Pane.qml
diff --git a/src/imports/controls/basic/Popup.qml b/src/quickcontrols2/basic/Popup.qml
index 720483d97f..720483d97f 100644
--- a/src/imports/controls/basic/Popup.qml
+++ b/src/quickcontrols2/basic/Popup.qml
diff --git a/src/imports/controls/basic/ProgressBar.qml b/src/quickcontrols2/basic/ProgressBar.qml
index a49538d100..a49538d100 100644
--- a/src/imports/controls/basic/ProgressBar.qml
+++ b/src/quickcontrols2/basic/ProgressBar.qml
diff --git a/src/imports/controls/basic/RadioButton.qml b/src/quickcontrols2/basic/RadioButton.qml
index adb914357d..adb914357d 100644
--- a/src/imports/controls/basic/RadioButton.qml
+++ b/src/quickcontrols2/basic/RadioButton.qml
diff --git a/src/imports/controls/basic/RadioDelegate.qml b/src/quickcontrols2/basic/RadioDelegate.qml
index 69be290c72..69be290c72 100644
--- a/src/imports/controls/basic/RadioDelegate.qml
+++ b/src/quickcontrols2/basic/RadioDelegate.qml
diff --git a/src/imports/controls/basic/RangeSlider.qml b/src/quickcontrols2/basic/RangeSlider.qml
index e47cbd524b..e47cbd524b 100644
--- a/src/imports/controls/basic/RangeSlider.qml
+++ b/src/quickcontrols2/basic/RangeSlider.qml
diff --git a/src/imports/controls/basic/RoundButton.qml b/src/quickcontrols2/basic/RoundButton.qml
index 6ab810fd9e..6ab810fd9e 100644
--- a/src/imports/controls/basic/RoundButton.qml
+++ b/src/quickcontrols2/basic/RoundButton.qml
diff --git a/src/imports/controls/basic/ScrollBar.qml b/src/quickcontrols2/basic/ScrollBar.qml
index 763f96bbe6..763f96bbe6 100644
--- a/src/imports/controls/basic/ScrollBar.qml
+++ b/src/quickcontrols2/basic/ScrollBar.qml
diff --git a/src/imports/controls/basic/ScrollIndicator.qml b/src/quickcontrols2/basic/ScrollIndicator.qml
index dcb23d6536..dcb23d6536 100644
--- a/src/imports/controls/basic/ScrollIndicator.qml
+++ b/src/quickcontrols2/basic/ScrollIndicator.qml
diff --git a/src/imports/controls/basic/ScrollView.qml b/src/quickcontrols2/basic/ScrollView.qml
index 43c4e428c6..43c4e428c6 100644
--- a/src/imports/controls/basic/ScrollView.qml
+++ b/src/quickcontrols2/basic/ScrollView.qml
diff --git a/src/imports/controls/basic/Slider.qml b/src/quickcontrols2/basic/Slider.qml
index 425f4975fd..425f4975fd 100644
--- a/src/imports/controls/basic/Slider.qml
+++ b/src/quickcontrols2/basic/Slider.qml
diff --git a/src/imports/controls/basic/SpinBox.qml b/src/quickcontrols2/basic/SpinBox.qml
index 772cc583dc..772cc583dc 100644
--- a/src/imports/controls/basic/SpinBox.qml
+++ b/src/quickcontrols2/basic/SpinBox.qml
diff --git a/src/imports/controls/basic/SplitView.qml b/src/quickcontrols2/basic/SplitView.qml
index 66d24743eb..66d24743eb 100644
--- a/src/imports/controls/basic/SplitView.qml
+++ b/src/quickcontrols2/basic/SplitView.qml
diff --git a/src/imports/controls/basic/StackView.qml b/src/quickcontrols2/basic/StackView.qml
index cbf13f3637..cbf13f3637 100644
--- a/src/imports/controls/basic/StackView.qml
+++ b/src/quickcontrols2/basic/StackView.qml
diff --git a/src/imports/controls/basic/SwipeDelegate.qml b/src/quickcontrols2/basic/SwipeDelegate.qml
index f8209a1ea0..f8209a1ea0 100644
--- a/src/imports/controls/basic/SwipeDelegate.qml
+++ b/src/quickcontrols2/basic/SwipeDelegate.qml
diff --git a/src/imports/controls/basic/SwipeView.qml b/src/quickcontrols2/basic/SwipeView.qml
index 6ce4ee6ca2..6ce4ee6ca2 100644
--- a/src/imports/controls/basic/SwipeView.qml
+++ b/src/quickcontrols2/basic/SwipeView.qml
diff --git a/src/imports/controls/basic/Switch.qml b/src/quickcontrols2/basic/Switch.qml
index 0d919f9e97..0d919f9e97 100644
--- a/src/imports/controls/basic/Switch.qml
+++ b/src/quickcontrols2/basic/Switch.qml
diff --git a/src/imports/controls/basic/SwitchDelegate.qml b/src/quickcontrols2/basic/SwitchDelegate.qml
index 8203e107c1..8203e107c1 100644
--- a/src/imports/controls/basic/SwitchDelegate.qml
+++ b/src/quickcontrols2/basic/SwitchDelegate.qml
diff --git a/src/imports/controls/basic/TabBar.qml b/src/quickcontrols2/basic/TabBar.qml
index f1b11ac297..f1b11ac297 100644
--- a/src/imports/controls/basic/TabBar.qml
+++ b/src/quickcontrols2/basic/TabBar.qml
diff --git a/src/imports/controls/basic/TabButton.qml b/src/quickcontrols2/basic/TabButton.qml
index 5e38f69c5f..5e38f69c5f 100644
--- a/src/imports/controls/basic/TabButton.qml
+++ b/src/quickcontrols2/basic/TabButton.qml
diff --git a/src/imports/controls/basic/TextArea.qml b/src/quickcontrols2/basic/TextArea.qml
index fa6112f6e2..fa6112f6e2 100644
--- a/src/imports/controls/basic/TextArea.qml
+++ b/src/quickcontrols2/basic/TextArea.qml
diff --git a/src/imports/controls/basic/TextField.qml b/src/quickcontrols2/basic/TextField.qml
index 9c66e4baff..9c66e4baff 100644
--- a/src/imports/controls/basic/TextField.qml
+++ b/src/quickcontrols2/basic/TextField.qml
diff --git a/src/imports/controls/basic/ToolBar.qml b/src/quickcontrols2/basic/ToolBar.qml
index 1d21c51d09..1d21c51d09 100644
--- a/src/imports/controls/basic/ToolBar.qml
+++ b/src/quickcontrols2/basic/ToolBar.qml
diff --git a/src/imports/controls/basic/ToolButton.qml b/src/quickcontrols2/basic/ToolButton.qml
index 8a4f8097be..8a4f8097be 100644
--- a/src/imports/controls/basic/ToolButton.qml
+++ b/src/quickcontrols2/basic/ToolButton.qml
diff --git a/src/imports/controls/basic/ToolSeparator.qml b/src/quickcontrols2/basic/ToolSeparator.qml
index 774e41ecf7..774e41ecf7 100644
--- a/src/imports/controls/basic/ToolSeparator.qml
+++ b/src/quickcontrols2/basic/ToolSeparator.qml
diff --git a/src/imports/controls/basic/ToolTip.qml b/src/quickcontrols2/basic/ToolTip.qml
index 9d10f7fa4b..9d10f7fa4b 100644
--- a/src/imports/controls/basic/ToolTip.qml
+++ b/src/quickcontrols2/basic/ToolTip.qml
diff --git a/src/imports/controls/basic/Tumbler.qml b/src/quickcontrols2/basic/Tumbler.qml
index a69df1f3dc..a69df1f3dc 100644
--- a/src/imports/controls/basic/Tumbler.qml
+++ b/src/quickcontrols2/basic/Tumbler.qml
diff --git a/src/imports/controls/basic/VerticalHeaderView.qml b/src/quickcontrols2/basic/VerticalHeaderView.qml
index 7c057e01e2..7c057e01e2 100644
--- a/src/imports/controls/basic/VerticalHeaderView.qml
+++ b/src/quickcontrols2/basic/VerticalHeaderView.qml
diff --git a/src/imports/controls/basic/basic.pri b/src/quickcontrols2/basic/basic.pri
index 337f7f3620..337f7f3620 100644
--- a/src/imports/controls/basic/basic.pri
+++ b/src/quickcontrols2/basic/basic.pri
diff --git a/src/imports/controls/basic/images/arrow-indicator.png b/src/quickcontrols2/basic/images/arrow-indicator.png
index d833d52c40..d833d52c40 100644
--- a/src/imports/controls/basic/images/arrow-indicator.png
+++ b/src/quickcontrols2/basic/images/arrow-indicator.png
diff --git a/src/imports/controls/basic/images/arrow-indicator@2x.png b/src/quickcontrols2/basic/images/arrow-indicator@2x.png
index 55c7940a51..55c7940a51 100644
--- a/src/imports/controls/basic/images/arrow-indicator@2x.png
+++ b/src/quickcontrols2/basic/images/arrow-indicator@2x.png
diff --git a/src/imports/controls/basic/images/arrow-indicator@3x.png b/src/quickcontrols2/basic/images/arrow-indicator@3x.png
index c7067c5cd0..c7067c5cd0 100644
--- a/src/imports/controls/basic/images/arrow-indicator@3x.png
+++ b/src/quickcontrols2/basic/images/arrow-indicator@3x.png
diff --git a/src/imports/controls/basic/images/arrow-indicator@4x.png b/src/quickcontrols2/basic/images/arrow-indicator@4x.png
index 4c5cf3515a..4c5cf3515a 100644
--- a/src/imports/controls/basic/images/arrow-indicator@4x.png
+++ b/src/quickcontrols2/basic/images/arrow-indicator@4x.png
diff --git a/src/imports/controls/basic/images/check.png b/src/quickcontrols2/basic/images/check.png
index 479a84428d..479a84428d 100644
--- a/src/imports/controls/basic/images/check.png
+++ b/src/quickcontrols2/basic/images/check.png
diff --git a/src/imports/controls/basic/images/check@2x.png b/src/quickcontrols2/basic/images/check@2x.png
index 79663c0b03..79663c0b03 100644
--- a/src/imports/controls/basic/images/check@2x.png
+++ b/src/quickcontrols2/basic/images/check@2x.png
diff --git a/src/imports/controls/basic/images/check@3x.png b/src/quickcontrols2/basic/images/check@3x.png
index fd0135abe2..fd0135abe2 100644
--- a/src/imports/controls/basic/images/check@3x.png
+++ b/src/quickcontrols2/basic/images/check@3x.png
diff --git a/src/imports/controls/basic/images/check@4x.png b/src/quickcontrols2/basic/images/check@4x.png
index e7e0b64044..e7e0b64044 100644
--- a/src/imports/controls/basic/images/check@4x.png
+++ b/src/quickcontrols2/basic/images/check@4x.png
diff --git a/src/imports/controls/basic/images/dial-indicator.png b/src/quickcontrols2/basic/images/dial-indicator.png
index 92357c51d4..92357c51d4 100644
--- a/src/imports/controls/basic/images/dial-indicator.png
+++ b/src/quickcontrols2/basic/images/dial-indicator.png
diff --git a/src/imports/controls/basic/images/dial-indicator@2x.png b/src/quickcontrols2/basic/images/dial-indicator@2x.png
index f436443b0a..f436443b0a 100644
--- a/src/imports/controls/basic/images/dial-indicator@2x.png
+++ b/src/quickcontrols2/basic/images/dial-indicator@2x.png
diff --git a/src/imports/controls/basic/images/dial-indicator@3x.png b/src/quickcontrols2/basic/images/dial-indicator@3x.png
index d883045bcb..d883045bcb 100644
--- a/src/imports/controls/basic/images/dial-indicator@3x.png
+++ b/src/quickcontrols2/basic/images/dial-indicator@3x.png
diff --git a/src/imports/controls/basic/images/dial-indicator@4x.png b/src/quickcontrols2/basic/images/dial-indicator@4x.png
index 794777128b..794777128b 100644
--- a/src/imports/controls/basic/images/dial-indicator@4x.png
+++ b/src/quickcontrols2/basic/images/dial-indicator@4x.png
diff --git a/src/imports/controls/basic/images/double-arrow.png b/src/quickcontrols2/basic/images/double-arrow.png
index 3ecd7f89f3..3ecd7f89f3 100644
--- a/src/imports/controls/basic/images/double-arrow.png
+++ b/src/quickcontrols2/basic/images/double-arrow.png
diff --git a/src/imports/controls/basic/images/double-arrow@2x.png b/src/quickcontrols2/basic/images/double-arrow@2x.png
index eeb03e2847..eeb03e2847 100644
--- a/src/imports/controls/basic/images/double-arrow@2x.png
+++ b/src/quickcontrols2/basic/images/double-arrow@2x.png
diff --git a/src/imports/controls/basic/images/double-arrow@3x.png b/src/quickcontrols2/basic/images/double-arrow@3x.png
index f0662d2026..f0662d2026 100644
--- a/src/imports/controls/basic/images/double-arrow@3x.png
+++ b/src/quickcontrols2/basic/images/double-arrow@3x.png
diff --git a/src/imports/controls/basic/images/double-arrow@4x.png b/src/quickcontrols2/basic/images/double-arrow@4x.png
index 10891e9133..10891e9133 100644
--- a/src/imports/controls/basic/images/double-arrow@4x.png
+++ b/src/quickcontrols2/basic/images/double-arrow@4x.png
diff --git a/src/imports/controls/basic/images/drop-indicator.png b/src/quickcontrols2/basic/images/drop-indicator.png
index 80c1d958e3..80c1d958e3 100644
--- a/src/imports/controls/basic/images/drop-indicator.png
+++ b/src/quickcontrols2/basic/images/drop-indicator.png
diff --git a/src/imports/controls/basic/images/drop-indicator@2x.png b/src/quickcontrols2/basic/images/drop-indicator@2x.png
index 6e0f228c54..6e0f228c54 100644
--- a/src/imports/controls/basic/images/drop-indicator@2x.png
+++ b/src/quickcontrols2/basic/images/drop-indicator@2x.png
diff --git a/src/imports/controls/basic/images/drop-indicator@3x.png b/src/quickcontrols2/basic/images/drop-indicator@3x.png
index 199752fbf8..199752fbf8 100644
--- a/src/imports/controls/basic/images/drop-indicator@3x.png
+++ b/src/quickcontrols2/basic/images/drop-indicator@3x.png
diff --git a/src/imports/controls/basic/images/drop-indicator@4x.png b/src/quickcontrols2/basic/images/drop-indicator@4x.png
index 58311fbe2a..58311fbe2a 100644
--- a/src/imports/controls/basic/images/drop-indicator@4x.png
+++ b/src/quickcontrols2/basic/images/drop-indicator@4x.png
diff --git a/src/imports/controls/basic/impl/CMakeLists.txt b/src/quickcontrols2/basic/impl/CMakeLists.txt
index 2ae6cf7571..a785a11fbb 100644
--- a/src/imports/controls/basic/impl/CMakeLists.txt
+++ b/src/quickcontrols2/basic/impl/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from basic-impl.pro.
-
 #####################################################################
 ## qtquickcontrols2basicstyleimplplugin Plugin:
 #####################################################################
@@ -7,15 +5,13 @@
 qt_internal_add_qml_module(qtquickcontrols2basicstyleimplplugin
     URI "QtQuick.Controls.Basic.impl"
     VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2BasicStyleImplPlugin
-    SKIP_TYPE_REGISTRATION
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
+    CLASS_NAME QtQuickControls2BasicStyleImplPlugin
+    PLUGIN_TARGET qtquickcontrols2basicstyleimplplugin
+    NO_PLUGIN_OPTIONAL
     SOURCES
         qquickbasicbusyindicator.cpp qquickbasicbusyindicator_p.h
         qquickbasicdial.cpp qquickbasicdial_p.h
         qquickbasicprogressbar.cpp qquickbasicprogressbar_p.h
-        qtquickcontrols2basicstyleimplplugin.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
@@ -32,11 +28,3 @@ qt_internal_add_qml_module(qtquickcontrols2basicstyleimplplugin
         Qt::Qml
         Qt::Quick
 )
-
-#### Keys ignored in scope 1:.:.:basic-impl.pro:<TRUE>:
-# OTHER_FILES = "qmldir"
-# QML_IMPORT_NAME = "QtQuick.Controls.Basic.impl"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# QT_FOR_CONFIG = "quickcontrols2-private"
-# TARGETPATH = "QtQuick/Controls/Basic/impl"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-basic)"
diff --git a/src/imports/controls/basic/impl/qquickbasicbusyindicator.cpp b/src/quickcontrols2/basic/impl/qquickbasicbusyindicator.cpp
index 7fb3b024cd..7fb3b024cd 100644
--- a/src/imports/controls/basic/impl/qquickbasicbusyindicator.cpp
+++ b/src/quickcontrols2/basic/impl/qquickbasicbusyindicator.cpp
diff --git a/src/imports/controls/basic/impl/qquickbasicbusyindicator_p.h b/src/quickcontrols2/basic/impl/qquickbasicbusyindicator_p.h
index 7eea665675..7eea665675 100644
--- a/src/imports/controls/basic/impl/qquickbasicbusyindicator_p.h
+++ b/src/quickcontrols2/basic/impl/qquickbasicbusyindicator_p.h
diff --git a/src/imports/controls/basic/impl/qquickbasicdial.cpp b/src/quickcontrols2/basic/impl/qquickbasicdial.cpp
index 223e804215..223e804215 100644
--- a/src/imports/controls/basic/impl/qquickbasicdial.cpp
+++ b/src/quickcontrols2/basic/impl/qquickbasicdial.cpp
diff --git a/src/imports/controls/basic/impl/qquickbasicdial_p.h b/src/quickcontrols2/basic/impl/qquickbasicdial_p.h
index bd9bbb7201..bd9bbb7201 100644
--- a/src/imports/controls/basic/impl/qquickbasicdial_p.h
+++ b/src/quickcontrols2/basic/impl/qquickbasicdial_p.h
diff --git a/src/imports/controls/basic/impl/qquickbasicprogressbar.cpp b/src/quickcontrols2/basic/impl/qquickbasicprogressbar.cpp
index 717082af47..717082af47 100644
--- a/src/imports/controls/basic/impl/qquickbasicprogressbar.cpp
+++ b/src/quickcontrols2/basic/impl/qquickbasicprogressbar.cpp
diff --git a/src/imports/controls/basic/impl/qquickbasicprogressbar_p.h b/src/quickcontrols2/basic/impl/qquickbasicprogressbar_p.h
index 1d853ecb41..1d853ecb41 100644
--- a/src/imports/controls/basic/impl/qquickbasicprogressbar_p.h
+++ b/src/quickcontrols2/basic/impl/qquickbasicprogressbar_p.h
diff --git a/src/imports/controls/basic/qquickbasicstyle.cpp b/src/quickcontrols2/basic/qquickbasicstyle.cpp
index 9dcb7c74a8..9dcb7c74a8 100644
--- a/src/imports/controls/basic/qquickbasicstyle.cpp
+++ b/src/quickcontrols2/basic/qquickbasicstyle.cpp
diff --git a/src/imports/controls/basic/qquickbasicstyle_p.h b/src/quickcontrols2/basic/qquickbasicstyle_p.h
index 3f3d84b8f3..3f3d84b8f3 100644
--- a/src/imports/controls/basic/qquickbasicstyle_p.h
+++ b/src/quickcontrols2/basic/qquickbasicstyle_p.h
diff --git a/src/imports/controls/basic/qquickbasictheme.cpp b/src/quickcontrols2/basic/qquickbasictheme.cpp
index 1f876e3d5b..1f876e3d5b 100644
--- a/src/imports/controls/basic/qquickbasictheme.cpp
+++ b/src/quickcontrols2/basic/qquickbasictheme.cpp
diff --git a/src/imports/controls/basic/qquickbasictheme_p.h b/src/quickcontrols2/basic/qquickbasictheme_p.h
index a0a299535a..a0a299535a 100644
--- a/src/imports/controls/basic/qquickbasictheme_p.h
+++ b/src/quickcontrols2/basic/qquickbasictheme_p.h
diff --git a/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.cpp b/src/quickcontrols2/basic/qtquickcontrols2basicstyleplugin.cpp
index 7786223cdc..7786223cdc 100644
--- a/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.cpp
+++ b/src/quickcontrols2/basic/qtquickcontrols2basicstyleplugin.cpp
diff --git a/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.qrc b/src/quickcontrols2/basic/qtquickcontrols2basicstyleplugin.qrc
index 27fd6ac2d4..27fd6ac2d4 100644
--- a/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.qrc
+++ b/src/quickcontrols2/basic/qtquickcontrols2basicstyleplugin.qrc
diff --git a/src/imports/controls/designer/AbstractButtonSection.qml b/src/quickcontrols2/designer/AbstractButtonSection.qml
index 2ccb82312b..2ccb82312b 100644
--- a/src/imports/controls/designer/AbstractButtonSection.qml
+++ b/src/quickcontrols2/designer/AbstractButtonSection.qml
diff --git a/src/imports/controls/designer/BusyIndicatorSpecifics.qml b/src/quickcontrols2/designer/BusyIndicatorSpecifics.qml
index 7b2899d304..7b2899d304 100644
--- a/src/imports/controls/designer/BusyIndicatorSpecifics.qml
+++ b/src/quickcontrols2/designer/BusyIndicatorSpecifics.qml
diff --git a/src/imports/controls/designer/ButtonSection.qml b/src/quickcontrols2/designer/ButtonSection.qml
index ff70d52c6f..ff70d52c6f 100644
--- a/src/imports/controls/designer/ButtonSection.qml
+++ b/src/quickcontrols2/designer/ButtonSection.qml
diff --git a/src/imports/controls/designer/ButtonSpecifics.qml b/src/quickcontrols2/designer/ButtonSpecifics.qml
index 5a46e72aff..5a46e72aff 100644
--- a/src/imports/controls/designer/ButtonSpecifics.qml
+++ b/src/quickcontrols2/designer/ButtonSpecifics.qml
diff --git a/src/quickcontrols2/designer/CMakeLists.txt b/src/quickcontrols2/designer/CMakeLists.txt
new file mode 100644
index 0000000000..38d82acef6
--- /dev/null
+++ b/src/quickcontrols2/designer/CMakeLists.txt
@@ -0,0 +1,61 @@
+file(GLOB_RECURSE __aux_qml_glob_files
+    RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+    "images/*.png"
+)
+
+qt_copy_or_install(
+    FILES
+        ${__aux_qml_glob_files}
+    DESTINATION "${INSTALL_QMLDIR}/QtQuick/Controls/designer/images"
+)
+
+qt_copy_or_install(
+    FILES
+        AbstractButtonSection.qml
+        BusyIndicatorSpecifics.qml
+        ButtonSection.qml
+        ButtonSpecifics.qml
+        CheckBoxSpecifics.qml
+        CheckDelegateSpecifics.qml
+        CheckSection.qml
+        ComboBoxSpecifics.qml
+        ContainerSection.qml
+        ControlSection.qml
+        ControlSpecifics.qml
+        DelayButtonSpecifics.qml
+        DialSpecifics.qml
+        FrameSpecifics.qml
+        GroupBoxSpecifics.qml
+        InsetSection.qml
+        ItemDelegateSection.qml
+        ItemDelegateSpecifics.qml
+        LabelSpecifics.qml
+        PaddingSection.qml
+        PageIndicatorSpecifics.qml
+        PageSpecifics.qml
+        PaneSection.qml
+        PaneSpecifics.qml
+        ProgressBarSpecifics.qml
+        RadioButtonSpecifics.qml
+        RadioDelegateSpecifics.qml
+        RangeSliderSpecifics.qml
+        RoundButtonSpecifics.qml
+        ScrollViewSpecifics.qml
+        SliderSpecifics.qml
+        SpinBoxSpecifics.qml
+        StackViewSpecifics.qml
+        SwipeDelegateSpecifics.qml
+        SwipeViewSpecifics.qml
+        SwitchDelegateSpecifics.qml
+        SwitchSpecifics.qml
+        TabBarSpecifics.qml
+        TabButtonSpecifics.qml
+        TextAreaSpecifics.qml
+        TextFieldSpecifics.qml
+        ToolBarSpecifics.qml
+        ToolButtonSpecifics.qml
+        ToolSeparatorSpecifics.qml
+        TumblerSpecifics.qml
+        qtquickcontrols2.metainfo
+    DESTINATION "${INSTALL_QMLDIR}/QtQuick/Controls/designer"
+)
diff --git a/src/imports/controls/designer/CheckBoxSpecifics.qml b/src/quickcontrols2/designer/CheckBoxSpecifics.qml
index d3aae9b679..d3aae9b679 100644
--- a/src/imports/controls/designer/CheckBoxSpecifics.qml
+++ b/src/quickcontrols2/designer/CheckBoxSpecifics.qml
diff --git a/src/imports/controls/designer/CheckDelegateSpecifics.qml b/src/quickcontrols2/designer/CheckDelegateSpecifics.qml
index 8014480cd5..8014480cd5 100644
--- a/src/imports/controls/designer/CheckDelegateSpecifics.qml
+++ b/src/quickcontrols2/designer/CheckDelegateSpecifics.qml
diff --git a/src/imports/controls/designer/CheckSection.qml b/src/quickcontrols2/designer/CheckSection.qml
index 0f49fa25af..0f49fa25af 100644
--- a/src/imports/controls/designer/CheckSection.qml
+++ b/src/quickcontrols2/designer/CheckSection.qml
diff --git a/src/imports/controls/designer/ComboBoxSpecifics.qml b/src/quickcontrols2/designer/ComboBoxSpecifics.qml
index 810f19b5ff..810f19b5ff 100644
--- a/src/imports/controls/designer/ComboBoxSpecifics.qml
+++ b/src/quickcontrols2/designer/ComboBoxSpecifics.qml
diff --git a/src/imports/controls/designer/ContainerSection.qml b/src/quickcontrols2/designer/ContainerSection.qml
index 15d1ddf598..15d1ddf598 100644
--- a/src/imports/controls/designer/ContainerSection.qml
+++ b/src/quickcontrols2/designer/ContainerSection.qml
diff --git a/src/imports/controls/designer/ControlSection.qml b/src/quickcontrols2/designer/ControlSection.qml
index 12033eeaa3..12033eeaa3 100644
--- a/src/imports/controls/designer/ControlSection.qml
+++ b/src/quickcontrols2/designer/ControlSection.qml
diff --git a/src/imports/controls/designer/ControlSpecifics.qml b/src/quickcontrols2/designer/ControlSpecifics.qml
index 3937437b5e..3937437b5e 100644
--- a/src/imports/controls/designer/ControlSpecifics.qml
+++ b/src/quickcontrols2/designer/ControlSpecifics.qml
diff --git a/src/imports/controls/designer/DelayButtonSpecifics.qml b/src/quickcontrols2/designer/DelayButtonSpecifics.qml
index 024fe589d7..024fe589d7 100644
--- a/src/imports/controls/designer/DelayButtonSpecifics.qml
+++ b/src/quickcontrols2/designer/DelayButtonSpecifics.qml
diff --git a/src/imports/controls/designer/DialSpecifics.qml b/src/quickcontrols2/designer/DialSpecifics.qml
index 026cb2b1b0..026cb2b1b0 100644
--- a/src/imports/controls/designer/DialSpecifics.qml
+++ b/src/quickcontrols2/designer/DialSpecifics.qml
diff --git a/src/imports/controls/designer/FrameSpecifics.qml b/src/quickcontrols2/designer/FrameSpecifics.qml
index 3673995659..3673995659 100644
--- a/src/imports/controls/designer/FrameSpecifics.qml
+++ b/src/quickcontrols2/designer/FrameSpecifics.qml
diff --git a/src/imports/controls/designer/GroupBoxSpecifics.qml b/src/quickcontrols2/designer/GroupBoxSpecifics.qml
index f808b00103..f808b00103 100644
--- a/src/imports/controls/designer/GroupBoxSpecifics.qml
+++ b/src/quickcontrols2/designer/GroupBoxSpecifics.qml
diff --git a/src/imports/controls/designer/InsetSection.qml b/src/quickcontrols2/designer/InsetSection.qml
index 45a4df4fcc..45a4df4fcc 100644
--- a/src/imports/controls/designer/InsetSection.qml
+++ b/src/quickcontrols2/designer/InsetSection.qml
diff --git a/src/imports/controls/designer/ItemDelegateSection.qml b/src/quickcontrols2/designer/ItemDelegateSection.qml
index 448a20d99d..448a20d99d 100644
--- a/src/imports/controls/designer/ItemDelegateSection.qml
+++ b/src/quickcontrols2/designer/ItemDelegateSection.qml
diff --git a/src/imports/controls/designer/ItemDelegateSpecifics.qml b/src/quickcontrols2/designer/ItemDelegateSpecifics.qml
index 1757521dd8..1757521dd8 100644
--- a/src/imports/controls/designer/ItemDelegateSpecifics.qml
+++ b/src/quickcontrols2/designer/ItemDelegateSpecifics.qml
diff --git a/src/imports/controls/designer/LabelSpecifics.qml b/src/quickcontrols2/designer/LabelSpecifics.qml
index 569b44c8da..569b44c8da 100644
--- a/src/imports/controls/designer/LabelSpecifics.qml
+++ b/src/quickcontrols2/designer/LabelSpecifics.qml
diff --git a/src/imports/controls/designer/PaddingSection.qml b/src/quickcontrols2/designer/PaddingSection.qml
index 325c5698e0..325c5698e0 100644
--- a/src/imports/controls/designer/PaddingSection.qml
+++ b/src/quickcontrols2/designer/PaddingSection.qml
diff --git a/src/imports/controls/designer/PageIndicatorSpecifics.qml b/src/quickcontrols2/designer/PageIndicatorSpecifics.qml
index c73652e951..c73652e951 100644
--- a/src/imports/controls/designer/PageIndicatorSpecifics.qml
+++ b/src/quickcontrols2/designer/PageIndicatorSpecifics.qml
diff --git a/src/imports/controls/designer/PageSpecifics.qml b/src/quickcontrols2/designer/PageSpecifics.qml
index 965ed655e7..965ed655e7 100644
--- a/src/imports/controls/designer/PageSpecifics.qml
+++ b/src/quickcontrols2/designer/PageSpecifics.qml
diff --git a/src/imports/controls/designer/PaneSection.qml b/src/quickcontrols2/designer/PaneSection.qml
index 9dcc2097a9..9dcc2097a9 100644
--- a/src/imports/controls/designer/PaneSection.qml
+++ b/src/quickcontrols2/designer/PaneSection.qml
diff --git a/src/imports/controls/designer/PaneSpecifics.qml b/src/quickcontrols2/designer/PaneSpecifics.qml
index 3673995659..3673995659 100644
--- a/src/imports/controls/designer/PaneSpecifics.qml
+++ b/src/quickcontrols2/designer/PaneSpecifics.qml
diff --git a/src/imports/controls/designer/ProgressBarSpecifics.qml b/src/quickcontrols2/designer/ProgressBarSpecifics.qml
index 14f879255c..14f879255c 100644
--- a/src/imports/controls/designer/ProgressBarSpecifics.qml
+++ b/src/quickcontrols2/designer/ProgressBarSpecifics.qml
diff --git a/src/imports/controls/designer/RadioButtonSpecifics.qml b/src/quickcontrols2/designer/RadioButtonSpecifics.qml
index df0af7e748..df0af7e748 100644
--- a/src/imports/controls/designer/RadioButtonSpecifics.qml
+++ b/src/quickcontrols2/designer/RadioButtonSpecifics.qml
diff --git a/src/imports/controls/designer/RadioDelegateSpecifics.qml b/src/quickcontrols2/designer/RadioDelegateSpecifics.qml
index 1757521dd8..1757521dd8 100644
--- a/src/imports/controls/designer/RadioDelegateSpecifics.qml
+++ b/src/quickcontrols2/designer/RadioDelegateSpecifics.qml
diff --git a/src/imports/controls/designer/RangeSliderSpecifics.qml b/src/quickcontrols2/designer/RangeSliderSpecifics.qml
index 577033ed80..577033ed80 100644
--- a/src/imports/controls/designer/RangeSliderSpecifics.qml
+++ b/src/quickcontrols2/designer/RangeSliderSpecifics.qml
diff --git a/src/imports/controls/designer/RoundButtonSpecifics.qml b/src/quickcontrols2/designer/RoundButtonSpecifics.qml
index 58d3468952..58d3468952 100644
--- a/src/imports/controls/designer/RoundButtonSpecifics.qml
+++ b/src/quickcontrols2/designer/RoundButtonSpecifics.qml
diff --git a/src/imports/controls/designer/ScrollViewSpecifics.qml b/src/quickcontrols2/designer/ScrollViewSpecifics.qml
index ae525b747c..ae525b747c 100644
--- a/src/imports/controls/designer/ScrollViewSpecifics.qml
+++ b/src/quickcontrols2/designer/ScrollViewSpecifics.qml
diff --git a/src/imports/controls/designer/SliderSpecifics.qml b/src/quickcontrols2/designer/SliderSpecifics.qml
index 3af2054025..3af2054025 100644
--- a/src/imports/controls/designer/SliderSpecifics.qml
+++ b/src/quickcontrols2/designer/SliderSpecifics.qml
diff --git a/src/imports/controls/designer/SpinBoxSpecifics.qml b/src/quickcontrols2/designer/SpinBoxSpecifics.qml
index 9c07e8c524..9c07e8c524 100644
--- a/src/imports/controls/designer/SpinBoxSpecifics.qml
+++ b/src/quickcontrols2/designer/SpinBoxSpecifics.qml
diff --git a/src/imports/controls/designer/StackViewSpecifics.qml b/src/quickcontrols2/designer/StackViewSpecifics.qml
index 3937437b5e..3937437b5e 100644
--- a/src/imports/controls/designer/StackViewSpecifics.qml
+++ b/src/quickcontrols2/designer/StackViewSpecifics.qml
diff --git a/src/imports/controls/designer/SwipeDelegateSpecifics.qml b/src/quickcontrols2/designer/SwipeDelegateSpecifics.qml
index 1757521dd8..1757521dd8 100644
--- a/src/imports/controls/designer/SwipeDelegateSpecifics.qml
+++ b/src/quickcontrols2/designer/SwipeDelegateSpecifics.qml
diff --git a/src/imports/controls/designer/SwipeViewSpecifics.qml b/src/quickcontrols2/designer/SwipeViewSpecifics.qml
index a28a291781..a28a291781 100644
--- a/src/imports/controls/designer/SwipeViewSpecifics.qml
+++ b/src/quickcontrols2/designer/SwipeViewSpecifics.qml
diff --git a/src/imports/controls/designer/SwitchDelegateSpecifics.qml b/src/quickcontrols2/designer/SwitchDelegateSpecifics.qml
index 4236de6772..4236de6772 100644
--- a/src/imports/controls/designer/SwitchDelegateSpecifics.qml
+++ b/src/quickcontrols2/designer/SwitchDelegateSpecifics.qml
diff --git a/src/imports/controls/designer/SwitchSpecifics.qml b/src/quickcontrols2/designer/SwitchSpecifics.qml
index df0af7e748..df0af7e748 100644
--- a/src/imports/controls/designer/SwitchSpecifics.qml
+++ b/src/quickcontrols2/designer/SwitchSpecifics.qml
diff --git a/src/imports/controls/designer/TabBarSpecifics.qml b/src/quickcontrols2/designer/TabBarSpecifics.qml
index 6f02cdaac2..6f02cdaac2 100644
--- a/src/imports/controls/designer/TabBarSpecifics.qml
+++ b/src/quickcontrols2/designer/TabBarSpecifics.qml
diff --git a/src/imports/controls/designer/TabButtonSpecifics.qml b/src/quickcontrols2/designer/TabButtonSpecifics.qml
index df0af7e748..df0af7e748 100644
--- a/src/imports/controls/designer/TabButtonSpecifics.qml
+++ b/src/quickcontrols2/designer/TabButtonSpecifics.qml
diff --git a/src/imports/controls/designer/TextAreaSpecifics.qml b/src/quickcontrols2/designer/TextAreaSpecifics.qml
index 785d7a5017..785d7a5017 100644
--- a/src/imports/controls/designer/TextAreaSpecifics.qml
+++ b/src/quickcontrols2/designer/TextAreaSpecifics.qml
diff --git a/src/imports/controls/designer/TextFieldSpecifics.qml b/src/quickcontrols2/designer/TextFieldSpecifics.qml
index 33a90f2ae8..33a90f2ae8 100644
--- a/src/imports/controls/designer/TextFieldSpecifics.qml
+++ b/src/quickcontrols2/designer/TextFieldSpecifics.qml
diff --git a/src/imports/controls/designer/ToolBarSpecifics.qml b/src/quickcontrols2/designer/ToolBarSpecifics.qml
index 2b1b17d2bb..2b1b17d2bb 100644
--- a/src/imports/controls/designer/ToolBarSpecifics.qml
+++ b/src/quickcontrols2/designer/ToolBarSpecifics.qml
diff --git a/src/imports/controls/designer/ToolButtonSpecifics.qml b/src/quickcontrols2/designer/ToolButtonSpecifics.qml
index 5a46e72aff..5a46e72aff 100644
--- a/src/imports/controls/designer/ToolButtonSpecifics.qml
+++ b/src/quickcontrols2/designer/ToolButtonSpecifics.qml
diff --git a/src/imports/controls/designer/ToolSeparatorSpecifics.qml b/src/quickcontrols2/designer/ToolSeparatorSpecifics.qml
index a62147ecaf..a62147ecaf 100644
--- a/src/imports/controls/designer/ToolSeparatorSpecifics.qml
+++ b/src/quickcontrols2/designer/ToolSeparatorSpecifics.qml
diff --git a/src/imports/controls/designer/TumblerSpecifics.qml b/src/quickcontrols2/designer/TumblerSpecifics.qml
index 25fb927581..25fb927581 100644
--- a/src/imports/controls/designer/TumblerSpecifics.qml
+++ b/src/quickcontrols2/designer/TumblerSpecifics.qml
diff --git a/src/imports/controls/designer/designer.pri b/src/quickcontrols2/designer/designer.pri
index 6692b20316..6692b20316 100644
--- a/src/imports/controls/designer/designer.pri
+++ b/src/quickcontrols2/designer/designer.pri
diff --git a/src/imports/controls/designer/images/busyindicator-icon.png b/src/quickcontrols2/designer/images/busyindicator-icon.png
index 666d1ed93f..666d1ed93f 100644
--- a/src/imports/controls/designer/images/busyindicator-icon.png
+++ b/src/quickcontrols2/designer/images/busyindicator-icon.png
diff --git a/src/imports/controls/designer/images/busyindicator-icon16.png b/src/quickcontrols2/designer/images/busyindicator-icon16.png
index 5aa57d7f48..5aa57d7f48 100644
--- a/src/imports/controls/designer/images/busyindicator-icon16.png
+++ b/src/quickcontrols2/designer/images/busyindicator-icon16.png
diff --git a/src/imports/controls/designer/images/busyindicator-icon@2x.png b/src/quickcontrols2/designer/images/busyindicator-icon@2x.png
index bb2278ff89..bb2278ff89 100644
--- a/src/imports/controls/designer/images/busyindicator-icon@2x.png
+++ b/src/quickcontrols2/designer/images/busyindicator-icon@2x.png
diff --git a/src/imports/controls/designer/images/button-icon.png b/src/quickcontrols2/designer/images/button-icon.png
index c44909f6dd..c44909f6dd 100644
--- a/src/imports/controls/designer/images/button-icon.png
+++ b/src/quickcontrols2/designer/images/button-icon.png
diff --git a/src/imports/controls/designer/images/button-icon16.png b/src/quickcontrols2/designer/images/button-icon16.png
index 5c921deb13..5c921deb13 100644
--- a/src/imports/controls/designer/images/button-icon16.png
+++ b/src/quickcontrols2/designer/images/button-icon16.png
diff --git a/src/imports/controls/designer/images/button-icon@2x.png b/src/quickcontrols2/designer/images/button-icon@2x.png
index f90a1ba7dc..f90a1ba7dc 100644
--- a/src/imports/controls/designer/images/button-icon@2x.png
+++ b/src/quickcontrols2/designer/images/button-icon@2x.png
diff --git a/src/imports/controls/designer/images/checkbox-icon.png b/src/quickcontrols2/designer/images/checkbox-icon.png
index ee669b3a88..ee669b3a88 100644
--- a/src/imports/controls/designer/images/checkbox-icon.png
+++ b/src/quickcontrols2/designer/images/checkbox-icon.png
diff --git a/src/imports/controls/designer/images/checkbox-icon16.png b/src/quickcontrols2/designer/images/checkbox-icon16.png
index 8d89eab841..8d89eab841 100644
--- a/src/imports/controls/designer/images/checkbox-icon16.png
+++ b/src/quickcontrols2/designer/images/checkbox-icon16.png
diff --git a/src/imports/controls/designer/images/checkbox-icon@2x.png b/src/quickcontrols2/designer/images/checkbox-icon@2x.png
index 51c5601de0..51c5601de0 100644
--- a/src/imports/controls/designer/images/checkbox-icon@2x.png
+++ b/src/quickcontrols2/designer/images/checkbox-icon@2x.png
diff --git a/src/imports/controls/designer/images/combobox-icon.png b/src/quickcontrols2/designer/images/combobox-icon.png
index 2d31b17c65..2d31b17c65 100644
--- a/src/imports/controls/designer/images/combobox-icon.png
+++ b/src/quickcontrols2/designer/images/combobox-icon.png
diff --git a/src/imports/controls/designer/images/combobox-icon16.png b/src/quickcontrols2/designer/images/combobox-icon16.png
index 15fc3505ba..15fc3505ba 100644
--- a/src/imports/controls/designer/images/combobox-icon16.png
+++ b/src/quickcontrols2/designer/images/combobox-icon16.png
diff --git a/src/imports/controls/designer/images/combobox-icon@2x.png b/src/quickcontrols2/designer/images/combobox-icon@2x.png
index 5f82390596..5f82390596 100644
--- a/src/imports/controls/designer/images/combobox-icon@2x.png
+++ b/src/quickcontrols2/designer/images/combobox-icon@2x.png
diff --git a/src/imports/controls/designer/images/delaybutton-icon.png b/src/quickcontrols2/designer/images/delaybutton-icon.png
index 5a55bd9f77..5a55bd9f77 100644
--- a/src/imports/controls/designer/images/delaybutton-icon.png
+++ b/src/quickcontrols2/designer/images/delaybutton-icon.png
diff --git a/src/imports/controls/designer/images/delaybutton-icon16.png b/src/quickcontrols2/designer/images/delaybutton-icon16.png
index cd21394e46..cd21394e46 100644
--- a/src/imports/controls/designer/images/delaybutton-icon16.png
+++ b/src/quickcontrols2/designer/images/delaybutton-icon16.png
diff --git a/src/imports/controls/designer/images/delaybutton-icon@2x.png b/src/quickcontrols2/designer/images/delaybutton-icon@2x.png
index 7beee2fab0..7beee2fab0 100644
--- a/src/imports/controls/designer/images/delaybutton-icon@2x.png
+++ b/src/quickcontrols2/designer/images/delaybutton-icon@2x.png
diff --git a/src/imports/controls/designer/images/dial-icon.png b/src/quickcontrols2/designer/images/dial-icon.png
index b3b63e3523..b3b63e3523 100644
--- a/src/imports/controls/designer/images/dial-icon.png
+++ b/src/quickcontrols2/designer/images/dial-icon.png
diff --git a/src/imports/controls/designer/images/dial-icon16.png b/src/quickcontrols2/designer/images/dial-icon16.png
index 8d8c7c09b0..8d8c7c09b0 100644
--- a/src/imports/controls/designer/images/dial-icon16.png
+++ b/src/quickcontrols2/designer/images/dial-icon16.png
diff --git a/src/imports/controls/designer/images/dial-icon@2x.png b/src/quickcontrols2/designer/images/dial-icon@2x.png
index 22547a16b8..22547a16b8 100644
--- a/src/imports/controls/designer/images/dial-icon@2x.png
+++ b/src/quickcontrols2/designer/images/dial-icon@2x.png
diff --git a/src/imports/controls/designer/images/frame-icon.png b/src/quickcontrols2/designer/images/frame-icon.png
index 32abc8bf1e..32abc8bf1e 100644
--- a/src/imports/controls/designer/images/frame-icon.png
+++ b/src/quickcontrols2/designer/images/frame-icon.png
diff --git a/src/imports/controls/designer/images/frame-icon16.png b/src/quickcontrols2/designer/images/frame-icon16.png
index e5b65ad53b..e5b65ad53b 100644
--- a/src/imports/controls/designer/images/frame-icon16.png
+++ b/src/quickcontrols2/designer/images/frame-icon16.png
diff --git a/src/imports/controls/designer/images/frame-icon@2x.png b/src/quickcontrols2/designer/images/frame-icon@2x.png
index 8b876f38ec..8b876f38ec 100644
--- a/src/imports/controls/designer/images/frame-icon@2x.png
+++ b/src/quickcontrols2/designer/images/frame-icon@2x.png
diff --git a/src/imports/controls/designer/images/groupbox-icon.png b/src/quickcontrols2/designer/images/groupbox-icon.png
index 5542ecf8bf..5542ecf8bf 100644
--- a/src/imports/controls/designer/images/groupbox-icon.png
+++ b/src/quickcontrols2/designer/images/groupbox-icon.png
diff --git a/src/imports/controls/designer/images/groupbox-icon16.png b/src/quickcontrols2/designer/images/groupbox-icon16.png
index 9cf4324819..9cf4324819 100644
--- a/src/imports/controls/designer/images/groupbox-icon16.png
+++ b/src/quickcontrols2/designer/images/groupbox-icon16.png
diff --git a/src/imports/controls/designer/images/groupbox-icon@2x.png b/src/quickcontrols2/designer/images/groupbox-icon@2x.png
index 80dab3c716..80dab3c716 100644
--- a/src/imports/controls/designer/images/groupbox-icon@2x.png
+++ b/src/quickcontrols2/designer/images/groupbox-icon@2x.png
diff --git a/src/imports/controls/designer/images/itemdelegate-icon.png b/src/quickcontrols2/designer/images/itemdelegate-icon.png
index 822cf3e7b8..822cf3e7b8 100644
--- a/src/imports/controls/designer/images/itemdelegate-icon.png
+++ b/src/quickcontrols2/designer/images/itemdelegate-icon.png
diff --git a/src/imports/controls/designer/images/itemdelegate-icon16.png b/src/quickcontrols2/designer/images/itemdelegate-icon16.png
index b3ed007a0e..b3ed007a0e 100644
--- a/src/imports/controls/designer/images/itemdelegate-icon16.png
+++ b/src/quickcontrols2/designer/images/itemdelegate-icon16.png
diff --git a/src/imports/controls/designer/images/itemdelegate-icon@2x.png b/src/quickcontrols2/designer/images/itemdelegate-icon@2x.png
index cb81308ff8..cb81308ff8 100644
--- a/src/imports/controls/designer/images/itemdelegate-icon@2x.png
+++ b/src/quickcontrols2/designer/images/itemdelegate-icon@2x.png
diff --git a/src/imports/controls/designer/images/label-icon.png b/src/quickcontrols2/designer/images/label-icon.png
index 788bef078c..788bef078c 100644
--- a/src/imports/controls/designer/images/label-icon.png
+++ b/src/quickcontrols2/designer/images/label-icon.png
diff --git a/src/imports/controls/designer/images/label-icon16.png b/src/quickcontrols2/designer/images/label-icon16.png
index b68d384568..b68d384568 100644
--- a/src/imports/controls/designer/images/label-icon16.png
+++ b/src/quickcontrols2/designer/images/label-icon16.png
diff --git a/src/imports/controls/designer/images/label-icon@2x.png b/src/quickcontrols2/designer/images/label-icon@2x.png
index 7001413d3b..7001413d3b 100644
--- a/src/imports/controls/designer/images/label-icon@2x.png
+++ b/src/quickcontrols2/designer/images/label-icon@2x.png
diff --git a/src/imports/controls/designer/images/page-icon.png b/src/quickcontrols2/designer/images/page-icon.png
index b5ac87e899..b5ac87e899 100644
--- a/src/imports/controls/designer/images/page-icon.png
+++ b/src/quickcontrols2/designer/images/page-icon.png
diff --git a/src/imports/controls/designer/images/page-icon16.png b/src/quickcontrols2/designer/images/page-icon16.png
index bc6810b605..bc6810b605 100644
--- a/src/imports/controls/designer/images/page-icon16.png
+++ b/src/quickcontrols2/designer/images/page-icon16.png
diff --git a/src/imports/controls/designer/images/page-icon@2x.png b/src/quickcontrols2/designer/images/page-icon@2x.png
index 23db032f4a..23db032f4a 100644
--- a/src/imports/controls/designer/images/page-icon@2x.png
+++ b/src/quickcontrols2/designer/images/page-icon@2x.png
diff --git a/src/imports/controls/designer/images/pageindicator-icon.png b/src/quickcontrols2/designer/images/pageindicator-icon.png
index edb6b377bb..edb6b377bb 100644
--- a/src/imports/controls/designer/images/pageindicator-icon.png
+++ b/src/quickcontrols2/designer/images/pageindicator-icon.png
diff --git a/src/imports/controls/designer/images/pageindicator-icon16.png b/src/quickcontrols2/designer/images/pageindicator-icon16.png
index 0fb8967564..0fb8967564 100644
--- a/src/imports/controls/designer/images/pageindicator-icon16.png
+++ b/src/quickcontrols2/designer/images/pageindicator-icon16.png
diff --git a/src/imports/controls/designer/images/pageindicator-icon@2x.png b/src/quickcontrols2/designer/images/pageindicator-icon@2x.png
index 7be0ee813b..7be0ee813b 100644
--- a/src/imports/controls/designer/images/pageindicator-icon@2x.png
+++ b/src/quickcontrols2/designer/images/pageindicator-icon@2x.png
diff --git a/src/imports/controls/designer/images/pane-icon.png b/src/quickcontrols2/designer/images/pane-icon.png
index 62ebe487ff..62ebe487ff 100644
--- a/src/imports/controls/designer/images/pane-icon.png
+++ b/src/quickcontrols2/designer/images/pane-icon.png
diff --git a/src/imports/controls/designer/images/pane-icon16.png b/src/quickcontrols2/designer/images/pane-icon16.png
index 2b8048441c..2b8048441c 100644
--- a/src/imports/controls/designer/images/pane-icon16.png
+++ b/src/quickcontrols2/designer/images/pane-icon16.png
diff --git a/src/imports/controls/designer/images/pane-icon@2x.png b/src/quickcontrols2/designer/images/pane-icon@2x.png
index 55bb116a69..55bb116a69 100644
--- a/src/imports/controls/designer/images/pane-icon@2x.png
+++ b/src/quickcontrols2/designer/images/pane-icon@2x.png
diff --git a/src/imports/controls/designer/images/progressbar-icon.png b/src/quickcontrols2/designer/images/progressbar-icon.png
index a023f73c30..a023f73c30 100644
--- a/src/imports/controls/designer/images/progressbar-icon.png
+++ b/src/quickcontrols2/designer/images/progressbar-icon.png
diff --git a/src/imports/controls/designer/images/progressbar-icon16.png b/src/quickcontrols2/designer/images/progressbar-icon16.png
index 6fede21d8c..6fede21d8c 100644
--- a/src/imports/controls/designer/images/progressbar-icon16.png
+++ b/src/quickcontrols2/designer/images/progressbar-icon16.png
diff --git a/src/imports/controls/designer/images/progressbar-icon@2x.png b/src/quickcontrols2/designer/images/progressbar-icon@2x.png
index 0069400335..0069400335 100644
--- a/src/imports/controls/designer/images/progressbar-icon@2x.png
+++ b/src/quickcontrols2/designer/images/progressbar-icon@2x.png
diff --git a/src/imports/controls/designer/images/radiobutton-icon.png b/src/quickcontrols2/designer/images/radiobutton-icon.png
index d38170e22f..d38170e22f 100644
--- a/src/imports/controls/designer/images/radiobutton-icon.png
+++ b/src/quickcontrols2/designer/images/radiobutton-icon.png
diff --git a/src/imports/controls/designer/images/radiobutton-icon16.png b/src/quickcontrols2/designer/images/radiobutton-icon16.png
index 07b46a8ab0..07b46a8ab0 100644
--- a/src/imports/controls/designer/images/radiobutton-icon16.png
+++ b/src/quickcontrols2/designer/images/radiobutton-icon16.png
diff --git a/src/imports/controls/designer/images/radiobutton-icon@2x.png b/src/quickcontrols2/designer/images/radiobutton-icon@2x.png
index 4bbddda4b2..4bbddda4b2 100644
--- a/src/imports/controls/designer/images/radiobutton-icon@2x.png
+++ b/src/quickcontrols2/designer/images/radiobutton-icon@2x.png
diff --git a/src/imports/controls/designer/images/rangeslider-icon.png b/src/quickcontrols2/designer/images/rangeslider-icon.png
index 1c4c7b2948..1c4c7b2948 100644
--- a/src/imports/controls/designer/images/rangeslider-icon.png
+++ b/src/quickcontrols2/designer/images/rangeslider-icon.png
diff --git a/src/imports/controls/designer/images/rangeslider-icon16.png b/src/quickcontrols2/designer/images/rangeslider-icon16.png
index 3be4624ddd..3be4624ddd 100644
--- a/src/imports/controls/designer/images/rangeslider-icon16.png
+++ b/src/quickcontrols2/designer/images/rangeslider-icon16.png
diff --git a/src/imports/controls/designer/images/rangeslider-icon@2x.png b/src/quickcontrols2/designer/images/rangeslider-icon@2x.png
index aee69b3302..aee69b3302 100644
--- a/src/imports/controls/designer/images/rangeslider-icon@2x.png
+++ b/src/quickcontrols2/designer/images/rangeslider-icon@2x.png
diff --git a/src/imports/controls/designer/images/roundbutton-icon.png b/src/quickcontrols2/designer/images/roundbutton-icon.png
index d4b470dc25..d4b470dc25 100644
--- a/src/imports/controls/designer/images/roundbutton-icon.png
+++ b/src/quickcontrols2/designer/images/roundbutton-icon.png
diff --git a/src/imports/controls/designer/images/roundbutton-icon16.png b/src/quickcontrols2/designer/images/roundbutton-icon16.png
index f6f3666639..f6f3666639 100644
--- a/src/imports/controls/designer/images/roundbutton-icon16.png
+++ b/src/quickcontrols2/designer/images/roundbutton-icon16.png
diff --git a/src/imports/controls/designer/images/roundbutton-icon@2x.png b/src/quickcontrols2/designer/images/roundbutton-icon@2x.png
index 4553e165e7..4553e165e7 100644
--- a/src/imports/controls/designer/images/roundbutton-icon@2x.png
+++ b/src/quickcontrols2/designer/images/roundbutton-icon@2x.png
diff --git a/src/imports/controls/designer/images/scrollview-icon.png b/src/quickcontrols2/designer/images/scrollview-icon.png
index 5ef73ff19f..5ef73ff19f 100644
--- a/src/imports/controls/designer/images/scrollview-icon.png
+++ b/src/quickcontrols2/designer/images/scrollview-icon.png
diff --git a/src/imports/controls/designer/images/scrollview-icon16.png b/src/quickcontrols2/designer/images/scrollview-icon16.png
index f8ca7a3685..f8ca7a3685 100644
--- a/src/imports/controls/designer/images/scrollview-icon16.png
+++ b/src/quickcontrols2/designer/images/scrollview-icon16.png
diff --git a/src/imports/controls/designer/images/scrollview-icon@2x.png b/src/quickcontrols2/designer/images/scrollview-icon@2x.png
index 0eb7f9665e..0eb7f9665e 100644
--- a/src/imports/controls/designer/images/scrollview-icon@2x.png
+++ b/src/quickcontrols2/designer/images/scrollview-icon@2x.png
diff --git a/src/imports/controls/designer/images/slider-icon.png b/src/quickcontrols2/designer/images/slider-icon.png
index bd0a9729be..bd0a9729be 100644
--- a/src/imports/controls/designer/images/slider-icon.png
+++ b/src/quickcontrols2/designer/images/slider-icon.png
diff --git a/src/imports/controls/designer/images/slider-icon16.png b/src/quickcontrols2/designer/images/slider-icon16.png
index a08622df89..a08622df89 100644
--- a/src/imports/controls/designer/images/slider-icon16.png
+++ b/src/quickcontrols2/designer/images/slider-icon16.png
diff --git a/src/imports/controls/designer/images/slider-icon@2x.png b/src/quickcontrols2/designer/images/slider-icon@2x.png
index 93842e4cdd..93842e4cdd 100644
--- a/src/imports/controls/designer/images/slider-icon@2x.png
+++ b/src/quickcontrols2/designer/images/slider-icon@2x.png
diff --git a/src/imports/controls/designer/images/spinbox-icon.png b/src/quickcontrols2/designer/images/spinbox-icon.png
index 37277c5e43..37277c5e43 100644
--- a/src/imports/controls/designer/images/spinbox-icon.png
+++ b/src/quickcontrols2/designer/images/spinbox-icon.png
diff --git a/src/imports/controls/designer/images/spinbox-icon16.png b/src/quickcontrols2/designer/images/spinbox-icon16.png
index f88711dd25..f88711dd25 100644
--- a/src/imports/controls/designer/images/spinbox-icon16.png
+++ b/src/quickcontrols2/designer/images/spinbox-icon16.png
diff --git a/src/imports/controls/designer/images/spinbox-icon@2x.png b/src/quickcontrols2/designer/images/spinbox-icon@2x.png
index b62a3bad51..b62a3bad51 100644
--- a/src/imports/controls/designer/images/spinbox-icon@2x.png
+++ b/src/quickcontrols2/designer/images/spinbox-icon@2x.png
diff --git a/src/imports/controls/designer/images/stackview-icon.png b/src/quickcontrols2/designer/images/stackview-icon.png
index a6ced34925..a6ced34925 100644
--- a/src/imports/controls/designer/images/stackview-icon.png
+++ b/src/quickcontrols2/designer/images/stackview-icon.png
diff --git a/src/imports/controls/designer/images/stackview-icon16.png b/src/quickcontrols2/designer/images/stackview-icon16.png
index 0f19d0efa3..0f19d0efa3 100644
--- a/src/imports/controls/designer/images/stackview-icon16.png
+++ b/src/quickcontrols2/designer/images/stackview-icon16.png
diff --git a/src/imports/controls/designer/images/stackview-icon@2x.png b/src/quickcontrols2/designer/images/stackview-icon@2x.png
index 9b5ef9517b..9b5ef9517b 100644
--- a/src/imports/controls/designer/images/stackview-icon@2x.png
+++ b/src/quickcontrols2/designer/images/stackview-icon@2x.png
diff --git a/src/imports/controls/designer/images/swipeview-icon.png b/src/quickcontrols2/designer/images/swipeview-icon.png
index 031cb27c36..031cb27c36 100644
--- a/src/imports/controls/designer/images/swipeview-icon.png
+++ b/src/quickcontrols2/designer/images/swipeview-icon.png
diff --git a/src/imports/controls/designer/images/swipeview-icon16.png b/src/quickcontrols2/designer/images/swipeview-icon16.png
index 446c469690..446c469690 100644
--- a/src/imports/controls/designer/images/swipeview-icon16.png
+++ b/src/quickcontrols2/designer/images/swipeview-icon16.png
diff --git a/src/imports/controls/designer/images/swipeview-icon@2x.png b/src/quickcontrols2/designer/images/swipeview-icon@2x.png
index 0ccb978c46..0ccb978c46 100644
--- a/src/imports/controls/designer/images/swipeview-icon@2x.png
+++ b/src/quickcontrols2/designer/images/swipeview-icon@2x.png
diff --git a/src/imports/controls/designer/images/switch-icon.png b/src/quickcontrols2/designer/images/switch-icon.png
index e018159286..e018159286 100644
--- a/src/imports/controls/designer/images/switch-icon.png
+++ b/src/quickcontrols2/designer/images/switch-icon.png
diff --git a/src/imports/controls/designer/images/switch-icon16.png b/src/quickcontrols2/designer/images/switch-icon16.png
index 9abd275659..9abd275659 100644
--- a/src/imports/controls/designer/images/switch-icon16.png
+++ b/src/quickcontrols2/designer/images/switch-icon16.png
diff --git a/src/imports/controls/designer/images/switch-icon@2x.png b/src/quickcontrols2/designer/images/switch-icon@2x.png
index 787f54ca41..787f54ca41 100644
--- a/src/imports/controls/designer/images/switch-icon@2x.png
+++ b/src/quickcontrols2/designer/images/switch-icon@2x.png
diff --git a/src/imports/controls/designer/images/textarea-icon.png b/src/quickcontrols2/designer/images/textarea-icon.png
index f1b2dc0f84..f1b2dc0f84 100644
--- a/src/imports/controls/designer/images/textarea-icon.png
+++ b/src/quickcontrols2/designer/images/textarea-icon.png
diff --git a/src/imports/controls/designer/images/textarea-icon16.png b/src/quickcontrols2/designer/images/textarea-icon16.png
index 4afc1fbab5..4afc1fbab5 100644
--- a/src/imports/controls/designer/images/textarea-icon16.png
+++ b/src/quickcontrols2/designer/images/textarea-icon16.png
diff --git a/src/imports/controls/designer/images/textarea-icon@2x.png b/src/quickcontrols2/designer/images/textarea-icon@2x.png
index c32ecc71a9..c32ecc71a9 100644
--- a/src/imports/controls/designer/images/textarea-icon@2x.png
+++ b/src/quickcontrols2/designer/images/textarea-icon@2x.png
diff --git a/src/imports/controls/designer/images/textfield-icon.png b/src/quickcontrols2/designer/images/textfield-icon.png
index ba5537acef..ba5537acef 100644
--- a/src/imports/controls/designer/images/textfield-icon.png
+++ b/src/quickcontrols2/designer/images/textfield-icon.png
diff --git a/src/imports/controls/designer/images/textfield-icon16.png b/src/quickcontrols2/designer/images/textfield-icon16.png
index c4a62a6582..c4a62a6582 100644
--- a/src/imports/controls/designer/images/textfield-icon16.png
+++ b/src/quickcontrols2/designer/images/textfield-icon16.png
diff --git a/src/imports/controls/designer/images/textfield-icon@2x.png b/src/quickcontrols2/designer/images/textfield-icon@2x.png
index e05fd41b9a..e05fd41b9a 100644
--- a/src/imports/controls/designer/images/textfield-icon@2x.png
+++ b/src/quickcontrols2/designer/images/textfield-icon@2x.png
diff --git a/src/imports/controls/designer/images/toolbar-icon.png b/src/quickcontrols2/designer/images/toolbar-icon.png
index 5cb5b2e1af..5cb5b2e1af 100644
--- a/src/imports/controls/designer/images/toolbar-icon.png
+++ b/src/quickcontrols2/designer/images/toolbar-icon.png
diff --git a/src/imports/controls/designer/images/toolbar-icon16.png b/src/quickcontrols2/designer/images/toolbar-icon16.png
index 569373afa1..569373afa1 100644
--- a/src/imports/controls/designer/images/toolbar-icon16.png
+++ b/src/quickcontrols2/designer/images/toolbar-icon16.png
diff --git a/src/imports/controls/designer/images/toolbar-icon@2x.png b/src/quickcontrols2/designer/images/toolbar-icon@2x.png
index fd9e6ceebc..fd9e6ceebc 100644
--- a/src/imports/controls/designer/images/toolbar-icon@2x.png
+++ b/src/quickcontrols2/designer/images/toolbar-icon@2x.png
diff --git a/src/imports/controls/designer/images/toolbutton-icon.png b/src/quickcontrols2/designer/images/toolbutton-icon.png
index 3298f69519..3298f69519 100644
--- a/src/imports/controls/designer/images/toolbutton-icon.png
+++ b/src/quickcontrols2/designer/images/toolbutton-icon.png
diff --git a/src/imports/controls/designer/images/toolbutton-icon16.png b/src/quickcontrols2/designer/images/toolbutton-icon16.png
index 9ab7861c25..9ab7861c25 100644
--- a/src/imports/controls/designer/images/toolbutton-icon16.png
+++ b/src/quickcontrols2/designer/images/toolbutton-icon16.png
diff --git a/src/imports/controls/designer/images/toolbutton-icon@2x.png b/src/quickcontrols2/designer/images/toolbutton-icon@2x.png
index e5958cded3..e5958cded3 100644
--- a/src/imports/controls/designer/images/toolbutton-icon@2x.png
+++ b/src/quickcontrols2/designer/images/toolbutton-icon@2x.png
diff --git a/src/imports/controls/designer/images/toolseparator-icon.png b/src/quickcontrols2/designer/images/toolseparator-icon.png
index 5e99f06f2e..5e99f06f2e 100644
--- a/src/imports/controls/designer/images/toolseparator-icon.png
+++ b/src/quickcontrols2/designer/images/toolseparator-icon.png
diff --git a/src/imports/controls/designer/images/toolseparator-icon16.png b/src/quickcontrols2/designer/images/toolseparator-icon16.png
index 68f22c5df1..68f22c5df1 100644
--- a/src/imports/controls/designer/images/toolseparator-icon16.png
+++ b/src/quickcontrols2/designer/images/toolseparator-icon16.png
diff --git a/src/imports/controls/designer/images/toolseparator-icon@2x.png b/src/quickcontrols2/designer/images/toolseparator-icon@2x.png
index 549c11c67c..549c11c67c 100644
--- a/src/imports/controls/designer/images/toolseparator-icon@2x.png
+++ b/src/quickcontrols2/designer/images/toolseparator-icon@2x.png
diff --git a/src/imports/controls/designer/images/tumbler-icon.png b/src/quickcontrols2/designer/images/tumbler-icon.png
index 98eb8232a2..98eb8232a2 100644
--- a/src/imports/controls/designer/images/tumbler-icon.png
+++ b/src/quickcontrols2/designer/images/tumbler-icon.png
diff --git a/src/imports/controls/designer/images/tumbler-icon16.png b/src/quickcontrols2/designer/images/tumbler-icon16.png
index ff5f95cf32..ff5f95cf32 100644
--- a/src/imports/controls/designer/images/tumbler-icon16.png
+++ b/src/quickcontrols2/designer/images/tumbler-icon16.png
diff --git a/src/imports/controls/designer/images/tumbler-icon@2x.png b/src/quickcontrols2/designer/images/tumbler-icon@2x.png
index 236abf0cfe..236abf0cfe 100644
--- a/src/imports/controls/designer/images/tumbler-icon@2x.png
+++ b/src/quickcontrols2/designer/images/tumbler-icon@2x.png
diff --git a/src/imports/controls/designer/qtquickcontrols2.metainfo b/src/quickcontrols2/designer/qtquickcontrols2.metainfo
index d27f1b9004..d27f1b9004 100644
--- a/src/imports/controls/designer/qtquickcontrols2.metainfo
+++ b/src/quickcontrols2/designer/qtquickcontrols2.metainfo
diff --git a/src/imports/controls/doc/doc.pri b/src/quickcontrols2/doc/doc.pri
index 4bd8bd95df..4bd8bd95df 100644
--- a/src/imports/controls/doc/doc.pri
+++ b/src/quickcontrols2/doc/doc.pri
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-applicationwindow-wireframe.png b/src/quickcontrols2/doc/images/qtquickcontrols2-applicationwindow-wireframe.png
index f31378004a..f31378004a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-applicationwindow-wireframe.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-applicationwindow-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-basic-thumbnail.png b/src/quickcontrols2/doc/images/qtquickcontrols2-basic-thumbnail.png
index e971a7aaec..e971a7aaec 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-basic-thumbnail.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-basic-thumbnail.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-basic.png b/src/quickcontrols2/doc/images/qtquickcontrols2-basic.png
index 099db17038..099db17038 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-basic.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-basic.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator-custom.png
index fefae223ef..fefae223ef 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator.gif
index 653d200f3c..653d200f3c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.png b/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator.png
index 4be09579bb..4be09579bb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-button-custom.png
index 46d3e3eb5e..46d3e3eb5e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-button-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-flat.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-button-flat.gif
index e2bd8b6fcf..e2bd8b6fcf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-flat.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-button-flat.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-highlighted.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-button-highlighted.gif
index 7de076d3d0..7de076d3d0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-highlighted.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-button-highlighted.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-icononly.png b/src/quickcontrols2/doc/images/qtquickcontrols2-button-icononly.png
index 9c8dd0f43f..9c8dd0f43f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-icononly.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-button-icononly.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-textbesideicon.png b/src/quickcontrols2/doc/images/qtquickcontrols2-button-textbesideicon.png
index 3dc64fb92b..3dc64fb92b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-textbesideicon.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-button-textbesideicon.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-textonly.png b/src/quickcontrols2/doc/images/qtquickcontrols2-button-textonly.png
index 737beb165f..737beb165f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-textonly.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-button-textonly.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-textundericon.png b/src/quickcontrols2/doc/images/qtquickcontrols2-button-textundericon.png
index 37c40c7c66..37c40c7c66 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-textundericon.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-button-textundericon.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-button.gif
index 10d626a331..10d626a331 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-button.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-custom.png
index c6c3d1bcbd..c6c3d1bcbd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-group.png b/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-group.png
index d5a0d51be6..d5a0d51be6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-group.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-group.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-tristate.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-tristate.gif
index 56a1586795..56a1586795 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-tristate.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-tristate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox.gif
index d70c0ee4b9..d70c0ee4b9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate-custom.png
index c0dd06892c..c0dd06892c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-tristate.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate-tristate.gif
index 8d058d6c54..8d058d6c54 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-tristate.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate-tristate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate.gif
index da3fab98a4..da3fab98a4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-custom.png
index 4f7206dc78..4f7206dc78 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png b/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-delegate.png
index cf31064895..cf31064895 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-delegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png b/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-popup.png
index cf31064895..cf31064895 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-popup.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-combobox.gif
index 966a2d4ae5..966a2d4ae5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-combobox.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-control.png b/src/quickcontrols2/doc/images/qtquickcontrols2-control.png
index 0f004a89dd..0f004a89dd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-control.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-control.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-control.svg b/src/quickcontrols2/doc/images/qtquickcontrols2-control.svg
index 4b2057d197..4b2057d197 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-control.svg
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-control.svg
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.png b/src/quickcontrols2/doc/images/qtquickcontrols2-customize-buttons.png
index 551e8a0cf7..551e8a0cf7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-customize-buttons.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-delaybutton-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-delaybutton-custom.png
index a7bd7c19d8..a7bd7c19d8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-delaybutton-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-delaybutton-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-delaybutton.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-delaybutton.gif
index 16a198f9cb..16a198f9cb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-delaybutton.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-delaybutton.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-custom.png
index 6312c99933..6312c99933 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-handle.png
index 9e22b2e709..9e22b2e709 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-inputMode.svgz b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-inputMode.svgz
index 005ab7b331..005ab7b331 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-inputMode.svgz
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-inputMode.svgz
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-inputmode.png b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-inputmode.png
index 5bbc41a49c..5bbc41a49c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-inputmode.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-inputmode.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-no-wrap.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-no-wrap.gif
index 24f6790b6d..24f6790b6d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-no-wrap.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-no-wrap.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-wrap.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-wrap.gif
index cfb1fb5b10..cfb1fb5b10 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-wrap.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-dial-wrap.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial.png b/src/quickcontrols2/doc/images/qtquickcontrols2-dial.png
index 71c54113b7..71c54113b7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-dial.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png b/src/quickcontrols2/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png
index c17f38ac0c..c17f38ac0c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dialogbuttonbox.png b/src/quickcontrols2/doc/images/qtquickcontrols2-dialogbuttonbox.png
index 33b5f45f4f..33b5f45f4f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dialogbuttonbox.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-dialogbuttonbox.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png b/src/quickcontrols2/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png
index 0c92f86587..0c92f86587 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-drawer-wireframe.png b/src/quickcontrols2/doc/images/qtquickcontrols2-drawer-wireframe.png
index 74806f17b7..74806f17b7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-drawer-wireframe.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-drawer-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-drawer.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-drawer.gif
index 736f34f66f..736f34f66f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-drawer.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-drawer.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-frame-custom.png
index f628b20c20..f628b20c20 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-frame-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-frame-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame.png b/src/quickcontrols2/doc/images/qtquickcontrols2-frame.png
index e3cb31dc71..e3cb31dc71 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-frame.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-frame.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-fusion-palettes.png b/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-palettes.png
index d806116167..d806116167 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-fusion-palettes.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-palettes.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-fusion-thumbnail.png b/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-thumbnail.png
index c270c6efba..c270c6efba 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-fusion-thumbnail.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-thumbnail.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-fusion-violet.png b/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-violet.png
index 99e5b59786..99e5b59786 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-fusion-violet.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-violet.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-fusion.png b/src/quickcontrols2/doc/images/qtquickcontrols2-fusion.png
index 7119ef225d..7119ef225d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-fusion.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-fusion.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png b/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-checkable.png
index 820ad79c80..820ad79c80 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-checkable.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-custom.png
index 029679ced0..029679ced0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png b/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-label.png
index c26795a7a7..c26795a7a7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png b/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox.png
index ea2f9ea5c5..ea2f9ea5c5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-4x.png b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-4x.png
index bab99a5e55..bab99a5e55 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-4x.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-4x.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png
index c42df81edc..c42df81edc 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-inset.png b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-inset.png
index 0627d08590..0627d08590 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-inset.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-inset.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png
index 0a606c9926..0a606c9926 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png
index 9598b13a1c..9598b13a1c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-size.png b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-size.png
index db6453758f..db6453758f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-size.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-size.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch.svgz b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch.svgz
index 5a1a1094d1..5a1a1094d1 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch.svgz
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch.svgz
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-customization-dark.png b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-customization-dark.png
index 144ac97c87..144ac97c87 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine-customization-dark.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-customization-dark.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-customization.svgz b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-customization.svgz
index fb8305638b..fb8305638b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine-customization.svgz
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-customization.svgz
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-thumbnail.png b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-thumbnail.png
index ecf2bb163d..ecf2bb163d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine-thumbnail.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-thumbnail.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine.png b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine.png
index ffe2c267b2..ffe2c267b2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-imagine.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-imagine.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate-custom.png
index 35f8892f16..35f8892f16 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate.gif
index dccb6efcdb..dccb6efcdb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png b/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate.png
index 7242f343a0..7242f343a0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-label-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-label-custom.png
index 5730ff23bf..5730ff23bf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-label-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-label-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-label.png b/src/quickcontrols2/doc/images/qtquickcontrols2-label.png
index 0bafcf8602..0bafcf8602 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-label.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-macos-dark.png b/src/quickcontrols2/doc/images/qtquickcontrols2-macos-dark.png
index 97d8a5a4e7..97d8a5a4e7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-macos-dark.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-macos-dark.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-macos-light.png b/src/quickcontrols2/doc/images/qtquickcontrols2-macos-light.png
index 4a598ad498..4a598ad498 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-macos-light.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-macos-light.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-macos-thumbnail.png b/src/quickcontrols2/doc/images/qtquickcontrols2-macos-thumbnail.png
index 57fd98d63a..57fd98d63a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-macos-thumbnail.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-macos-thumbnail.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-accent.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-accent.png
index a85afc68ed..a85afc68ed 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-accent.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-accent.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-attributes.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-attributes.png
index bb54071d79..bb54071d79 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-attributes.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-attributes.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-background.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-background.png
index 62028f523c..62028f523c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-background.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-dark.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-dark.png
index f6e45b3b1c..f6e45b3b1c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-dark.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-dark.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-elevation.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-elevation.png
index d152f14529..d152f14529 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-elevation.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-elevation.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-foreground.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-foreground.png
index 0d0e1b651a..0d0e1b651a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-foreground.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-foreground.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-light.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-light.png
index c9abe2cb8b..c9abe2cb8b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-light.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-light.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-purple.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-purple.png
index b955736b0b..b955736b0b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-purple.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-purple.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-theme.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-theme.png
index 1d09a82580..1d09a82580 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-theme.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-theme.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-thumbnail.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-thumbnail.png
index d758ff1803..d758ff1803 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-thumbnail.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-thumbnail.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-variant-dense.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-variant-dense.png
index 02f39b7885..02f39b7885 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-variant-dense.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-variant-dense.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-variant-normal.png b/src/quickcontrols2/doc/images/qtquickcontrols2-material-variant-normal.png
index c1e366c531..c1e366c531 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material-variant-normal.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-material-variant-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-menu-custom.png
index 922bf591b5..922bf591b5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-menu-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menu.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-menu.gif
index 93a873a33a..93a873a33a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-menu.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-menu.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menu.png b/src/quickcontrols2/doc/images/qtquickcontrols2-menu.png
index 926c33eed2..926c33eed2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-menu.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-menu.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menubar-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-menubar-custom.png
index b6007e466d..b6007e466d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-menubar-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-menubar-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menubar.png b/src/quickcontrols2/doc/images/qtquickcontrols2-menubar.png
index 873b7a1960..873b7a1960 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-menubar.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-menubar.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menuseparator-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-menuseparator-custom.png
index 78635b9c88..78635b9c88 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-menuseparator-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-menuseparator-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menuseparator.png b/src/quickcontrols2/doc/images/qtquickcontrols2-menuseparator.png
index 35307817f6..35307817f6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-menuseparator.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-menuseparator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-page-wireframe.png b/src/quickcontrols2/doc/images/qtquickcontrols2-page-wireframe.png
index f612c243c4..f612c243c4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-page-wireframe.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-page-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator-custom.png
index a767a51aa0..a767a51aa0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-delegate.png b/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator-delegate.png
index 95acde70cf..95acde70cf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-delegate.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator-delegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator.png b/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator.png
index e2a0a157f6..e2a0a157f6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pane-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-pane-custom.png
index 03a0369f56..03a0369f56 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-pane-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-pane-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pane.png b/src/quickcontrols2/doc/images/qtquickcontrols2-pane.png
index 3801cc3efb..3801cc3efb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-pane.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-pane.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-popup-custom.png
index cb7813d387..cb7813d387 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-popup-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-popup-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png b/src/quickcontrols2/doc/images/qtquickcontrols2-popup-settings.png
index 5122158ef4..5122158ef4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-popup-settings.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup-transformorigin.png b/src/quickcontrols2/doc/images/qtquickcontrols2-popup-transformorigin.png
index 16d2617786..16d2617786 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-popup-transformorigin.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-popup-transformorigin.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup.png b/src/quickcontrols2/doc/images/qtquickcontrols2-popup.png
index 8fc424a854..8fc424a854 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-popup.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-popup.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup.svg b/src/quickcontrols2/doc/images/qtquickcontrols2-popup.svg
index e39f3dce21..e39f3dce21 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-popup.svg
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-popup.svg
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar-custom.png
index 9d73df2c25..9d73df2c25 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar-indeterminate.gif
index d6756d16fd..d6756d16fd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar-indeterminate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar.gif
index 49af5f45a1..49af5f45a1 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-radiobutton-custom.png
index 5c85179f70..5c85179f70 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-radiobutton-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-radiobutton.gif
index 4cbf3ed9d6..4cbf3ed9d6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-radiobutton.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-radiodelegate-custom.png
index 7d32699bf9..7d32699bf9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-radiodelegate-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-radiodelegate.gif
index b6afd6fe6a..b6afd6fe6a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-radiodelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-rangeslider-custom.png
index 47379a300d..47379a300d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-rangeslider-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-rangeslider.gif
index db565b0a93..db565b0a93 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-rangeslider.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-roundbutton.png b/src/quickcontrols2/doc/images/qtquickcontrols2-roundbutton.png
index 4dce37f239..4dce37f239 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-roundbutton.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-roundbutton.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-custom.png
index 690bc8beef..690bc8beef 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-non-attached.png b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-non-attached.png
index eba363dda2..eba363dda2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-non-attached.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-non-attached.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-nosnap.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-nosnap.gif
index f61ac5b46a..f61ac5b46a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-nosnap.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-nosnap.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-snapalways.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-snapalways.gif
index 438d4a3318..438d4a3318 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-snapalways.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-snapalways.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif
index c2fa67b027..c2fa67b027 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar.gif
index ed3ab607d9..ed3ab607d9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator-custom.png
index b1183bc52a..b1183bc52a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-non-attached.png b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator-non-attached.png
index a61e048743..a61e048743 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-non-attached.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator-non-attached.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator.gif
index 73007820f8..73007820f8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollview-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview-custom.png
index 8f4bd92863..8f4bd92863 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollview-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollview-wireframe.png b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview-wireframe.png
index 8a39056aa9..8a39056aa9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollview-wireframe.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollview.png b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview.png
index 1a4039e1fd..1a4039e1fd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollview.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-slider-custom.png
index dbbacb343f..dbbacb343f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-slider-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png b/src/quickcontrols2/doc/images/qtquickcontrols2-slider-handle.png
index 5450d57480..5450d57480 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-slider-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-nosnap.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-slider-nosnap.gif
index ab233c5b93..ab233c5b93 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-nosnap.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-slider-nosnap.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-snapalways.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-slider-snapalways.gif
index 8eb4011fb5..8eb4011fb5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-snapalways.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-slider-snapalways.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-snaponrelease.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-slider-snaponrelease.gif
index f3b1d5c7a9..f3b1d5c7a9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-snaponrelease.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-slider-snaponrelease.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-slider.gif
index 2ee56334e0..2ee56334e0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-slider.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-custom.png
index d1e883fc56..d1e883fc56 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.png b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-double.png
index d3f5876c4a..d3f5876c4a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-double.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-down.png
index 1d5dcf7b44..1d5dcf7b44 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-down.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-textual.png
index 5513d6e67d..5513d6e67d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-textual.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-up.png
index 1ee1c4798e..1ee1c4798e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-up.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox.png
index 835bb1d67d..835bb1d67d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-splitview-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-splitview-custom.png
index da820ccafe..da820ccafe 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-splitview-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-splitview-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-stackview-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-custom.png
index 5ee6049e74..5ee6049e74 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-stackview-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-stackview-pop.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-pop.gif
index 1971c2e004..1971c2e004 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-stackview-pop.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-pop.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-stackview-push.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-push.gif
index 0218cc0f2f..0218cc0f2f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-stackview-push.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-push.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-stackview-replace.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-replace.gif
index 63a6b2b4b5..63a6b2b4b5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-stackview-replace.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-replace.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-stackview-unwind.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-unwind.gif
index 28c051d866..28c051d866 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-stackview-unwind.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-unwind.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-stackview-visible.png b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-visible.png
index d937b417e6..d937b417e6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-stackview-visible.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-visible.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-stackview-wireframe.png b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-wireframe.png
index f28b5c67de..f28b5c67de 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-stackview-wireframe.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-styles.png b/src/quickcontrols2/doc/images/qtquickcontrols2-styles.png
index 992dd47eba..992dd47eba 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-styles.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-styles.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-behind.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-behind.gif
index 97d6a59277..97d6a59277 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-behind.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-behind.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-custom.png
index 5813b73cf4..5813b73cf4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif
index 0641bd1400..0641bd1400 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate.gif
index 86c380b7b3..86c380b7b3 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipeview-indicator.png b/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview-indicator.png
index 998ec9f7c9..998ec9f7c9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipeview-indicator.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipeview-wireframe.png b/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview-wireframe.png
index 3cc2b83c4b..3cc2b83c4b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipeview-wireframe.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipeview.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview.gif
index 4af26c1058..4af26c1058 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipeview.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png b/src/quickcontrols2/doc/images/qtquickcontrols2-switch-checked.png
index 7a0cde1bad..7a0cde1bad 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-switch-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-switch-custom.png
index 6d535ef96f..6d535ef96f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-switch-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-switch.gif
index 5f956304a0..5f956304a0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-switch.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch.png b/src/quickcontrols2/doc/images/qtquickcontrols2-switch.png
index 7f613f3343..7f613f3343 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-switch.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-switchdelegate-custom.png
index f5337e2c83..f5337e2c83 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-switchdelegate-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-switchdelegate.gif
index 950b10731f..950b10731f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-switchdelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-custom.png
index 8c8e4accd8..8c8e4accd8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-explicit.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-explicit.png
index b1de5f715e..b1de5f715e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-explicit.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-explicit.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-flickable.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-flickable.png
index 0c253f82d5..0c253f82d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-flickable.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-flickable.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-wireframe.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-wireframe.png
index 35a64ae285..35a64ae285 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-wireframe.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar.gif
index 31db1f9e7c..31db1f9e7c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbar.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar.png
index 9f113497db..9f113497db 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbutton.png
index 3df2f53147..3df2f53147 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tabbutton.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-textarea-custom.png
index 6220a13f39..6220a13f39 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-textarea-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textarea-scrollable.png b/src/quickcontrols2/doc/images/qtquickcontrols2-textarea-scrollable.png
index ae868a27da..ae868a27da 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textarea-scrollable.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-textarea-scrollable.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textarea.png b/src/quickcontrols2/doc/images/qtquickcontrols2-textarea.png
index fc221bd757..fc221bd757 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textarea.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-textarea.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-custom.png
index 9102317065..9102317065 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png b/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-disabled.png
index b143d21053..b143d21053 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png b/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-focused.png
index de7f9599c9..de7f9599c9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png b/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-normal.png
index 4229c706ad..4229c706ad 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield.png b/src/quickcontrols2/doc/images/qtquickcontrols2-textfield.png
index a008383a00..a008383a00 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-textfield.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-toolbar-custom.png
index 425e5f8c64..425e5f8c64 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-toolbar-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png b/src/quickcontrols2/doc/images/qtquickcontrols2-toolbar.png
index e5a33eee9a..e5a33eee9a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-toolbar.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-toolbutton-custom.png
index b78269d087..b78269d087 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-toolbutton-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton.png b/src/quickcontrols2/doc/images/qtquickcontrols2-toolbutton.png
index 610c1a7cb4..610c1a7cb4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-toolbutton.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolseparator-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-toolseparator-custom.png
index 6703eeba53..6703eeba53 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolseparator-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-toolseparator-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolseparator.png b/src/quickcontrols2/doc/images/qtquickcontrols2-toolseparator.png
index 88ced12361..88ced12361 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolseparator.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-toolseparator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-delay.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-delay.png
index 59813835b4..59813835b4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-delay.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-delay.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-hover.png
index 62a9cf844b..62a9cf844b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-hover.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-pressandhold.png
index 62a9cf844b..62a9cf844b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-pressandhold.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-slider.png
index a15e723a02..a15e723a02 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-slider.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip.png
index 4238d52a77..4238d52a77 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-custom.png
index bbfa9b0cef..bbfa9b0cef 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-delegate.png
index a28da93e46..a28da93e46 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-delegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif b/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-wrap.gif
index 8f59eedcc7..8f59eedcc7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-wrap.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler.png b/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler.png
index 38339dfa25..38339dfa25 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-accent.png b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-accent.png
index e1d74f7a91..e1d74f7a91 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal-accent.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-accent.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-attributes.png b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-attributes.png
index 7a7ef347fc..7a7ef347fc 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal-attributes.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-attributes.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-background.png b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-background.png
index 4f1bfbd284..4f1bfbd284 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal-background.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-button.png b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-button.png
index 6c764ec97e..6c764ec97e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal-button.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-button.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-dark.png b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-dark.png
index 952651dca0..952651dca0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal-dark.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-dark.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-foreground.png b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-foreground.png
index b0ecf23a9e..b0ecf23a9e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal-foreground.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-foreground.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-light.png b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-light.png
index e65447a4c5..e65447a4c5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal-light.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-light.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-theme.png b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-theme.png
index d128134636..d128134636 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal-theme.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-theme.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-thumbnail.png b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-thumbnail.png
index db7fe5b076..db7fe5b076 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal-thumbnail.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-thumbnail.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-violet.png b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-violet.png
index ec459457a8..ec459457a8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal-violet.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-universal-violet.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-windows-thumbnail.png b/src/quickcontrols2/doc/images/qtquickcontrols2-windows-thumbnail.png
index 15408d3bba..15408d3bba 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-windows-thumbnail.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-windows-thumbnail.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-windows.png b/src/quickcontrols2/doc/images/qtquickcontrols2-windows.png
index 324a03412d..324a03412d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-windows.png
+++ b/src/quickcontrols2/doc/images/qtquickcontrols2-windows.png
diff --git a/src/imports/controls/doc/manifest-meta.qdocconf b/src/quickcontrols2/doc/manifest-meta.qdocconf
index 30400da54f..30400da54f 100644
--- a/src/imports/controls/doc/manifest-meta.qdocconf
+++ b/src/quickcontrols2/doc/manifest-meta.qdocconf
diff --git a/src/imports/controls/doc/qtquickcontrols.qdocconf b/src/quickcontrols2/doc/qtquickcontrols.qdocconf
index b90be4e2ac..3078730cbb 100644
--- a/src/imports/controls/doc/qtquickcontrols.qdocconf
+++ b/src/quickcontrols2/doc/qtquickcontrols.qdocconf
@@ -38,20 +38,20 @@ depends = qtcore qtgui qtdoc qtqml qtqmlmodels qtquick qtsql qtwidgets qtlabspla
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Note: paths passed to \example command must contain the parent directory, e.g.
 # \example controls/tabs
-exampledirs += ../../../../examples/quickcontrols2 \
-               ../../../quicktemplates2 \
+exampledirs += ../../../examples/quickcontrols2 \
+               ../../quicktemplates2 \
                snippets
 
 examples.fileextensions += "*.conf"
 
 examplesinstallpath = quickcontrols2
 
-headerdirs += ../../../quicktemplates2 \
-              ../../../quickcontrols2
+headerdirs += ../../quicktemplates2 \
+              ..
 
-sourcedirs += ../../../quicktemplates2 \
-              ../../../quickcontrols2 \
-              ../../templates/doc/src \
+sourcedirs += ../../quicktemplates2 \
+              .. \
+              ../../quicktemplates2/doc/src \
               src
 
 # Exclude .qml files from the doc build to prevent conflicts with .qml files
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-action.qml
index 1b65a824b0..1b65a824b0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-action.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
index 8daffed7cf..8daffed7cf 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-custom.qml
index 095657b5a6..095657b5a6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-icononly.qml
index d74000052b..d74000052b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-icononly.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
index 3e2aa619d0..3e2aa619d0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-textonly.qml
index 59054f7714..59054f7714 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-textonly.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkbox-custom.qml
index 93ebe46dca..93ebe46dca 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkbox-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkbox-group.qml
index c503216586..c503216586 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkbox-group.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
index 91970f529f..91970f529f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-accepted.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-accepted.qml
index b420e3a572..b420e3a572 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-accepted.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-accepted.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-custom.qml
index fea7e6d5ec..fea7e6d5ec 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-valuerole.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-valuerole.qml
index a4c40c0f0b..a4c40c0f0b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-valuerole.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-valuerole.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
index 0b86f1d002..0b86f1d002 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dial-custom.qml
index 170e9ccf09..170e9ccf09 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dial-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog-modal.qml
index d60e4e309b..d60e4e309b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog-modal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog-modeless.qml
index 6acb74e59c..6acb74e59c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog-modeless.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog.qml
index 13fbb0e843..13fbb0e843 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
index 45a0b9e920..45a0b9e920 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
index bcfd405b12..bcfd405b12 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-frame-custom.qml
index 798f95da13..798f95da13 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-frame-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-frame.qml
index 71b9b310d4..71b9b310d4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-frame.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
index 91689d9fae..91689d9fae 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox-custom.qml
index e3355b2337..e3355b2337 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox.qml
index e9f1c7dcc0..e9f1c7dcc0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-headerview-simple.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-headerview-simple.qml
index 6878904f3c..6878904f3c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-headerview-simple.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-headerview-simple.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
index fd52b46f32..fd52b46f32 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-itemdelegate.qml
index 70d6104f52..70d6104f52 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-itemdelegate.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-label-custom.qml
index cc88d00f42..cc88d00f42 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-label-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-label.qml
index c492af50d4..c492af50d4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-label.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-accent.qml
index aa4c62b8e5..aa4c62b8e5 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-accent.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-background.qml
index f64e48d225..f64e48d225 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-elevation.qml
index f9e189f17a..f9e189f17a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-elevation.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-foreground.qml
index 070576f541..070576f541 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-foreground.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-theme.qml
index 586433c369..586433c369 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-theme.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-variant.qml
index 1283fb4332..1283fb4332 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-variant.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-menu-custom.qml
index 3e766e8a7a..3e766e8a7a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-menu-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-menubar-custom.qml
index 4b3d641e21..4b3d641e21 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-menubar-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-menubar.qml
index 7ae22ae8c2..7ae22ae8c2 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-menubar.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
index fa7fa14a44..fa7fa14a44 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-menuseparator.qml
index cd5d544155..cd5d544155 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-menuseparator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-overlay-modal.qml
index 9751f05781..9751f05781 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-overlay-modal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-overlay-modeless.qml
index a4951d1386..a4951d1386 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-overlay-modeless.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overview.cmake b/src/quickcontrols2/doc/snippets/qtquickcontrols2-overview.cmake
index 5bbbcff561..5bbbcff561 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-overview.cmake
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-overview.cmake
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
index ba0d2db958..ba0d2db958 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
index 8f2221ee4e..8f2221ee4e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator.qml
index b3912efe7a..b3912efe7a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-pane-custom.qml
index 855423c4c2..855423c4c2 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-pane-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-pane.qml
index a8c8672e77..a8c8672e77 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-pane.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-popup-custom.qml
index ad5481e34d..ad5481e34d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-popup-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-popup.qml
index 76ec20cdb2..76ec20cdb2 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-popup.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-progressbar-custom.qml
index d96161577b..d96161577b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-progressbar-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
index b33ce6b6d9..b33ce6b6d9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
index ed3dae678a..ed3dae678a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
index fcddc40067..fcddc40067 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-roundbutton.qml
index 201ee24403..201ee24403 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-roundbutton.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-active.qml
index bd417955e4..bd417955e4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-active.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
index 0aea2572d9..0aea2572d9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
index 7ca6661557..7ca6661557 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
index c608dac44a..c608dac44a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
index 719b9393f1..719b9393f1 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
index b18d391c4d..b18d391c4d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
index 0d6c4529dd..0d6c4529dd 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-custom.qml
index 1a80d263b7..1a80d263b7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
index 8386172035..8386172035 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-listview.qml
index f1fbb62724..f1fbb62724 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-listview.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-policy.qml
index 78098eaaa6..78098eaaa6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-policy.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview.qml
index c96ae1ed89..c96ae1ed89 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-slider-custom.qml
index c3d7f4b2d1..c3d7f4b2d1 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-slider-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-custom.qml
index 89f6244f70..89f6244f70 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-double.qml
index 852ee5be6f..852ee5be6f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-double.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-textual.qml
index c1879d9314..c1879d9314 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-textual.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox.qml
index 8772274969..8772274969 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-splitview-custom.qml
index 570c3acd33..570c3acd33 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-splitview-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-stackview-custom.qml
index 64cdb3ceb9..64cdb3ceb9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-stackview-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-stackview-visible.qml
index 0e1a0dd495..0e1a0dd495 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-stackview-visible.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
index c89b96a42f..c89b96a42f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
index dc0d58a2ca..dc0d58a2ca 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate.qml
index dcab908ebd..dcab908ebd 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipeview-custom.qml
index b8cddb315a..b8cddb315a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipeview-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
index 98b381f14e..98b381f14e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-switch-custom.qml
index 9adccbed2f..9adccbed2f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-switch-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
index bea35f29ea..bea35f29ea 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-custom.qml
index eba4825632..eba4825632 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
index 5f5482551f..5f5482551f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
index 8e41bbf0ca..8e41bbf0ca 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar.qml
index 7a02f37521..7a02f37521 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbutton.qml
index e7240db4dc..e7240db4dc 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbutton.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textarea-custom.qml
index e4f1b397d4..e4f1b397d4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textarea-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
index 52d9996e9b..52d9996e9b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-custom.qml
index 8f1aba233e..8f1aba233e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-disabled.qml
index 3d92b64760..3d92b64760 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-disabled.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-focused.qml
index f276198857..f276198857 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-focused.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-normal.qml
index c9208c0e8f..c9208c0e8f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-normal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbar-custom.qml
index 2cb9d0c5c7..2cb9d0c5c7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbar-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbar.qml
index 2ed5c23fb0..2ed5c23fb0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbar.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
index 8eb27430da..8eb27430da 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
index f630256dd9..f630256dd9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolseparator.qml
index 514b97fa68..514b97fa68 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolseparator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-custom.qml
index 7b40c974b6..7b40c974b6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-hover.qml
index 6d1ee4c41b..6d1ee4c41b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-hover.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
index cea495538b..cea495538b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-slider.qml
index 5f40822457..5f40822457 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-slider.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip.qml
index 2e5231dc40..2e5231dc40 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-custom.qml
index 792e0e14bc..792e0e14bc 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-custom.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-listView.qml
index 54ce78afd3..54ce78afd3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-listView.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
index 408b747920..408b747920 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
index d9edb2cb00..d9edb2cb00 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-accent.qml
index f429359e4f..f429359e4f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-accent.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-background.qml
index 558618e65e..558618e65e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-foreground.qml
index 39a292d88b..39a292d88b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-foreground.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml b/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-theme.qml
index b55bf188bf..b55bf188bf 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml
+++ b/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-theme.qml
diff --git a/src/imports/controls/doc/src/external-pages.qdoc b/src/quickcontrols2/doc/src/external-pages.qdoc
index 0500579818..0500579818 100644
--- a/src/imports/controls/doc/src/external-pages.qdoc
+++ b/src/quickcontrols2/doc/src/external-pages.qdoc
diff --git a/src/imports/controls/doc/src/includes/customize-button-background.qdocinc b/src/quickcontrols2/doc/src/includes/customize-button-background.qdocinc
index 0acad02d38..0acad02d38 100644
--- a/src/imports/controls/doc/src/includes/customize-button-background.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/customize-button-background.qdocinc
diff --git a/src/imports/controls/doc/src/includes/inputmethodhints.qdocinc b/src/quickcontrols2/doc/src/includes/inputmethodhints.qdocinc
index 73710e1e15..73710e1e15 100644
--- a/src/imports/controls/doc/src/includes/inputmethodhints.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/inputmethodhints.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickcontrol-background.qdocinc b/src/quickcontrols2/doc/src/includes/qquickcontrol-background.qdocinc
index 02d92de07c..02d92de07c 100644
--- a/src/imports/controls/doc/src/includes/qquickcontrol-background.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickcontrol-background.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickcontrol-focusreason.qdocinc b/src/quickcontrols2/doc/src/includes/qquickcontrol-focusreason.qdocinc
index b69e9e60ec..b69e9e60ec 100644
--- a/src/imports/controls/doc/src/includes/qquickcontrol-focusreason.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickcontrol-focusreason.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickdial.qdocinc b/src/quickcontrols2/doc/src/includes/qquickdial.qdocinc
index 3370b3d8f3..3370b3d8f3 100644
--- a/src/imports/controls/doc/src/includes/qquickdial.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickdial.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickicon.qdocinc b/src/quickcontrols2/doc/src/includes/qquickicon.qdocinc
index beef5624ff..beef5624ff 100644
--- a/src/imports/controls/doc/src/includes/qquickicon.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickicon.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc b/src/quickcontrols2/doc/src/includes/qquickimaginestyle.qdocinc
index f6fe5a970a..f6fe5a970a 100644
--- a/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickimaginestyle.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickmaterialstyle.qdocinc b/src/quickcontrols2/doc/src/includes/qquickmaterialstyle.qdocinc
index 72c97bb639..72c97bb639 100644
--- a/src/imports/controls/doc/src/includes/qquickmaterialstyle.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickmaterialstyle.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickoverlay-popup-parent.qdocinc b/src/quickcontrols2/doc/src/includes/qquickoverlay-popup-parent.qdocinc
index 5562f6a039..5562f6a039 100644
--- a/src/imports/controls/doc/src/includes/qquickoverlay-popup-parent.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickoverlay-popup-parent.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickpopup-padding.qdocinc b/src/quickcontrols2/doc/src/includes/qquickpopup-padding.qdocinc
index 31f5d2db02..31f5d2db02 100644
--- a/src/imports/controls/doc/src/includes/qquickpopup-padding.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickpopup-padding.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickstackview.qdocinc b/src/quickcontrols2/doc/src/includes/qquickstackview.qdocinc
index 20c9bdc369..20c9bdc369 100644
--- a/src/imports/controls/doc/src/includes/qquickstackview.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickstackview.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickswipedelegate-interaction.qdocinc b/src/quickcontrols2/doc/src/includes/qquickswipedelegate-interaction.qdocinc
index 05aeadb654..05aeadb654 100644
--- a/src/imports/controls/doc/src/includes/qquickswipedelegate-interaction.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickswipedelegate-interaction.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickswitch.qdocinc b/src/quickcontrols2/doc/src/includes/qquickswitch.qdocinc
index 985f85d979..985f85d979 100644
--- a/src/imports/controls/doc/src/includes/qquickswitch.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickswitch.qdocinc
diff --git a/src/imports/controls/doc/src/includes/qquickuniversalstyle.qdocinc b/src/quickcontrols2/doc/src/includes/qquickuniversalstyle.qdocinc
index a7ecbaef09..a7ecbaef09 100644
--- a/src/imports/controls/doc/src/includes/qquickuniversalstyle.qdocinc
+++ b/src/quickcontrols2/doc/src/includes/qquickuniversalstyle.qdocinc
diff --git a/src/imports/controls/doc/src/qt6-changes.qdoc b/src/quickcontrols2/doc/src/qt6-changes.qdoc
index efc1b84bf8..efc1b84bf8 100644
--- a/src/imports/controls/doc/src/qt6-changes.qdoc
+++ b/src/quickcontrols2/doc/src/qt6-changes.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-basic.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-basic.qdoc
index ee8d3ce4dd..ee8d3ce4dd 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-basic.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-basic.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-buttons.qdoc
index 6a4c592609..6a4c592609 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-buttons.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-configuration.qdoc
index 8ac2b2759a..8ac2b2759a 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-configuration.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-containers.qdoc
index 81e24c2698..81e24c2698 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-containers.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-cppclasses.qdoc
index 293ac6de4e..293ac6de4e 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-cppclasses.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-customize.qdoc
index ba62425f7b..ba62425f7b 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-customize.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-delegates.qdoc
index bea87abf05..bea87abf05 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-delegates.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-deployment.qdoc
index a84d0d8790..a84d0d8790 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-deployment.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-environment.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-environment.qdoc
index 4484acf392..4484acf392 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-environment.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-environment.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-examples.qdoc
index 2924114f3b..2924114f3b 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-examples.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-fileselectors.qdoc
index 4c782de100..4c782de100 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-fileselectors.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-focus.qdoc
index 77bc9883b9..77bc9883b9 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-focus.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-fusion.qdoc
index ca67985f8d..ca67985f8d 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-fusion.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-gettingstarted.qdoc
index 09209d2115..09209d2115 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-gettingstarted.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-guidelines.qdoc
index 83d6db93fe..83d6db93fe 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-guidelines.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-icons.qdoc
index ea8579dc6c..ea8579dc6c 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-icons.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-imagine.qdoc
index 15730ba379..aed0f89449 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-imagine.qdoc
@@ -2383,7 +2383,7 @@
     See Sketch's \l {https://sketchapp.com/docs/exporting/}{Exporting} documentation.
 
     Qt Quick Controls also provides a
-    \l {http://code.qt.io/cgit/qt/qtquickcontrols2.git/tree/src/imports/controls/imagine/design}
+    \l {http://code.qt.io/cgit/qt/qtquickcontrols2.git/tree/src/quickcontrols2/imagine/design}
     {plugin} for Sketch that automatically fixes the thickness of the 9-patch lines
     after the assets are exported. To install this file, double-click on it.
     Once Sketch has confirmed that the 9-patch export plugin has been installed,
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-index.qdoc
index 7b64e776dd..7b64e776dd 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-index.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-indicators.qdoc
index 9f9e357bc6..9f9e357bc6 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-indicators.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-input.qdoc
index 6bc037e007..6bc037e007 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-input.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-macos.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-macos.qdoc
index 382a23a6b8..382a23a6b8 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-macos.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-macos.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-material.qdoc
index f08c5ec3ba..f08c5ec3ba 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-material.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-menus.qdoc
index 43db20927c..43db20927c 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-menus.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-navigation.qdoc
index 95928d1342..95928d1342 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-navigation.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-popups.qdoc
index c26b4c4bf1..c26b4c4bf1 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-popups.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-qmltypes.qdoc
index 0251a6f9ae..0251a6f9ae 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-qmltypes.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-separators.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-separators.qdoc
index 481a744ed0..481a744ed0 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-separators.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-separators.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-styles.qdoc
index 12993fbf18..12993fbf18 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-styles.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-universal.qdoc
index 7226705068..7226705068 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-universal.qdoc
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-windows.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-windows.qdoc
index 8b63703b2b..8b63703b2b 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-windows.qdoc
+++ b/src/quickcontrols2/doc/src/qtquickcontrols2-windows.qdoc
diff --git a/src/imports/controls/fusion/ApplicationWindow.qml b/src/quickcontrols2/fusion/ApplicationWindow.qml
index 090d361c02..090d361c02 100644
--- a/src/imports/controls/fusion/ApplicationWindow.qml
+++ b/src/quickcontrols2/fusion/ApplicationWindow.qml
diff --git a/src/imports/controls/fusion/BusyIndicator.qml b/src/quickcontrols2/fusion/BusyIndicator.qml
index f46900eaf6..f46900eaf6 100644
--- a/src/imports/controls/fusion/BusyIndicator.qml
+++ b/src/quickcontrols2/fusion/BusyIndicator.qml
diff --git a/src/imports/controls/fusion/Button.qml b/src/quickcontrols2/fusion/Button.qml
index f635fe8b28..f635fe8b28 100644
--- a/src/imports/controls/fusion/Button.qml
+++ b/src/quickcontrols2/fusion/Button.qml
diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/quickcontrols2/fusion/CMakeLists.txt
index f2b755c567..dd6f6c34cf 100644
--- a/src/imports/controls/fusion/CMakeLists.txt
+++ b/src/quickcontrols2/fusion/CMakeLists.txt
@@ -1,69 +1,7 @@
-# Generated from fusion.pro.
-
 #####################################################################
 ## qtquickcontrols2fusionstyleplugin Plugin:
 #####################################################################
 
-qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin
-    URI "QtQuick.Controls.Fusion"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2FusionStylePlugin
-    IMPORTS
-        QtQuick.Controls.Basic/auto
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
-    SOURCES
-        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"
-)
-
-qt_internal_add_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle"
-    PREFIX
-        "/qt-project.org/imports/QtQuick/Controls/Fusion"
-    FILES
-        ${qtquickcontrols2fusionstyle_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:fusion.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.Fusion"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls/Fusion"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-fusion)"
-
 set(qml_files
     "ApplicationWindow.qml"
     "BusyIndicator.qml"
@@ -263,7 +201,54 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
 
-qt6_target_qml_files(qtquickcontrols2fusionstyleplugin
-    FILES
+qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin
+    URI "QtQuick.Controls.Fusion"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickControls2FusionStylePlugin
+    IMPORTS
+        QtQuick.Controls.Basic/auto
+    PLUGIN_TARGET qtquickcontrols2fusionstyleplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
+    SOURCES
+        qquickfusionstyle.cpp qquickfusionstyle_p.h
+        qquickfusiontheme.cpp qquickfusiontheme_p.h
+        qtquickcontrols2fusionstyleplugin.cpp
+    QML_FILES
         ${qml_files}
+    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
+)
+
+qt_internal_add_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle"
+    PREFIX
+        "/qt-project.org/imports/QtQuick/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"
 )
+
+add_subdirectory(impl)
diff --git a/src/imports/controls/fusion/CheckBox.qml b/src/quickcontrols2/fusion/CheckBox.qml
index ed49a1447e..ed49a1447e 100644
--- a/src/imports/controls/fusion/CheckBox.qml
+++ b/src/quickcontrols2/fusion/CheckBox.qml
diff --git a/src/imports/controls/fusion/CheckDelegate.qml b/src/quickcontrols2/fusion/CheckDelegate.qml
index 93c087e42c..93c087e42c 100644
--- a/src/imports/controls/fusion/CheckDelegate.qml
+++ b/src/quickcontrols2/fusion/CheckDelegate.qml
diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/quickcontrols2/fusion/ComboBox.qml
index dfe21f708f..dfe21f708f 100644
--- a/src/imports/controls/fusion/ComboBox.qml
+++ b/src/quickcontrols2/fusion/ComboBox.qml
diff --git a/src/imports/controls/fusion/DelayButton.qml b/src/quickcontrols2/fusion/DelayButton.qml
index 239ee6c861..239ee6c861 100644
--- a/src/imports/controls/fusion/DelayButton.qml
+++ b/src/quickcontrols2/fusion/DelayButton.qml
diff --git a/src/imports/controls/fusion/Dial.qml b/src/quickcontrols2/fusion/Dial.qml
index 71bab3a788..71bab3a788 100644
--- a/src/imports/controls/fusion/Dial.qml
+++ b/src/quickcontrols2/fusion/Dial.qml
diff --git a/src/imports/controls/fusion/Dialog.qml b/src/quickcontrols2/fusion/Dialog.qml
index af7fa4925b..af7fa4925b 100644
--- a/src/imports/controls/fusion/Dialog.qml
+++ b/src/quickcontrols2/fusion/Dialog.qml
diff --git a/src/imports/controls/fusion/DialogButtonBox.qml b/src/quickcontrols2/fusion/DialogButtonBox.qml
index 4b62228ff6..4b62228ff6 100644
--- a/src/imports/controls/fusion/DialogButtonBox.qml
+++ b/src/quickcontrols2/fusion/DialogButtonBox.qml
diff --git a/src/imports/controls/fusion/Drawer.qml b/src/quickcontrols2/fusion/Drawer.qml
index 85268b5027..85268b5027 100644
--- a/src/imports/controls/fusion/Drawer.qml
+++ b/src/quickcontrols2/fusion/Drawer.qml
diff --git a/src/imports/controls/fusion/Frame.qml b/src/quickcontrols2/fusion/Frame.qml
index 1e1916f123..1e1916f123 100644
--- a/src/imports/controls/fusion/Frame.qml
+++ b/src/quickcontrols2/fusion/Frame.qml
diff --git a/src/imports/controls/fusion/GroupBox.qml b/src/quickcontrols2/fusion/GroupBox.qml
index 943a242709..943a242709 100644
--- a/src/imports/controls/fusion/GroupBox.qml
+++ b/src/quickcontrols2/fusion/GroupBox.qml
diff --git a/src/imports/controls/fusion/HorizontalHeaderView.qml b/src/quickcontrols2/fusion/HorizontalHeaderView.qml
index 76f42b2985..76f42b2985 100644
--- a/src/imports/controls/fusion/HorizontalHeaderView.qml
+++ b/src/quickcontrols2/fusion/HorizontalHeaderView.qml
diff --git a/src/imports/controls/fusion/ItemDelegate.qml b/src/quickcontrols2/fusion/ItemDelegate.qml
index 12154d2f4b..12154d2f4b 100644
--- a/src/imports/controls/fusion/ItemDelegate.qml
+++ b/src/quickcontrols2/fusion/ItemDelegate.qml
diff --git a/src/imports/controls/fusion/Label.qml b/src/quickcontrols2/fusion/Label.qml
index 55db94f9c5..55db94f9c5 100644
--- a/src/imports/controls/fusion/Label.qml
+++ b/src/quickcontrols2/fusion/Label.qml
diff --git a/src/imports/controls/fusion/Menu.qml b/src/quickcontrols2/fusion/Menu.qml
index 7808850ce4..7808850ce4 100644
--- a/src/imports/controls/fusion/Menu.qml
+++ b/src/quickcontrols2/fusion/Menu.qml
diff --git a/src/imports/controls/fusion/MenuBar.qml b/src/quickcontrols2/fusion/MenuBar.qml
index 7b6a628ddd..7b6a628ddd 100644
--- a/src/imports/controls/fusion/MenuBar.qml
+++ b/src/quickcontrols2/fusion/MenuBar.qml
diff --git a/src/imports/controls/fusion/MenuBarItem.qml b/src/quickcontrols2/fusion/MenuBarItem.qml
index 336fca0cd6..336fca0cd6 100644
--- a/src/imports/controls/fusion/MenuBarItem.qml
+++ b/src/quickcontrols2/fusion/MenuBarItem.qml
diff --git a/src/imports/controls/fusion/MenuItem.qml b/src/quickcontrols2/fusion/MenuItem.qml
index 79468f9da8..79468f9da8 100644
--- a/src/imports/controls/fusion/MenuItem.qml
+++ b/src/quickcontrols2/fusion/MenuItem.qml
diff --git a/src/imports/controls/fusion/MenuSeparator.qml b/src/quickcontrols2/fusion/MenuSeparator.qml
index b8be640b64..b8be640b64 100644
--- a/src/imports/controls/fusion/MenuSeparator.qml
+++ b/src/quickcontrols2/fusion/MenuSeparator.qml
diff --git a/src/imports/controls/fusion/Page.qml b/src/quickcontrols2/fusion/Page.qml
index bf47e23155..bf47e23155 100644
--- a/src/imports/controls/fusion/Page.qml
+++ b/src/quickcontrols2/fusion/Page.qml
diff --git a/src/imports/controls/fusion/PageIndicator.qml b/src/quickcontrols2/fusion/PageIndicator.qml
index 22ceabccbd..22ceabccbd 100644
--- a/src/imports/controls/fusion/PageIndicator.qml
+++ b/src/quickcontrols2/fusion/PageIndicator.qml
diff --git a/src/imports/controls/fusion/Pane.qml b/src/quickcontrols2/fusion/Pane.qml
index 9cc4991788..9cc4991788 100644
--- a/src/imports/controls/fusion/Pane.qml
+++ b/src/quickcontrols2/fusion/Pane.qml
diff --git a/src/imports/controls/fusion/Popup.qml b/src/quickcontrols2/fusion/Popup.qml
index f77ea1d196..f77ea1d196 100644
--- a/src/imports/controls/fusion/Popup.qml
+++ b/src/quickcontrols2/fusion/Popup.qml
diff --git a/src/imports/controls/fusion/ProgressBar.qml b/src/quickcontrols2/fusion/ProgressBar.qml
index 0ad6b4834a..0ad6b4834a 100644
--- a/src/imports/controls/fusion/ProgressBar.qml
+++ b/src/quickcontrols2/fusion/ProgressBar.qml
diff --git a/src/imports/controls/fusion/RadioButton.qml b/src/quickcontrols2/fusion/RadioButton.qml
index c7796411b3..c7796411b3 100644
--- a/src/imports/controls/fusion/RadioButton.qml
+++ b/src/quickcontrols2/fusion/RadioButton.qml
diff --git a/src/imports/controls/fusion/RadioDelegate.qml b/src/quickcontrols2/fusion/RadioDelegate.qml
index 4c0d936c00..4c0d936c00 100644
--- a/src/imports/controls/fusion/RadioDelegate.qml
+++ b/src/quickcontrols2/fusion/RadioDelegate.qml
diff --git a/src/imports/controls/fusion/RangeSlider.qml b/src/quickcontrols2/fusion/RangeSlider.qml
index 418bac77d1..418bac77d1 100644
--- a/src/imports/controls/fusion/RangeSlider.qml
+++ b/src/quickcontrols2/fusion/RangeSlider.qml
diff --git a/src/imports/controls/fusion/RoundButton.qml b/src/quickcontrols2/fusion/RoundButton.qml
index 31217f712c..31217f712c 100644
--- a/src/imports/controls/fusion/RoundButton.qml
+++ b/src/quickcontrols2/fusion/RoundButton.qml
diff --git a/src/imports/controls/fusion/ScrollBar.qml b/src/quickcontrols2/fusion/ScrollBar.qml
index b990d955c1..b990d955c1 100644
--- a/src/imports/controls/fusion/ScrollBar.qml
+++ b/src/quickcontrols2/fusion/ScrollBar.qml
diff --git a/src/imports/controls/fusion/ScrollIndicator.qml b/src/quickcontrols2/fusion/ScrollIndicator.qml
index bf386f6c32..bf386f6c32 100644
--- a/src/imports/controls/fusion/ScrollIndicator.qml
+++ b/src/quickcontrols2/fusion/ScrollIndicator.qml
diff --git a/src/imports/controls/fusion/ScrollView.qml b/src/quickcontrols2/fusion/ScrollView.qml
index a6bba9de05..a6bba9de05 100644
--- a/src/imports/controls/fusion/ScrollView.qml
+++ b/src/quickcontrols2/fusion/ScrollView.qml
diff --git a/src/imports/controls/fusion/Slider.qml b/src/quickcontrols2/fusion/Slider.qml
index 4e20dcfc59..4e20dcfc59 100644
--- a/src/imports/controls/fusion/Slider.qml
+++ b/src/quickcontrols2/fusion/Slider.qml
diff --git a/src/imports/controls/fusion/SpinBox.qml b/src/quickcontrols2/fusion/SpinBox.qml
index e71aa42895..e71aa42895 100644
--- a/src/imports/controls/fusion/SpinBox.qml
+++ b/src/quickcontrols2/fusion/SpinBox.qml
diff --git a/src/imports/controls/fusion/SplitView.qml b/src/quickcontrols2/fusion/SplitView.qml
index fdf12bed8c..fdf12bed8c 100644
--- a/src/imports/controls/fusion/SplitView.qml
+++ b/src/quickcontrols2/fusion/SplitView.qml
diff --git a/src/imports/controls/fusion/SwipeDelegate.qml b/src/quickcontrols2/fusion/SwipeDelegate.qml
index ac840f64e8..ac840f64e8 100644
--- a/src/imports/controls/fusion/SwipeDelegate.qml
+++ b/src/quickcontrols2/fusion/SwipeDelegate.qml
diff --git a/src/imports/controls/fusion/Switch.qml b/src/quickcontrols2/fusion/Switch.qml
index 2e31535b3d..2e31535b3d 100644
--- a/src/imports/controls/fusion/Switch.qml
+++ b/src/quickcontrols2/fusion/Switch.qml
diff --git a/src/imports/controls/fusion/SwitchDelegate.qml b/src/quickcontrols2/fusion/SwitchDelegate.qml
index 0439b0cfa5..0439b0cfa5 100644
--- a/src/imports/controls/fusion/SwitchDelegate.qml
+++ b/src/quickcontrols2/fusion/SwitchDelegate.qml
diff --git a/src/imports/controls/fusion/TabBar.qml b/src/quickcontrols2/fusion/TabBar.qml
index e093365347..e093365347 100644
--- a/src/imports/controls/fusion/TabBar.qml
+++ b/src/quickcontrols2/fusion/TabBar.qml
diff --git a/src/imports/controls/fusion/TabButton.qml b/src/quickcontrols2/fusion/TabButton.qml
index 161a7b0257..161a7b0257 100644
--- a/src/imports/controls/fusion/TabButton.qml
+++ b/src/quickcontrols2/fusion/TabButton.qml
diff --git a/src/imports/controls/fusion/TextArea.qml b/src/quickcontrols2/fusion/TextArea.qml
index dc963186ea..dc963186ea 100644
--- a/src/imports/controls/fusion/TextArea.qml
+++ b/src/quickcontrols2/fusion/TextArea.qml
diff --git a/src/imports/controls/fusion/TextField.qml b/src/quickcontrols2/fusion/TextField.qml
index 1a7ec2b9a4..1a7ec2b9a4 100644
--- a/src/imports/controls/fusion/TextField.qml
+++ b/src/quickcontrols2/fusion/TextField.qml
diff --git a/src/imports/controls/fusion/ToolBar.qml b/src/quickcontrols2/fusion/ToolBar.qml
index 747a292dc8..747a292dc8 100644
--- a/src/imports/controls/fusion/ToolBar.qml
+++ b/src/quickcontrols2/fusion/ToolBar.qml
diff --git a/src/imports/controls/fusion/ToolButton.qml b/src/quickcontrols2/fusion/ToolButton.qml
index a364a1133e..a364a1133e 100644
--- a/src/imports/controls/fusion/ToolButton.qml
+++ b/src/quickcontrols2/fusion/ToolButton.qml
diff --git a/src/imports/controls/fusion/ToolSeparator.qml b/src/quickcontrols2/fusion/ToolSeparator.qml
index bfebf205b6..bfebf205b6 100644
--- a/src/imports/controls/fusion/ToolSeparator.qml
+++ b/src/quickcontrols2/fusion/ToolSeparator.qml
diff --git a/src/imports/controls/fusion/ToolTip.qml b/src/quickcontrols2/fusion/ToolTip.qml
index 90e0c268a1..90e0c268a1 100644
--- a/src/imports/controls/fusion/ToolTip.qml
+++ b/src/quickcontrols2/fusion/ToolTip.qml
diff --git a/src/imports/controls/fusion/Tumbler.qml b/src/quickcontrols2/fusion/Tumbler.qml
index 0c2841e7d1..0c2841e7d1 100644
--- a/src/imports/controls/fusion/Tumbler.qml
+++ b/src/quickcontrols2/fusion/Tumbler.qml
diff --git a/src/imports/controls/fusion/VerticalHeaderView.qml b/src/quickcontrols2/fusion/VerticalHeaderView.qml
index 3da5129004..3da5129004 100644
--- a/src/imports/controls/fusion/VerticalHeaderView.qml
+++ b/src/quickcontrols2/fusion/VerticalHeaderView.qml
diff --git a/src/imports/controls/fusion/fusion.pri b/src/quickcontrols2/fusion/fusion.pri
index b57ded65d3..b57ded65d3 100644
--- a/src/imports/controls/fusion/fusion.pri
+++ b/src/quickcontrols2/fusion/fusion.pri
diff --git a/src/imports/controls/fusion/images/arrow.png b/src/quickcontrols2/fusion/images/arrow.png
index 97ef0238e5..97ef0238e5 100644
--- a/src/imports/controls/fusion/images/arrow.png
+++ b/src/quickcontrols2/fusion/images/arrow.png
diff --git a/src/imports/controls/fusion/images/arrow.svg b/src/quickcontrols2/fusion/images/arrow.svg
index 4438392495..4438392495 100644
--- a/src/imports/controls/fusion/images/arrow.svg
+++ b/src/quickcontrols2/fusion/images/arrow.svg
diff --git a/src/imports/controls/fusion/images/arrow@2x.png b/src/quickcontrols2/fusion/images/arrow@2x.png
index 9bfc4e6eed..9bfc4e6eed 100644
--- a/src/imports/controls/fusion/images/arrow@2x.png
+++ b/src/quickcontrols2/fusion/images/arrow@2x.png
diff --git a/src/imports/controls/fusion/images/arrow@3x.png b/src/quickcontrols2/fusion/images/arrow@3x.png
index 6fd9c988dc..6fd9c988dc 100644
--- a/src/imports/controls/fusion/images/arrow@3x.png
+++ b/src/quickcontrols2/fusion/images/arrow@3x.png
diff --git a/src/imports/controls/fusion/images/arrow@4x.png b/src/quickcontrols2/fusion/images/arrow@4x.png
index f5e1e66a1d..f5e1e66a1d 100644
--- a/src/imports/controls/fusion/images/arrow@4x.png
+++ b/src/quickcontrols2/fusion/images/arrow@4x.png
diff --git a/src/imports/controls/fusion/images/checkmark.png b/src/quickcontrols2/fusion/images/checkmark.png
index deb30419d0..deb30419d0 100644
--- a/src/imports/controls/fusion/images/checkmark.png
+++ b/src/quickcontrols2/fusion/images/checkmark.png
diff --git a/src/imports/controls/fusion/images/checkmark.svg b/src/quickcontrols2/fusion/images/checkmark.svg
index f1afdc4f9f..f1afdc4f9f 100644
--- a/src/imports/controls/fusion/images/checkmark.svg
+++ b/src/quickcontrols2/fusion/images/checkmark.svg
diff --git a/src/imports/controls/fusion/images/checkmark@2x.png b/src/quickcontrols2/fusion/images/checkmark@2x.png
index f80de0a425..f80de0a425 100644
--- a/src/imports/controls/fusion/images/checkmark@2x.png
+++ b/src/quickcontrols2/fusion/images/checkmark@2x.png
diff --git a/src/imports/controls/fusion/images/checkmark@3x.png b/src/quickcontrols2/fusion/images/checkmark@3x.png
index c095eed18a..c095eed18a 100644
--- a/src/imports/controls/fusion/images/checkmark@3x.png
+++ b/src/quickcontrols2/fusion/images/checkmark@3x.png
diff --git a/src/imports/controls/fusion/images/checkmark@4x.png b/src/quickcontrols2/fusion/images/checkmark@4x.png
index e58c7b4df4..e58c7b4df4 100644
--- a/src/imports/controls/fusion/images/checkmark@4x.png
+++ b/src/quickcontrols2/fusion/images/checkmark@4x.png
diff --git a/src/imports/controls/fusion/images/progressmask.png b/src/quickcontrols2/fusion/images/progressmask.png
index a354377c4a..a354377c4a 100644
--- a/src/imports/controls/fusion/images/progressmask.png
+++ b/src/quickcontrols2/fusion/images/progressmask.png
diff --git a/src/imports/controls/fusion/images/progressmask.svg b/src/quickcontrols2/fusion/images/progressmask.svg
index a0dfc4269d..a0dfc4269d 100644
--- a/src/imports/controls/fusion/images/progressmask.svg
+++ b/src/quickcontrols2/fusion/images/progressmask.svg
diff --git a/src/imports/controls/fusion/images/progressmask@2x.png b/src/quickcontrols2/fusion/images/progressmask@2x.png
index 69476bf4a0..69476bf4a0 100644
--- a/src/imports/controls/fusion/images/progressmask@2x.png
+++ b/src/quickcontrols2/fusion/images/progressmask@2x.png
diff --git a/src/imports/controls/fusion/images/progressmask@3x.png b/src/quickcontrols2/fusion/images/progressmask@3x.png
index 00a1c09d87..00a1c09d87 100644
--- a/src/imports/controls/fusion/images/progressmask@3x.png
+++ b/src/quickcontrols2/fusion/images/progressmask@3x.png
diff --git a/src/imports/controls/fusion/images/progressmask@4x.png b/src/quickcontrols2/fusion/images/progressmask@4x.png
index 263110d5fe..263110d5fe 100644
--- a/src/imports/controls/fusion/images/progressmask@4x.png
+++ b/src/quickcontrols2/fusion/images/progressmask@4x.png
diff --git a/src/imports/controls/fusion/impl/ButtonPanel.qml b/src/quickcontrols2/fusion/impl/ButtonPanel.qml
index ffe870033c..ffe870033c 100644
--- a/src/imports/controls/fusion/impl/ButtonPanel.qml
+++ b/src/quickcontrols2/fusion/impl/ButtonPanel.qml
diff --git a/src/quickcontrols2/fusion/impl/CMakeLists.txt b/src/quickcontrols2/fusion/impl/CMakeLists.txt
new file mode 100644
index 0000000000..c107ae750d
--- /dev/null
+++ b/src/quickcontrols2/fusion/impl/CMakeLists.txt
@@ -0,0 +1,44 @@
+#####################################################################
+## qtquickcontrols2fusionstyleimplplugin Plugin:
+#####################################################################
+
+set(qml_files
+    "ButtonPanel.qml"
+    "CheckIndicator.qml"
+    "RadioIndicator.qml"
+    "SliderGroove.qml"
+    "SliderHandle.qml"
+    "SwitchIndicator.qml"
+)
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SOURCE_VERSION "2.3"
+)
+
+qt_internal_add_qml_module(qtquickcontrols2fusionstyleimplplugin
+    URI "QtQuick.Controls.Fusion.impl"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickControls2FusionStyleImplPlugin
+    PLUGIN_TARGET qtquickcontrols2fusionstyleimplplugin
+    NO_PLUGIN_OPTIONAL
+    SOURCES
+        qquickfusionbusyindicator.cpp qquickfusionbusyindicator_p.h
+        qquickfusiondial.cpp qquickfusiondial_p.h
+        qquickfusionknob.cpp qquickfusionknob_p.h
+    QML_FILES
+        ${qml_files}
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::QmlPrivate
+        Qt::QuickControls2ImplPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
diff --git a/src/imports/controls/fusion/impl/CheckIndicator.qml b/src/quickcontrols2/fusion/impl/CheckIndicator.qml
index 3a083653f5..3a083653f5 100644
--- a/src/imports/controls/fusion/impl/CheckIndicator.qml
+++ b/src/quickcontrols2/fusion/impl/CheckIndicator.qml
diff --git a/src/imports/controls/fusion/impl/RadioIndicator.qml b/src/quickcontrols2/fusion/impl/RadioIndicator.qml
index d459a2e84f..d459a2e84f 100644
--- a/src/imports/controls/fusion/impl/RadioIndicator.qml
+++ b/src/quickcontrols2/fusion/impl/RadioIndicator.qml
diff --git a/src/imports/controls/fusion/impl/SliderGroove.qml b/src/quickcontrols2/fusion/impl/SliderGroove.qml
index 76b7156a85..76b7156a85 100644
--- a/src/imports/controls/fusion/impl/SliderGroove.qml
+++ b/src/quickcontrols2/fusion/impl/SliderGroove.qml
diff --git a/src/imports/controls/fusion/impl/SliderHandle.qml b/src/quickcontrols2/fusion/impl/SliderHandle.qml
index 00a955b9aa..00a955b9aa 100644
--- a/src/imports/controls/fusion/impl/SliderHandle.qml
+++ b/src/quickcontrols2/fusion/impl/SliderHandle.qml
diff --git a/src/imports/controls/fusion/impl/SwitchIndicator.qml b/src/quickcontrols2/fusion/impl/SwitchIndicator.qml
index 5a56191391..5a56191391 100644
--- a/src/imports/controls/fusion/impl/SwitchIndicator.qml
+++ b/src/quickcontrols2/fusion/impl/SwitchIndicator.qml
diff --git a/src/imports/controls/fusion/impl/qquickfusionbusyindicator.cpp b/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator.cpp
index a9b75d27f3..a9b75d27f3 100644
--- a/src/imports/controls/fusion/impl/qquickfusionbusyindicator.cpp
+++ b/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator.cpp
diff --git a/src/imports/controls/fusion/impl/qquickfusionbusyindicator_p.h b/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator_p.h
index 5aeea6c488..5aeea6c488 100644
--- a/src/imports/controls/fusion/impl/qquickfusionbusyindicator_p.h
+++ b/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator_p.h
diff --git a/src/imports/controls/fusion/impl/qquickfusiondial.cpp b/src/quickcontrols2/fusion/impl/qquickfusiondial.cpp
index eb6f21add9..eb6f21add9 100644
--- a/src/imports/controls/fusion/impl/qquickfusiondial.cpp
+++ b/src/quickcontrols2/fusion/impl/qquickfusiondial.cpp
diff --git a/src/imports/controls/fusion/impl/qquickfusiondial_p.h b/src/quickcontrols2/fusion/impl/qquickfusiondial_p.h
index c320527a4e..c320527a4e 100644
--- a/src/imports/controls/fusion/impl/qquickfusiondial_p.h
+++ b/src/quickcontrols2/fusion/impl/qquickfusiondial_p.h
diff --git a/src/imports/controls/fusion/impl/qquickfusionknob.cpp b/src/quickcontrols2/fusion/impl/qquickfusionknob.cpp
index 27ac54d354..27ac54d354 100644
--- a/src/imports/controls/fusion/impl/qquickfusionknob.cpp
+++ b/src/quickcontrols2/fusion/impl/qquickfusionknob.cpp
diff --git a/src/imports/controls/fusion/impl/qquickfusionknob_p.h b/src/quickcontrols2/fusion/impl/qquickfusionknob_p.h
index b9b9c3776d..b9b9c3776d 100644
--- a/src/imports/controls/fusion/impl/qquickfusionknob_p.h
+++ b/src/quickcontrols2/fusion/impl/qquickfusionknob_p.h
diff --git a/src/imports/controls/fusion/qquickfusionstyle.cpp b/src/quickcontrols2/fusion/qquickfusionstyle.cpp
index f2e8f8236b..f2e8f8236b 100644
--- a/src/imports/controls/fusion/qquickfusionstyle.cpp
+++ b/src/quickcontrols2/fusion/qquickfusionstyle.cpp
diff --git a/src/imports/controls/fusion/qquickfusionstyle_p.h b/src/quickcontrols2/fusion/qquickfusionstyle_p.h
index c609e9c6a6..c609e9c6a6 100644
--- a/src/imports/controls/fusion/qquickfusionstyle_p.h
+++ b/src/quickcontrols2/fusion/qquickfusionstyle_p.h
diff --git a/src/imports/controls/fusion/qquickfusiontheme.cpp b/src/quickcontrols2/fusion/qquickfusiontheme.cpp
index 903758bb73..903758bb73 100644
--- a/src/imports/controls/fusion/qquickfusiontheme.cpp
+++ b/src/quickcontrols2/fusion/qquickfusiontheme.cpp
diff --git a/src/imports/controls/fusion/qquickfusiontheme_p.h b/src/quickcontrols2/fusion/qquickfusiontheme_p.h
index 814c191961..814c191961 100644
--- a/src/imports/controls/fusion/qquickfusiontheme_p.h
+++ b/src/quickcontrols2/fusion/qquickfusiontheme_p.h
diff --git a/src/imports/controls/fusion/qtquickcontrols2fusionstyle.qrc b/src/quickcontrols2/fusion/qtquickcontrols2fusionstyle.qrc
index 0a9e195a29..0a9e195a29 100644
--- a/src/imports/controls/fusion/qtquickcontrols2fusionstyle.qrc
+++ b/src/quickcontrols2/fusion/qtquickcontrols2fusionstyle.qrc
diff --git a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp b/src/quickcontrols2/fusion/qtquickcontrols2fusionstyleplugin.cpp
index f0d0e41aba..f0d0e41aba 100644
--- a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
+++ b/src/quickcontrols2/fusion/qtquickcontrols2fusionstyleplugin.cpp
diff --git a/src/imports/controls/imagine/ApplicationWindow.qml b/src/quickcontrols2/imagine/ApplicationWindow.qml
index b54527eb9e..b54527eb9e 100644
--- a/src/imports/controls/imagine/ApplicationWindow.qml
+++ b/src/quickcontrols2/imagine/ApplicationWindow.qml
diff --git a/src/imports/controls/imagine/BusyIndicator.qml b/src/quickcontrols2/imagine/BusyIndicator.qml
index 163a64b435..163a64b435 100644
--- a/src/imports/controls/imagine/BusyIndicator.qml
+++ b/src/quickcontrols2/imagine/BusyIndicator.qml
diff --git a/src/imports/controls/imagine/Button.qml b/src/quickcontrols2/imagine/Button.qml
index f2228ec70c..f2228ec70c 100644
--- a/src/imports/controls/imagine/Button.qml
+++ b/src/quickcontrols2/imagine/Button.qml
diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/quickcontrols2/imagine/CMakeLists.txt
index b37bce6acd..aba292e0f7 100644
--- a/src/imports/controls/imagine/CMakeLists.txt
+++ b/src/quickcontrols2/imagine/CMakeLists.txt
@@ -1,70 +1,7 @@
-# Generated from imagine.pro.
-
 #####################################################################
 ## qtquickcontrols2imaginestyleplugin Plugin:
 #####################################################################
 
-qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin
-    URI "QtQuick.Controls.Imagine"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2ImagineStylePlugin
-    IMPORTS
-        QtQuick.Controls.Basic/auto
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
-    SOURCES
-        qquickimaginestyle.cpp qquickimaginestyle_p.h
-        qquickimaginetheme.cpp qquickimaginetheme_p.h
-        qtquickcontrols2imaginestyleplugin.cpp
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2ImplPrivate
-        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}
-)
-
-qt_internal_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle"
-    PREFIX
-        "qt-project.org/imports/QtQuick/Controls/Imagine"
-    FILES
-        ${qmake_qtquickcontrols2imaginestyle_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:imagine.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.Imagine"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls/Imagine"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-imagine)"
-
 set(qml_files
     "ApplicationWindow.qml"
     "BusyIndicator.qml"
@@ -264,7 +201,60 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
 
-qt6_target_qml_files(qtquickcontrols2imaginestyleplugin
-    FILES
+qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin
+    URI "QtQuick.Controls.Imagine"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickControls2ImagineStylePlugin
+    IMPORTS
+        QtQuick.Controls.Basic/auto
+    PLUGIN_TARGET qtquickcontrols2imaginestyleplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
+    SOURCES
+        qquickimaginestyle.cpp qquickimaginestyle_p.h
+        qquickimaginetheme.cpp qquickimaginetheme_p.h
+        qtquickcontrols2imaginestyleplugin.cpp
+    QML_FILES
         ${qml_files}
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2ImplPrivate
+        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_qtquickcontrols2imaginestyleplugin_resource_files
+    ${resource_glob_0}
+    ${resource_glob_1}
+)
+
+qt_internal_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyleplugin"
+    PREFIX
+        "/qt-project.org/imports/QtQuick/Controls/Imagine"
+    FILES
+        ${qmake_qtquickcontrols2imaginestyleplugin_resource_files}
+)
+
+add_subdirectory(impl)
diff --git a/src/imports/controls/imagine/CheckBox.qml b/src/quickcontrols2/imagine/CheckBox.qml
index a92837b502..a92837b502 100644
--- a/src/imports/controls/imagine/CheckBox.qml
+++ b/src/quickcontrols2/imagine/CheckBox.qml
diff --git a/src/imports/controls/imagine/CheckDelegate.qml b/src/quickcontrols2/imagine/CheckDelegate.qml
index 08be70850f..08be70850f 100644
--- a/src/imports/controls/imagine/CheckDelegate.qml
+++ b/src/quickcontrols2/imagine/CheckDelegate.qml
diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/quickcontrols2/imagine/ComboBox.qml
index 58683a844b..58683a844b 100644
--- a/src/imports/controls/imagine/ComboBox.qml
+++ b/src/quickcontrols2/imagine/ComboBox.qml
diff --git a/src/imports/controls/imagine/DelayButton.qml b/src/quickcontrols2/imagine/DelayButton.qml
index e542eb695a..e542eb695a 100644
--- a/src/imports/controls/imagine/DelayButton.qml
+++ b/src/quickcontrols2/imagine/DelayButton.qml
diff --git a/src/imports/controls/imagine/Dial.qml b/src/quickcontrols2/imagine/Dial.qml
index 224bff56ad..224bff56ad 100644
--- a/src/imports/controls/imagine/Dial.qml
+++ b/src/quickcontrols2/imagine/Dial.qml
diff --git a/src/imports/controls/imagine/Dialog.qml b/src/quickcontrols2/imagine/Dialog.qml
index b788cc3ca9..b788cc3ca9 100644
--- a/src/imports/controls/imagine/Dialog.qml
+++ b/src/quickcontrols2/imagine/Dialog.qml
diff --git a/src/imports/controls/imagine/DialogButtonBox.qml b/src/quickcontrols2/imagine/DialogButtonBox.qml
index 1f3ccd0f71..1f3ccd0f71 100644
--- a/src/imports/controls/imagine/DialogButtonBox.qml
+++ b/src/quickcontrols2/imagine/DialogButtonBox.qml
diff --git a/src/imports/controls/imagine/Drawer.qml b/src/quickcontrols2/imagine/Drawer.qml
index 414516d307..414516d307 100644
--- a/src/imports/controls/imagine/Drawer.qml
+++ b/src/quickcontrols2/imagine/Drawer.qml
diff --git a/src/imports/controls/imagine/Frame.qml b/src/quickcontrols2/imagine/Frame.qml
index 7ba93dbceb..7ba93dbceb 100644
--- a/src/imports/controls/imagine/Frame.qml
+++ b/src/quickcontrols2/imagine/Frame.qml
diff --git a/src/imports/controls/imagine/GroupBox.qml b/src/quickcontrols2/imagine/GroupBox.qml
index b0a8645f72..b0a8645f72 100644
--- a/src/imports/controls/imagine/GroupBox.qml
+++ b/src/quickcontrols2/imagine/GroupBox.qml
diff --git a/src/imports/controls/imagine/HorizontalHeaderView.qml b/src/quickcontrols2/imagine/HorizontalHeaderView.qml
index e52145932f..e52145932f 100644
--- a/src/imports/controls/imagine/HorizontalHeaderView.qml
+++ b/src/quickcontrols2/imagine/HorizontalHeaderView.qml
diff --git a/src/imports/controls/imagine/ItemDelegate.qml b/src/quickcontrols2/imagine/ItemDelegate.qml
index 25c9a223cb..25c9a223cb 100644
--- a/src/imports/controls/imagine/ItemDelegate.qml
+++ b/src/quickcontrols2/imagine/ItemDelegate.qml
diff --git a/src/imports/controls/imagine/Label.qml b/src/quickcontrols2/imagine/Label.qml
index 3654cd7d8a..3654cd7d8a 100644
--- a/src/imports/controls/imagine/Label.qml
+++ b/src/quickcontrols2/imagine/Label.qml
diff --git a/src/imports/controls/imagine/Menu.qml b/src/quickcontrols2/imagine/Menu.qml
index 346c649021..346c649021 100644
--- a/src/imports/controls/imagine/Menu.qml
+++ b/src/quickcontrols2/imagine/Menu.qml
diff --git a/src/imports/controls/imagine/MenuItem.qml b/src/quickcontrols2/imagine/MenuItem.qml
index 963b3bbaed..963b3bbaed 100644
--- a/src/imports/controls/imagine/MenuItem.qml
+++ b/src/quickcontrols2/imagine/MenuItem.qml
diff --git a/src/imports/controls/imagine/MenuSeparator.qml b/src/quickcontrols2/imagine/MenuSeparator.qml
index 42d1812fa5..42d1812fa5 100644
--- a/src/imports/controls/imagine/MenuSeparator.qml
+++ b/src/quickcontrols2/imagine/MenuSeparator.qml
diff --git a/src/imports/controls/imagine/Page.qml b/src/quickcontrols2/imagine/Page.qml
index 1b77112f3d..1b77112f3d 100644
--- a/src/imports/controls/imagine/Page.qml
+++ b/src/quickcontrols2/imagine/Page.qml
diff --git a/src/imports/controls/imagine/PageIndicator.qml b/src/quickcontrols2/imagine/PageIndicator.qml
index ba9bb85c62..ba9bb85c62 100644
--- a/src/imports/controls/imagine/PageIndicator.qml
+++ b/src/quickcontrols2/imagine/PageIndicator.qml
diff --git a/src/imports/controls/imagine/Pane.qml b/src/quickcontrols2/imagine/Pane.qml
index 4fdfaa18ce..4fdfaa18ce 100644
--- a/src/imports/controls/imagine/Pane.qml
+++ b/src/quickcontrols2/imagine/Pane.qml
diff --git a/src/imports/controls/imagine/Popup.qml b/src/quickcontrols2/imagine/Popup.qml
index bc7e544be7..bc7e544be7 100644
--- a/src/imports/controls/imagine/Popup.qml
+++ b/src/quickcontrols2/imagine/Popup.qml
diff --git a/src/imports/controls/imagine/ProgressBar.qml b/src/quickcontrols2/imagine/ProgressBar.qml
index 0c2ed8d79b..0c2ed8d79b 100644
--- a/src/imports/controls/imagine/ProgressBar.qml
+++ b/src/quickcontrols2/imagine/ProgressBar.qml
diff --git a/src/imports/controls/imagine/RadioButton.qml b/src/quickcontrols2/imagine/RadioButton.qml
index e1a81321b2..e1a81321b2 100644
--- a/src/imports/controls/imagine/RadioButton.qml
+++ b/src/quickcontrols2/imagine/RadioButton.qml
diff --git a/src/imports/controls/imagine/RadioDelegate.qml b/src/quickcontrols2/imagine/RadioDelegate.qml
index 0344160c95..0344160c95 100644
--- a/src/imports/controls/imagine/RadioDelegate.qml
+++ b/src/quickcontrols2/imagine/RadioDelegate.qml
diff --git a/src/imports/controls/imagine/RangeSlider.qml b/src/quickcontrols2/imagine/RangeSlider.qml
index 37f59a3a13..37f59a3a13 100644
--- a/src/imports/controls/imagine/RangeSlider.qml
+++ b/src/quickcontrols2/imagine/RangeSlider.qml
diff --git a/src/imports/controls/imagine/RoundButton.qml b/src/quickcontrols2/imagine/RoundButton.qml
index 5c9580a317..5c9580a317 100644
--- a/src/imports/controls/imagine/RoundButton.qml
+++ b/src/quickcontrols2/imagine/RoundButton.qml
diff --git a/src/imports/controls/imagine/ScrollBar.qml b/src/quickcontrols2/imagine/ScrollBar.qml
index f512a0b71c..f512a0b71c 100644
--- a/src/imports/controls/imagine/ScrollBar.qml
+++ b/src/quickcontrols2/imagine/ScrollBar.qml
diff --git a/src/imports/controls/imagine/ScrollIndicator.qml b/src/quickcontrols2/imagine/ScrollIndicator.qml
index 316b749c50..316b749c50 100644
--- a/src/imports/controls/imagine/ScrollIndicator.qml
+++ b/src/quickcontrols2/imagine/ScrollIndicator.qml
diff --git a/src/imports/controls/imagine/ScrollView.qml b/src/quickcontrols2/imagine/ScrollView.qml
index 80427e9d27..80427e9d27 100644
--- a/src/imports/controls/imagine/ScrollView.qml
+++ b/src/quickcontrols2/imagine/ScrollView.qml
diff --git a/src/imports/controls/imagine/Slider.qml b/src/quickcontrols2/imagine/Slider.qml
index 597e222ad4..597e222ad4 100644
--- a/src/imports/controls/imagine/Slider.qml
+++ b/src/quickcontrols2/imagine/Slider.qml
diff --git a/src/imports/controls/imagine/SpinBox.qml b/src/quickcontrols2/imagine/SpinBox.qml
index 6d1bdababb..6d1bdababb 100644
--- a/src/imports/controls/imagine/SpinBox.qml
+++ b/src/quickcontrols2/imagine/SpinBox.qml
diff --git a/src/imports/controls/imagine/SplitView.qml b/src/quickcontrols2/imagine/SplitView.qml
index 36e1b2134a..36e1b2134a 100644
--- a/src/imports/controls/imagine/SplitView.qml
+++ b/src/quickcontrols2/imagine/SplitView.qml
diff --git a/src/imports/controls/imagine/StackView.qml b/src/quickcontrols2/imagine/StackView.qml
index a9ddac66d6..a9ddac66d6 100644
--- a/src/imports/controls/imagine/StackView.qml
+++ b/src/quickcontrols2/imagine/StackView.qml
diff --git a/src/imports/controls/imagine/SwipeDelegate.qml b/src/quickcontrols2/imagine/SwipeDelegate.qml
index 5e13fc6b88..5e13fc6b88 100644
--- a/src/imports/controls/imagine/SwipeDelegate.qml
+++ b/src/quickcontrols2/imagine/SwipeDelegate.qml
diff --git a/src/imports/controls/imagine/SwipeView.qml b/src/quickcontrols2/imagine/SwipeView.qml
index 12cafbb815..12cafbb815 100644
--- a/src/imports/controls/imagine/SwipeView.qml
+++ b/src/quickcontrols2/imagine/SwipeView.qml
diff --git a/src/imports/controls/imagine/Switch.qml b/src/quickcontrols2/imagine/Switch.qml
index a2f7a9a7f4..a2f7a9a7f4 100644
--- a/src/imports/controls/imagine/Switch.qml
+++ b/src/quickcontrols2/imagine/Switch.qml
diff --git a/src/imports/controls/imagine/SwitchDelegate.qml b/src/quickcontrols2/imagine/SwitchDelegate.qml
index 6fde82c1de..6fde82c1de 100644
--- a/src/imports/controls/imagine/SwitchDelegate.qml
+++ b/src/quickcontrols2/imagine/SwitchDelegate.qml
diff --git a/src/imports/controls/imagine/TabBar.qml b/src/quickcontrols2/imagine/TabBar.qml
index 26c30e926e..26c30e926e 100644
--- a/src/imports/controls/imagine/TabBar.qml
+++ b/src/quickcontrols2/imagine/TabBar.qml
diff --git a/src/imports/controls/imagine/TabButton.qml b/src/quickcontrols2/imagine/TabButton.qml
index 023da2cb1b..023da2cb1b 100644
--- a/src/imports/controls/imagine/TabButton.qml
+++ b/src/quickcontrols2/imagine/TabButton.qml
diff --git a/src/imports/controls/imagine/TextArea.qml b/src/quickcontrols2/imagine/TextArea.qml
index a4597593b2..a4597593b2 100644
--- a/src/imports/controls/imagine/TextArea.qml
+++ b/src/quickcontrols2/imagine/TextArea.qml
diff --git a/src/imports/controls/imagine/TextField.qml b/src/quickcontrols2/imagine/TextField.qml
index 15e73aa567..15e73aa567 100644
--- a/src/imports/controls/imagine/TextField.qml
+++ b/src/quickcontrols2/imagine/TextField.qml
diff --git a/src/imports/controls/imagine/ToolBar.qml b/src/quickcontrols2/imagine/ToolBar.qml
index 4a343e3c03..4a343e3c03 100644
--- a/src/imports/controls/imagine/ToolBar.qml
+++ b/src/quickcontrols2/imagine/ToolBar.qml
diff --git a/src/imports/controls/imagine/ToolButton.qml b/src/quickcontrols2/imagine/ToolButton.qml
index 1ef570e077..1ef570e077 100644
--- a/src/imports/controls/imagine/ToolButton.qml
+++ b/src/quickcontrols2/imagine/ToolButton.qml
diff --git a/src/imports/controls/imagine/ToolSeparator.qml b/src/quickcontrols2/imagine/ToolSeparator.qml
index 962c14c741..962c14c741 100644
--- a/src/imports/controls/imagine/ToolSeparator.qml
+++ b/src/quickcontrols2/imagine/ToolSeparator.qml
diff --git a/src/imports/controls/imagine/ToolTip.qml b/src/quickcontrols2/imagine/ToolTip.qml
index f52614000e..f52614000e 100644
--- a/src/imports/controls/imagine/ToolTip.qml
+++ b/src/quickcontrols2/imagine/ToolTip.qml
diff --git a/src/imports/controls/imagine/Tumbler.qml b/src/quickcontrols2/imagine/Tumbler.qml
index f380a00000..f380a00000 100644
--- a/src/imports/controls/imagine/Tumbler.qml
+++ b/src/quickcontrols2/imagine/Tumbler.qml
diff --git a/src/imports/controls/imagine/VerticalHeaderView.qml b/src/quickcontrols2/imagine/VerticalHeaderView.qml
index 7c057e01e2..7c057e01e2 100644
--- a/src/imports/controls/imagine/VerticalHeaderView.qml
+++ b/src/quickcontrols2/imagine/VerticalHeaderView.qml
diff --git a/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js b/src/quickcontrols2/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js
index a7f9a4598d..a7f9a4598d 100644
--- a/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js
+++ b/src/quickcontrols2/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js
diff --git a/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json b/src/quickcontrols2/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json
index 40807aa3d5..40807aa3d5 100644
--- a/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json
+++ b/src/quickcontrols2/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json
diff --git a/src/imports/controls/imagine/design/imagine.sketch b/src/quickcontrols2/imagine/design/imagine.sketch
index f3535b372b..f3535b372b 100644
--- a/src/imports/controls/imagine/design/imagine.sketch
+++ b/src/quickcontrols2/imagine/design/imagine.sketch
diff --git a/src/imports/controls/imagine/images/applicationwindow-background.png b/src/quickcontrols2/imagine/images/applicationwindow-background.png
index 2d8d70f288..2d8d70f288 100644
--- a/src/imports/controls/imagine/images/applicationwindow-background.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-background.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-background@2x.png b/src/quickcontrols2/imagine/images/applicationwindow-background@2x.png
index 18fbaa4c63..18fbaa4c63 100644
--- a/src/imports/controls/imagine/images/applicationwindow-background@2x.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-background@2x.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-background@3x.png b/src/quickcontrols2/imagine/images/applicationwindow-background@3x.png
index 241232b1e0..241232b1e0 100644
--- a/src/imports/controls/imagine/images/applicationwindow-background@3x.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-background@3x.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-background@4x.png b/src/quickcontrols2/imagine/images/applicationwindow-background@4x.png
index 8eb1b1ecc1..8eb1b1ecc1 100644
--- a/src/imports/controls/imagine/images/applicationwindow-background@4x.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-background@4x.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay-modal.png b/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal.png
index d4a43d1c70..d4a43d1c70 100644
--- a/src/imports/controls/imagine/images/applicationwindow-overlay-modal.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@2x.png b/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@2x.png
index c9a8f4124b..c9a8f4124b 100644
--- a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@2x.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@2x.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@3x.png b/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@3x.png
index 4a1084a919..4a1084a919 100644
--- a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@3x.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@3x.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@4x.png b/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@4x.png
index b92e600dae..b92e600dae 100644
--- a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@4x.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@4x.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay.png b/src/quickcontrols2/imagine/images/applicationwindow-overlay.png
index b7da23c00f..b7da23c00f 100644
--- a/src/imports/controls/imagine/images/applicationwindow-overlay.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-overlay.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay@2x.png b/src/quickcontrols2/imagine/images/applicationwindow-overlay@2x.png
index 23828d5a1c..23828d5a1c 100644
--- a/src/imports/controls/imagine/images/applicationwindow-overlay@2x.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-overlay@2x.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay@3x.png b/src/quickcontrols2/imagine/images/applicationwindow-overlay@3x.png
index d9d5382867..d9d5382867 100644
--- a/src/imports/controls/imagine/images/applicationwindow-overlay@3x.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-overlay@3x.png
diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay@4x.png b/src/quickcontrols2/imagine/images/applicationwindow-overlay@4x.png
index a76c1a3a71..a76c1a3a71 100644
--- a/src/imports/controls/imagine/images/applicationwindow-overlay@4x.png
+++ b/src/quickcontrols2/imagine/images/applicationwindow-overlay@4x.png
diff --git a/src/imports/controls/imagine/images/busyindicator-animation.webp b/src/quickcontrols2/imagine/images/busyindicator-animation.webp
index ebf04c4a0c..ebf04c4a0c 100644
--- a/src/imports/controls/imagine/images/busyindicator-animation.webp
+++ b/src/quickcontrols2/imagine/images/busyindicator-animation.webp
diff --git a/src/imports/controls/imagine/images/busyindicator-animation@2x.webp b/src/quickcontrols2/imagine/images/busyindicator-animation@2x.webp
index 43805a0bdc..43805a0bdc 100644
--- a/src/imports/controls/imagine/images/busyindicator-animation@2x.webp
+++ b/src/quickcontrols2/imagine/images/busyindicator-animation@2x.webp
diff --git a/src/imports/controls/imagine/images/busyindicator-animation@3x.webp b/src/quickcontrols2/imagine/images/busyindicator-animation@3x.webp
index b700b81f83..b700b81f83 100644
--- a/src/imports/controls/imagine/images/busyindicator-animation@3x.webp
+++ b/src/quickcontrols2/imagine/images/busyindicator-animation@3x.webp
diff --git a/src/imports/controls/imagine/images/busyindicator-animation@4x.webp b/src/quickcontrols2/imagine/images/busyindicator-animation@4x.webp
index bfaa8df921..bfaa8df921 100644
--- a/src/imports/controls/imagine/images/busyindicator-animation@4x.webp
+++ b/src/quickcontrols2/imagine/images/busyindicator-animation@4x.webp
diff --git a/src/imports/controls/imagine/images/button-background-checked-disabled.9.png b/src/quickcontrols2/imagine/images/button-background-checked-disabled.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/button-background-checked-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-disabled.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-disabled@2x.9.png b/src/quickcontrols2/imagine/images/button-background-checked-disabled@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/button-background-checked-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-disabled@3x.9.png b/src/quickcontrols2/imagine/images/button-background-checked-disabled@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/button-background-checked-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-disabled@4x.9.png b/src/quickcontrols2/imagine/images/button-background-checked-disabled@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/button-background-checked-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-focused.9.png b/src/quickcontrols2/imagine/images/button-background-checked-focused.9.png
index e3d14e9954..e3d14e9954 100644
--- a/src/imports/controls/imagine/images/button-background-checked-focused.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-focused.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-focused@2x.9.png b/src/quickcontrols2/imagine/images/button-background-checked-focused@2x.9.png
index ebc74b4a34..ebc74b4a34 100644
--- a/src/imports/controls/imagine/images/button-background-checked-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-focused@3x.9.png b/src/quickcontrols2/imagine/images/button-background-checked-focused@3x.9.png
index 7583472304..7583472304 100644
--- a/src/imports/controls/imagine/images/button-background-checked-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-focused@4x.9.png b/src/quickcontrols2/imagine/images/button-background-checked-focused@4x.9.png
index 9b570f4d15..9b570f4d15 100644
--- a/src/imports/controls/imagine/images/button-background-checked-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-hovered.9.png b/src/quickcontrols2/imagine/images/button-background-checked-hovered.9.png
index e3d14e9954..e3d14e9954 100644
--- a/src/imports/controls/imagine/images/button-background-checked-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-hovered.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-hovered@2x.9.png b/src/quickcontrols2/imagine/images/button-background-checked-hovered@2x.9.png
index ebc74b4a34..ebc74b4a34 100644
--- a/src/imports/controls/imagine/images/button-background-checked-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-hovered@3x.9.png b/src/quickcontrols2/imagine/images/button-background-checked-hovered@3x.9.png
index 7583472304..7583472304 100644
--- a/src/imports/controls/imagine/images/button-background-checked-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked-hovered@4x.9.png b/src/quickcontrols2/imagine/images/button-background-checked-hovered@4x.9.png
index 9b570f4d15..9b570f4d15 100644
--- a/src/imports/controls/imagine/images/button-background-checked-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked.9.png b/src/quickcontrols2/imagine/images/button-background-checked.9.png
index d0942509f7..d0942509f7 100644
--- a/src/imports/controls/imagine/images/button-background-checked.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked@2x.9.png b/src/quickcontrols2/imagine/images/button-background-checked@2x.9.png
index c38bcd026f..c38bcd026f 100644
--- a/src/imports/controls/imagine/images/button-background-checked@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked@3x.9.png b/src/quickcontrols2/imagine/images/button-background-checked@3x.9.png
index 80889bf801..80889bf801 100644
--- a/src/imports/controls/imagine/images/button-background-checked@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-checked@4x.9.png b/src/quickcontrols2/imagine/images/button-background-checked@4x.9.png
index 05de8377ef..05de8377ef 100644
--- a/src/imports/controls/imagine/images/button-background-checked@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-checked@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-disabled.9.png b/src/quickcontrols2/imagine/images/button-background-disabled.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/button-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/button-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/button-background-disabled@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/button-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/button-background-disabled@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/button-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/button-background-disabled@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/button-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-checked-pressed.9.png b/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/button-background-flat-checked-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-checked-pressed@2x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/button-background-flat-checked-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-checked-pressed@3x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/button-background-flat-checked-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-checked-pressed@4x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/button-background-flat-checked-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-checked.9.png b/src/quickcontrols2/imagine/images/button-background-flat-checked.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/button-background-flat-checked.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-checked.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-checked@2x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-checked@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/button-background-flat-checked@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-checked@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-checked@3x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-checked@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/button-background-flat-checked@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-checked@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-checked@4x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-checked@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/button-background-flat-checked@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-checked@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-disabled.9.png b/src/quickcontrols2/imagine/images/button-background-flat-disabled.9.png
index 59907409c4..59907409c4 100644
--- a/src/imports/controls/imagine/images/button-background-flat-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-disabled.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-disabled@2x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-disabled@2x.9.png
index d66acd9c48..d66acd9c48 100644
--- a/src/imports/controls/imagine/images/button-background-flat-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-disabled@3x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-disabled@3x.9.png
index 89b8c35357..89b8c35357 100644
--- a/src/imports/controls/imagine/images/button-background-flat-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-disabled@4x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-disabled@4x.9.png
index d3a675cfe7..d3a675cfe7 100644
--- a/src/imports/controls/imagine/images/button-background-flat-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@2x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@3x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@4x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@2x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@3x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@4x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted.9.png
index 59907409c4..59907409c4 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted@2x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted@2x.9.png
index d66acd9c48..d66acd9c48 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted@3x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted@3x.9.png
index 89b8c35357..89b8c35357 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted@4x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-highlighted@4x.9.png
index d3a675cfe7..d3a675cfe7 100644
--- a/src/imports/controls/imagine/images/button-background-flat-highlighted@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-highlighted@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-hovered.9.png b/src/quickcontrols2/imagine/images/button-background-flat-hovered.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/button-background-flat-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-hovered.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-hovered@2x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-hovered@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/button-background-flat-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-hovered@3x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-hovered@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/button-background-flat-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-hovered@4x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-hovered@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/button-background-flat-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-pressed.9.png b/src/quickcontrols2/imagine/images/button-background-flat-pressed.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/button-background-flat-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-pressed.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-pressed@2x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-pressed@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/button-background-flat-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-pressed@3x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-pressed@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/button-background-flat-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat-pressed@4x.9.png b/src/quickcontrols2/imagine/images/button-background-flat-pressed@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/button-background-flat-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat.9.png b/src/quickcontrols2/imagine/images/button-background-flat.9.png
index 59907409c4..59907409c4 100644
--- a/src/imports/controls/imagine/images/button-background-flat.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat@2x.9.png b/src/quickcontrols2/imagine/images/button-background-flat@2x.9.png
index d66acd9c48..d66acd9c48 100644
--- a/src/imports/controls/imagine/images/button-background-flat@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat@3x.9.png b/src/quickcontrols2/imagine/images/button-background-flat@3x.9.png
index 89b8c35357..89b8c35357 100644
--- a/src/imports/controls/imagine/images/button-background-flat@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-flat@4x.9.png b/src/quickcontrols2/imagine/images/button-background-flat@4x.9.png
index d3a675cfe7..d3a675cfe7 100644
--- a/src/imports/controls/imagine/images/button-background-flat@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-flat@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-focused.9.png b/src/quickcontrols2/imagine/images/button-background-focused.9.png
index 42e40e6082..42e40e6082 100644
--- a/src/imports/controls/imagine/images/button-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/button-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/button-background-focused@2x.9.png
index 90dc70bfe0..90dc70bfe0 100644
--- a/src/imports/controls/imagine/images/button-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/button-background-focused@3x.9.png
index 2ed2340cb0..2ed2340cb0 100644
--- a/src/imports/controls/imagine/images/button-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/button-background-focused@4x.9.png
index e1428e37eb..e1428e37eb 100644
--- a/src/imports/controls/imagine/images/button-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checked.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-checked.9.png
index 7a2a401106..7a2a401106 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-checked.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-checked.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checked@2x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-checked@2x.9.png
index 05b2f21423..05b2f21423 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-checked@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-checked@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checked@3x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-checked@3x.9.png
index 8c22e1f32a..8c22e1f32a 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-checked@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-checked@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checked@4x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-checked@4x.9.png
index c5617f0e0d..c5617f0e0d 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-checked@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-checked@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-disabled.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-disabled.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-disabled.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-disabled@2x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-disabled@3x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-disabled@4x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-focused.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-focused.9.png
index 3ea580e01f..3ea580e01f 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-focused.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-focused.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-focused@2x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-focused@2x.9.png
index effcce1f42..effcce1f42 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-focused@3x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-focused@3x.9.png
index 502ac68999..502ac68999 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-focused@4x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-focused@4x.9.png
index 3243231ef7..3243231ef7 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-hovered.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-hovered.9.png
index 3ea580e01f..3ea580e01f 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-hovered.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-hovered@2x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@2x.9.png
index effcce1f42..effcce1f42 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-hovered@3x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@3x.9.png
index 502ac68999..502ac68999 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-hovered@4x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@4x.9.png
index 3243231ef7..3243231ef7 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-pressed.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-pressed.9.png
index 7a2a401106..7a2a401106 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-pressed.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-pressed@2x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@2x.9.png
index 05b2f21423..05b2f21423 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-pressed@3x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@3x.9.png
index 8c22e1f32a..8c22e1f32a 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted-pressed@4x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@4x.9.png
index c5617f0e0d..c5617f0e0d 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted.9.png
index 7761595fcd..7761595fcd 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted@2x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted@2x.9.png
index 8bb42c45af..8bb42c45af 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted@3x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted@3x.9.png
index 8c23c021a5..8c23c021a5 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-highlighted@4x.9.png b/src/quickcontrols2/imagine/images/button-background-highlighted@4x.9.png
index 365cd0489d..365cd0489d 100644
--- a/src/imports/controls/imagine/images/button-background-highlighted@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-highlighted@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-hovered.9.png b/src/quickcontrols2/imagine/images/button-background-hovered.9.png
index 42e40e6082..42e40e6082 100644
--- a/src/imports/controls/imagine/images/button-background-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-hovered.9.png
diff --git a/src/imports/controls/imagine/images/button-background-hovered@2x.9.png b/src/quickcontrols2/imagine/images/button-background-hovered@2x.9.png
index 90dc70bfe0..90dc70bfe0 100644
--- a/src/imports/controls/imagine/images/button-background-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-hovered@3x.9.png b/src/quickcontrols2/imagine/images/button-background-hovered@3x.9.png
index 2ed2340cb0..2ed2340cb0 100644
--- a/src/imports/controls/imagine/images/button-background-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-hovered@4x.9.png b/src/quickcontrols2/imagine/images/button-background-hovered@4x.9.png
index e1428e37eb..e1428e37eb 100644
--- a/src/imports/controls/imagine/images/button-background-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-pressed.9.png b/src/quickcontrols2/imagine/images/button-background-pressed.9.png
index d0942509f7..d0942509f7 100644
--- a/src/imports/controls/imagine/images/button-background-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-pressed.9.png
diff --git a/src/imports/controls/imagine/images/button-background-pressed@2x.9.png b/src/quickcontrols2/imagine/images/button-background-pressed@2x.9.png
index c38bcd026f..c38bcd026f 100644
--- a/src/imports/controls/imagine/images/button-background-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-pressed@3x.9.png b/src/quickcontrols2/imagine/images/button-background-pressed@3x.9.png
index 80889bf801..80889bf801 100644
--- a/src/imports/controls/imagine/images/button-background-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background-pressed@4x.9.png b/src/quickcontrols2/imagine/images/button-background-pressed@4x.9.png
index 05de8377ef..05de8377ef 100644
--- a/src/imports/controls/imagine/images/button-background-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/button-background.9.png b/src/quickcontrols2/imagine/images/button-background.9.png
index 6f1daed831..6f1daed831 100644
--- a/src/imports/controls/imagine/images/button-background.9.png
+++ b/src/quickcontrols2/imagine/images/button-background.9.png
diff --git a/src/imports/controls/imagine/images/button-background@2x.9.png b/src/quickcontrols2/imagine/images/button-background@2x.9.png
index 4a2507f535..4a2507f535 100644
--- a/src/imports/controls/imagine/images/button-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/button-background@3x.9.png b/src/quickcontrols2/imagine/images/button-background@3x.9.png
index 4f13b4ef55..4f13b4ef55 100644
--- a/src/imports/controls/imagine/images/button-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/button-background@4x.9.png b/src/quickcontrols2/imagine/images/button-background@4x.9.png
index 0e1ab4524e..0e1ab4524e 100644
--- a/src/imports/controls/imagine/images/button-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/button-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused.png
index d55a520426..d55a520426 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@2x.png
index 7289f63949..7289f63949 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered.png
index d55a520426..d55a520426 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@2x.png
index 7289f63949..7289f63949 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed.png
index 9c03d096e4..9c03d096e4 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@2x.png
index 680ba3efca..680ba3efca 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@3x.png
index 974205de54..974205de54 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@4x.png
index 2c8b6aabf4..2c8b6aabf4 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked.png
index 598b163aaa..598b163aaa 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked@2x.png
index 06382264f9..06382264f9 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked@3x.png
index 12a32dcd20..12a32dcd20 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-checked@4x.png
index 4bc6701d65..4bc6701d65 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-checked@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-disabled.png b/src/quickcontrols2/imagine/images/checkbox-indicator-disabled.png
index 0a499f8f2d..0a499f8f2d 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-disabled.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-disabled.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-disabled@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@2x.png
index db652c5ac9..db652c5ac9 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-disabled@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@3x.png
index 482f045d32..482f045d32 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-disabled@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@4x.png
index a386e27251..a386e27251 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-focused.png b/src/quickcontrols2/imagine/images/checkbox-indicator-focused.png
index c5eb85276d..c5eb85276d 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-focused.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-focused.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-focused@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-focused@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-focused@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-focused@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-focused@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-focused@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-focused@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-focused@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-focused@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-hovered.png b/src/quickcontrols2/imagine/images/checkbox-indicator-hovered.png
index c5eb85276d..c5eb85276d 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-hovered.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-hovered.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-hovered@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-hovered@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-hovered@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused.png
index cd07b1ccb3..cd07b1ccb3 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@2x.png
index acae6afffe..acae6afffe 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@3x.png
index 1e8d2c4575..1e8d2c4575 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@4x.png
index 577017c4c9..577017c4c9 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered.png
index cd07b1ccb3..cd07b1ccb3 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png
index acae6afffe..acae6afffe 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png
index 1e8d2c4575..1e8d2c4575 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png
index 577017c4c9..577017c4c9 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed.png
index 928706ab27..928706ab27 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png
index 3645d78a21..3645d78a21 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png
index ade63bd04b..ade63bd04b 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png
index cd73617e3c..cd73617e3c 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked.png
index e404a4e3c8..e404a4e3c8 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@2x.png
index 2d0f51767a..2d0f51767a 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@3x.png
index 4b9777b7ea..4b9777b7ea 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@4x.png
index e0f67e9894..e0f67e9894 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-pressed.png b/src/quickcontrols2/imagine/images/checkbox-indicator-pressed.png
index a1baaf903e..a1baaf903e 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-pressed.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-pressed.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-pressed@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@2x.png
index 81a7c3647a..81a7c3647a 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-pressed@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@3x.png
index 9325de38cb..9325de38cb 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator-pressed@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@4x.png
index c93b8fb8a3..c93b8fb8a3 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator.png b/src/quickcontrols2/imagine/images/checkbox-indicator.png
index 2b3e2323d7..2b3e2323d7 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator@2x.png b/src/quickcontrols2/imagine/images/checkbox-indicator@2x.png
index ce8985dbb1..ce8985dbb1 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator@2x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator@2x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator@3x.png b/src/quickcontrols2/imagine/images/checkbox-indicator@3x.png
index 2968731dd7..2968731dd7 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator@3x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator@3x.png
diff --git a/src/imports/controls/imagine/images/checkbox-indicator@4x.png b/src/quickcontrols2/imagine/images/checkbox-indicator@4x.png
index ea8da28498..ea8da28498 100644
--- a/src/imports/controls/imagine/images/checkbox-indicator@4x.png
+++ b/src/quickcontrols2/imagine/images/checkbox-indicator@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-disabled.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-disabled.9.png
index 23570729d6..23570729d6 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-focused.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-focused.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-highlighted.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted.9.png
index e79d8e1d01..e79d8e1d01 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-highlighted.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-highlighted@2x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@2x.9.png
index ea68d35fc4..ea68d35fc4 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-highlighted@2x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@2x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-highlighted@3x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@3x.9.png
index 6d61041599..6d61041599 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-highlighted@3x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@3x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-highlighted@4x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@4x.9.png
index 590cca96a1..590cca96a1 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-highlighted@4x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@4x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-hovered.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-hovered.9.png
index b8749743d0..b8749743d0 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-hovered.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-hovered@2x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-hovered@3x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-hovered@4x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-pressed.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-pressed.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-pressed.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-pressed@2x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-pressed@3x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background-pressed@4x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background.9.png
index b8749743d0..b8749743d0 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background@2x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background@3x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-background@4x.9.png b/src/quickcontrols2/imagine/images/checkdelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/imports/controls/imagine/images/checkdelegate-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused.png
index d55a520426..d55a520426 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@2x.png
index 7289f63949..7289f63949 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered.png
index d55a520426..d55a520426 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@2x.png
index 7289f63949..7289f63949 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed.png
index 9c03d096e4..9c03d096e4 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@2x.png
index 680ba3efca..680ba3efca 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@3x.png
index 974205de54..974205de54 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@4x.png
index 2c8b6aabf4..2c8b6aabf4 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked.png
index 598b163aaa..598b163aaa 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@2x.png
index 06382264f9..06382264f9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@3x.png
index 12a32dcd20..12a32dcd20 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@4x.png
index 4bc6701d65..4bc6701d65 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled.png
index 0a499f8f2d..0a499f8f2d 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@2x.png
index db652c5ac9..db652c5ac9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@3x.png
index 482f045d32..482f045d32 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@4x.png
index a386e27251..a386e27251 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-focused.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused.png
index c5eb85276d..c5eb85276d 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-focused.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered.png
index c5eb85276d..c5eb85276d 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused.png
index cd07b1ccb3..cd07b1ccb3 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png
index acae6afffe..acae6afffe 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png
index 1e8d2c4575..1e8d2c4575 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png
index 577017c4c9..577017c4c9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered.png
index cd07b1ccb3..cd07b1ccb3 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png
index acae6afffe..acae6afffe 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png
index 1e8d2c4575..1e8d2c4575 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png
index 577017c4c9..577017c4c9 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed.png
index 928706ab27..928706ab27 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png
index 3645d78a21..3645d78a21 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png
index ade63bd04b..ade63bd04b 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png
index cd73617e3c..cd73617e3c 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked.png
index e404a4e3c8..e404a4e3c8 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@2x.png
index 2d0f51767a..2d0f51767a 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@3x.png
index 4b9777b7ea..4b9777b7ea 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@4x.png
index e0f67e9894..e0f67e9894 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed.png
index a1baaf903e..a1baaf903e 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@2x.png
index 81a7c3647a..81a7c3647a 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@3x.png
index 9325de38cb..9325de38cb 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@4x.png
index c93b8fb8a3..c93b8fb8a3 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator.png
index 2b3e2323d7..2b3e2323d7 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator@2x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator@2x.png
index ce8985dbb1..ce8985dbb1 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator@2x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator@2x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator@3x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator@3x.png
index 2968731dd7..2968731dd7 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator@3x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator@3x.png
diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator@4x.png b/src/quickcontrols2/imagine/images/checkdelegate-indicator@4x.png
index ea8da28498..ea8da28498 100644
--- a/src/imports/controls/imagine/images/checkdelegate-indicator@4x.png
+++ b/src/quickcontrols2/imagine/images/checkdelegate-indicator@4x.png
diff --git a/src/imports/controls/imagine/images/combobox-background-disabled.9.png b/src/quickcontrols2/imagine/images/combobox-background-disabled.9.png
index a91b4b5519..a91b4b5519 100644
--- a/src/imports/controls/imagine/images/combobox-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/combobox-background-disabled@2x.9.png
index 570b990c9b..570b990c9b 100644
--- a/src/imports/controls/imagine/images/combobox-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/combobox-background-disabled@3x.9.png
index b0f9b9c4ce..b0f9b9c4ce 100644
--- a/src/imports/controls/imagine/images/combobox-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/combobox-background-disabled@4x.9.png
index 6e810f7592..6e810f7592 100644
--- a/src/imports/controls/imagine/images/combobox-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable-disabled.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable-disabled.9.png
index e192afb8a1..e192afb8a1 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable-disabled.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable-disabled@2x.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@2x.9.png
index 58a0f6e9a3..58a0f6e9a3 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable-disabled@3x.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@3x.9.png
index cd6f226b33..cd6f226b33 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable-disabled@4x.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@4x.9.png
index ff9103b091..ff9103b091 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable-focused.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable-focused.9.png
index a0f079bc47..a0f079bc47 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable-focused.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable-focused.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable-focused@2x.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable-focused@2x.9.png
index 83cb503f89..83cb503f89 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable-focused@3x.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable-focused@3x.9.png
index 4cf96edf90..4cf96edf90 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable-focused@4x.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable-focused@4x.9.png
index 5823de804f..5823de804f 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable.9.png
index 8edac13208..8edac13208 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable@2x.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable@2x.9.png
index 15e465f12a..15e465f12a 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable@2x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable@2x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable@3x.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable@3x.9.png
index 910b48d2c6..910b48d2c6 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable@3x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable@3x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-editable@4x.9.png b/src/quickcontrols2/imagine/images/combobox-background-editable@4x.9.png
index ff0f64118e..ff0f64118e 100644
--- a/src/imports/controls/imagine/images/combobox-background-editable@4x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-editable@4x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-focused.9.png b/src/quickcontrols2/imagine/images/combobox-background-focused.9.png
index a3865fa698..a3865fa698 100644
--- a/src/imports/controls/imagine/images/combobox-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/combobox-background-focused@2x.9.png
index fc49f4b824..fc49f4b824 100644
--- a/src/imports/controls/imagine/images/combobox-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/combobox-background-focused@3x.9.png
index b432b4ec54..b432b4ec54 100644
--- a/src/imports/controls/imagine/images/combobox-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/combobox-background-focused@4x.9.png
index 1586205998..1586205998 100644
--- a/src/imports/controls/imagine/images/combobox-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-hovered.9.png b/src/quickcontrols2/imagine/images/combobox-background-hovered.9.png
index a3865fa698..a3865fa698 100644
--- a/src/imports/controls/imagine/images/combobox-background-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-hovered.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-hovered@2x.9.png b/src/quickcontrols2/imagine/images/combobox-background-hovered@2x.9.png
index fc49f4b824..fc49f4b824 100644
--- a/src/imports/controls/imagine/images/combobox-background-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-hovered@3x.9.png b/src/quickcontrols2/imagine/images/combobox-background-hovered@3x.9.png
index b432b4ec54..b432b4ec54 100644
--- a/src/imports/controls/imagine/images/combobox-background-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-hovered@4x.9.png b/src/quickcontrols2/imagine/images/combobox-background-hovered@4x.9.png
index 1586205998..1586205998 100644
--- a/src/imports/controls/imagine/images/combobox-background-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-open.9.png b/src/quickcontrols2/imagine/images/combobox-background-open.9.png
index 1be8440336..1be8440336 100644
--- a/src/imports/controls/imagine/images/combobox-background-open.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-open.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-open@2x.9.png b/src/quickcontrols2/imagine/images/combobox-background-open@2x.9.png
index 95f7cd6d8a..95f7cd6d8a 100644
--- a/src/imports/controls/imagine/images/combobox-background-open@2x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-open@2x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-open@3x.9.png b/src/quickcontrols2/imagine/images/combobox-background-open@3x.9.png
index 2f71271ce8..2f71271ce8 100644
--- a/src/imports/controls/imagine/images/combobox-background-open@3x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-open@3x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-open@4x.9.png b/src/quickcontrols2/imagine/images/combobox-background-open@4x.9.png
index 17f6f2ce11..17f6f2ce11 100644
--- a/src/imports/controls/imagine/images/combobox-background-open@4x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-open@4x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-pressed.9.png b/src/quickcontrols2/imagine/images/combobox-background-pressed.9.png
index 1be8440336..1be8440336 100644
--- a/src/imports/controls/imagine/images/combobox-background-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-pressed.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-pressed@2x.9.png b/src/quickcontrols2/imagine/images/combobox-background-pressed@2x.9.png
index 95f7cd6d8a..95f7cd6d8a 100644
--- a/src/imports/controls/imagine/images/combobox-background-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-pressed@3x.9.png b/src/quickcontrols2/imagine/images/combobox-background-pressed@3x.9.png
index 2f71271ce8..2f71271ce8 100644
--- a/src/imports/controls/imagine/images/combobox-background-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background-pressed@4x.9.png b/src/quickcontrols2/imagine/images/combobox-background-pressed@4x.9.png
index 17f6f2ce11..17f6f2ce11 100644
--- a/src/imports/controls/imagine/images/combobox-background-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background.9.png b/src/quickcontrols2/imagine/images/combobox-background.9.png
index 4ed8ddc36f..4ed8ddc36f 100644
--- a/src/imports/controls/imagine/images/combobox-background.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background@2x.9.png b/src/quickcontrols2/imagine/images/combobox-background@2x.9.png
index 1d7a88943a..1d7a88943a 100644
--- a/src/imports/controls/imagine/images/combobox-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background@3x.9.png b/src/quickcontrols2/imagine/images/combobox-background@3x.9.png
index 313630f85c..313630f85c 100644
--- a/src/imports/controls/imagine/images/combobox-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-background@4x.9.png b/src/quickcontrols2/imagine/images/combobox-background@4x.9.png
index be63d56ea0..be63d56ea0 100644
--- a/src/imports/controls/imagine/images/combobox-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-disabled.png b/src/quickcontrols2/imagine/images/combobox-indicator-disabled.png
index 761537f9c4..761537f9c4 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-disabled.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-disabled.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-disabled@2x.png b/src/quickcontrols2/imagine/images/combobox-indicator-disabled@2x.png
index 322b7b6837..322b7b6837 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-disabled@3x.png b/src/quickcontrols2/imagine/images/combobox-indicator-disabled@3x.png
index 73feec349d..73feec349d 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-disabled@4x.png b/src/quickcontrols2/imagine/images/combobox-indicator-disabled@4x.png
index 910c4d3d21..910c4d3d21 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled.png
index 4399b6aab5..4399b6aab5 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@2x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@2x.png
index e45a2ad125..e45a2ad125 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@3x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@3x.png
index 23f74b10ea..23f74b10ea 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@4x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@4x.png
index db495899a8..db495899a8 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled.png
index 2e954ae99e..2e954ae99e 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png
index 252a5e37d5..252a5e37d5 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png
index 6d939a93f6..6d939a93f6 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png
index 00a21ebdfb..00a21ebdfb 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored.png
index ad52991212..ad52991212 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@2x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@2x.png
index 70b995c135..70b995c135 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@2x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@2x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@3x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@3x.png
index 9b86537727..9b86537727 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@3x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@3x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@4x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@4x.png
index b4f7ae25d3..b4f7ae25d3 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@4x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@4x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable.png
index e053109f10..e053109f10 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable@2x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable@2x.png
index b8dfd6fe0e..b8dfd6fe0e 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable@2x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable@2x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable@3x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable@3x.png
index 2cdee7a8f8..2cdee7a8f8 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable@3x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable@3x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable@4x.png b/src/quickcontrols2/imagine/images/combobox-indicator-editable@4x.png
index 2569b4aef0..2569b4aef0 100644
--- a/src/imports/controls/imagine/images/combobox-indicator-editable@4x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator-editable@4x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator.png b/src/quickcontrols2/imagine/images/combobox-indicator.png
index cc32f2a272..cc32f2a272 100644
--- a/src/imports/controls/imagine/images/combobox-indicator.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator@2x.png b/src/quickcontrols2/imagine/images/combobox-indicator@2x.png
index 57ea3f3082..57ea3f3082 100644
--- a/src/imports/controls/imagine/images/combobox-indicator@2x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator@2x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator@3x.png b/src/quickcontrols2/imagine/images/combobox-indicator@3x.png
index 384f8152db..384f8152db 100644
--- a/src/imports/controls/imagine/images/combobox-indicator@3x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator@3x.png
diff --git a/src/imports/controls/imagine/images/combobox-indicator@4x.png b/src/quickcontrols2/imagine/images/combobox-indicator@4x.png
index f326c03b4b..f326c03b4b 100644
--- a/src/imports/controls/imagine/images/combobox-indicator@4x.png
+++ b/src/quickcontrols2/imagine/images/combobox-indicator@4x.png
diff --git a/src/imports/controls/imagine/images/combobox-popup.9.png b/src/quickcontrols2/imagine/images/combobox-popup.9.png
index 7344cdf6db..7344cdf6db 100644
--- a/src/imports/controls/imagine/images/combobox-popup.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-popup.9.png
diff --git a/src/imports/controls/imagine/images/combobox-popup@2x.9.png b/src/quickcontrols2/imagine/images/combobox-popup@2x.9.png
index 00c88c7d59..00c88c7d59 100644
--- a/src/imports/controls/imagine/images/combobox-popup@2x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-popup@2x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-popup@3x.9.png b/src/quickcontrols2/imagine/images/combobox-popup@3x.9.png
index 82d911ed66..82d911ed66 100644
--- a/src/imports/controls/imagine/images/combobox-popup@3x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-popup@3x.9.png
diff --git a/src/imports/controls/imagine/images/combobox-popup@4x.9.png b/src/quickcontrols2/imagine/images/combobox-popup@4x.9.png
index 98db30af66..98db30af66 100644
--- a/src/imports/controls/imagine/images/combobox-popup@4x.9.png
+++ b/src/quickcontrols2/imagine/images/combobox-popup@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-focused.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused.9.png
index e3d14e9954..e3d14e9954 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked-focused.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@2x.9.png
index ebc74b4a34..ebc74b4a34 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@3x.9.png
index 7583472304..7583472304 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@4x.9.png
index 9b570f4d15..9b570f4d15 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered.9.png
index e3d14e9954..e3d14e9954 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@2x.9.png
index ebc74b4a34..ebc74b4a34 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@3x.9.png
index 7583472304..7583472304 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@4x.9.png
index 9b570f4d15..9b570f4d15 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked.9.png
index d0942509f7..d0942509f7 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked@2x.9.png
index c38bcd026f..c38bcd026f 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked@3x.9.png
index 80889bf801..80889bf801 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-checked@4x.9.png
index 05de8377ef..05de8377ef 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-checked@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-checked@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-disabled.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-disabled@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-disabled@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-disabled@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-focused.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-focused.9.png
index 294ff8bda6..294ff8bda6 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-focused@2x.9.png
index 48e2bbcb56..48e2bbcb56 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-focused@3x.9.png
index 0981eb2ac5..0981eb2ac5 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-focused@4x.9.png
index 4ae48bfa36..4ae48bfa36 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-hovered.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-hovered.9.png
index 42e40e6082..42e40e6082 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-hovered.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-hovered@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-hovered@2x.9.png
index 90dc70bfe0..90dc70bfe0 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-hovered@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-hovered@3x.9.png
index 2ed2340cb0..2ed2340cb0 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-hovered@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-hovered@4x.9.png
index e1428e37eb..e1428e37eb 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-pressed.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-pressed.9.png
index d0942509f7..d0942509f7 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-pressed.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-pressed@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-pressed@2x.9.png
index c38bcd026f..c38bcd026f 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-pressed@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-pressed@3x.9.png
index 80889bf801..80889bf801 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background-pressed@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background-pressed@4x.9.png
index 05de8377ef..05de8377ef 100644
--- a/src/imports/controls/imagine/images/delaybutton-background-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background.9.png b/src/quickcontrols2/imagine/images/delaybutton-background.9.png
index 6f1daed831..6f1daed831 100644
--- a/src/imports/controls/imagine/images/delaybutton-background.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background@2x.9.png
index 4a2507f535..4a2507f535 100644
--- a/src/imports/controls/imagine/images/delaybutton-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background@3x.9.png
index 4f13b4ef55..4f13b4ef55 100644
--- a/src/imports/controls/imagine/images/delaybutton-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-background@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-background@4x.9.png
index 0e1ab4524e..0e1ab4524e 100644
--- a/src/imports/controls/imagine/images/delaybutton-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-mask.9.png b/src/quickcontrols2/imagine/images/delaybutton-mask.9.png
index 76d3967d04..76d3967d04 100644
--- a/src/imports/controls/imagine/images/delaybutton-mask.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-mask.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-mask@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-mask@2x.9.png
index b8db224cc2..b8db224cc2 100644
--- a/src/imports/controls/imagine/images/delaybutton-mask@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-mask@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-mask@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-mask@3x.9.png
index 3bff2c15ae..3bff2c15ae 100644
--- a/src/imports/controls/imagine/images/delaybutton-mask@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-mask@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-mask@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-mask@4x.9.png
index 045c7fac88..045c7fac88 100644
--- a/src/imports/controls/imagine/images/delaybutton-mask@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-mask@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-progress-disabled.9.png b/src/quickcontrols2/imagine/images/delaybutton-progress-disabled.9.png
index 5c209c9c6b..5c209c9c6b 100644
--- a/src/imports/controls/imagine/images/delaybutton-progress-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-progress-disabled.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-progress-disabled@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@2x.9.png
index 0ef11a8d3c..0ef11a8d3c 100644
--- a/src/imports/controls/imagine/images/delaybutton-progress-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-progress-disabled@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@3x.9.png
index f3f8e54796..f3f8e54796 100644
--- a/src/imports/controls/imagine/images/delaybutton-progress-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-progress-disabled@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@4x.9.png
index b24f50e669..b24f50e669 100644
--- a/src/imports/controls/imagine/images/delaybutton-progress-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-progress.9.png b/src/quickcontrols2/imagine/images/delaybutton-progress.9.png
index 4dd3aec5fe..4dd3aec5fe 100644
--- a/src/imports/controls/imagine/images/delaybutton-progress.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-progress.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-progress@2x.9.png b/src/quickcontrols2/imagine/images/delaybutton-progress@2x.9.png
index cd422076e3..cd422076e3 100644
--- a/src/imports/controls/imagine/images/delaybutton-progress@2x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-progress@2x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-progress@3x.9.png b/src/quickcontrols2/imagine/images/delaybutton-progress@3x.9.png
index 08610300be..08610300be 100644
--- a/src/imports/controls/imagine/images/delaybutton-progress@3x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-progress@3x.9.png
diff --git a/src/imports/controls/imagine/images/delaybutton-progress@4x.9.png b/src/quickcontrols2/imagine/images/delaybutton-progress@4x.9.png
index 24cc19ba0a..24cc19ba0a 100644
--- a/src/imports/controls/imagine/images/delaybutton-progress@4x.9.png
+++ b/src/quickcontrols2/imagine/images/delaybutton-progress@4x.9.png
diff --git a/src/imports/controls/imagine/images/dial-background-disabled.png b/src/quickcontrols2/imagine/images/dial-background-disabled.png
index d7c4f847ce..d7c4f847ce 100644
--- a/src/imports/controls/imagine/images/dial-background-disabled.png
+++ b/src/quickcontrols2/imagine/images/dial-background-disabled.png
diff --git a/src/imports/controls/imagine/images/dial-background-disabled@2x.png b/src/quickcontrols2/imagine/images/dial-background-disabled@2x.png
index 56b085df96..56b085df96 100644
--- a/src/imports/controls/imagine/images/dial-background-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/dial-background-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/dial-background-disabled@3x.png b/src/quickcontrols2/imagine/images/dial-background-disabled@3x.png
index 4f1e17e7a9..4f1e17e7a9 100644
--- a/src/imports/controls/imagine/images/dial-background-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/dial-background-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/dial-background-disabled@4x.png b/src/quickcontrols2/imagine/images/dial-background-disabled@4x.png
index 4aacbf8222..4aacbf8222 100644
--- a/src/imports/controls/imagine/images/dial-background-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/dial-background-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/dial-background-focused.png b/src/quickcontrols2/imagine/images/dial-background-focused.png
index fc53d5c407..fc53d5c407 100644
--- a/src/imports/controls/imagine/images/dial-background-focused.png
+++ b/src/quickcontrols2/imagine/images/dial-background-focused.png
diff --git a/src/imports/controls/imagine/images/dial-background-focused@2x.png b/src/quickcontrols2/imagine/images/dial-background-focused@2x.png
index 6b547a172d..6b547a172d 100644
--- a/src/imports/controls/imagine/images/dial-background-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/dial-background-focused@2x.png
diff --git a/src/imports/controls/imagine/images/dial-background-focused@3x.png b/src/quickcontrols2/imagine/images/dial-background-focused@3x.png
index 7b8a2582ad..7b8a2582ad 100644
--- a/src/imports/controls/imagine/images/dial-background-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/dial-background-focused@3x.png
diff --git a/src/imports/controls/imagine/images/dial-background-focused@4x.png b/src/quickcontrols2/imagine/images/dial-background-focused@4x.png
index 406f46b591..406f46b591 100644
--- a/src/imports/controls/imagine/images/dial-background-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/dial-background-focused@4x.png
diff --git a/src/imports/controls/imagine/images/dial-background.png b/src/quickcontrols2/imagine/images/dial-background.png
index 58aa09edb2..58aa09edb2 100644
--- a/src/imports/controls/imagine/images/dial-background.png
+++ b/src/quickcontrols2/imagine/images/dial-background.png
diff --git a/src/imports/controls/imagine/images/dial-background@2x.png b/src/quickcontrols2/imagine/images/dial-background@2x.png
index 87cd9a0f6b..87cd9a0f6b 100644
--- a/src/imports/controls/imagine/images/dial-background@2x.png
+++ b/src/quickcontrols2/imagine/images/dial-background@2x.png
diff --git a/src/imports/controls/imagine/images/dial-background@3x.png b/src/quickcontrols2/imagine/images/dial-background@3x.png
index 103fb46107..103fb46107 100644
--- a/src/imports/controls/imagine/images/dial-background@3x.png
+++ b/src/quickcontrols2/imagine/images/dial-background@3x.png
diff --git a/src/imports/controls/imagine/images/dial-background@4x.png b/src/quickcontrols2/imagine/images/dial-background@4x.png
index c290f84a8f..c290f84a8f 100644
--- a/src/imports/controls/imagine/images/dial-background@4x.png
+++ b/src/quickcontrols2/imagine/images/dial-background@4x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-disabled.png b/src/quickcontrols2/imagine/images/dial-handle-disabled.png
index a93fd0f2b6..a93fd0f2b6 100644
--- a/src/imports/controls/imagine/images/dial-handle-disabled.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-disabled.png
diff --git a/src/imports/controls/imagine/images/dial-handle-disabled@2x.png b/src/quickcontrols2/imagine/images/dial-handle-disabled@2x.png
index 2cd536be06..2cd536be06 100644
--- a/src/imports/controls/imagine/images/dial-handle-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-disabled@3x.png b/src/quickcontrols2/imagine/images/dial-handle-disabled@3x.png
index 56b9fe06db..56b9fe06db 100644
--- a/src/imports/controls/imagine/images/dial-handle-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-disabled@4x.png b/src/quickcontrols2/imagine/images/dial-handle-disabled@4x.png
index 5098d6887c..5098d6887c 100644
--- a/src/imports/controls/imagine/images/dial-handle-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused-hovered.png b/src/quickcontrols2/imagine/images/dial-handle-focused-hovered.png
index 2a143f2afb..2a143f2afb 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused-hovered.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused-hovered.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused-hovered@2x.png b/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@2x.png
index 24dfee8284..24dfee8284 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused-hovered@3x.png b/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@3x.png
index 16e128d5cc..16e128d5cc 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused-hovered@4x.png b/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@4x.png
index b4523acb70..b4523acb70 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused-pressed.png b/src/quickcontrols2/imagine/images/dial-handle-focused-pressed.png
index d43971ff4d..d43971ff4d 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused-pressed.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused-pressed.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused-pressed@2x.png b/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@2x.png
index caa2376e9b..caa2376e9b 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused-pressed@3x.png b/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@3x.png
index c291388316..c291388316 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused-pressed@4x.png b/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@4x.png
index 50ff1c8bf4..50ff1c8bf4 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused.png b/src/quickcontrols2/imagine/images/dial-handle-focused.png
index d2733474b9..d2733474b9 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused@2x.png b/src/quickcontrols2/imagine/images/dial-handle-focused@2x.png
index c7bc8f743b..c7bc8f743b 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused@2x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused@3x.png b/src/quickcontrols2/imagine/images/dial-handle-focused@3x.png
index c0dcd94535..c0dcd94535 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused@3x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-focused@4x.png b/src/quickcontrols2/imagine/images/dial-handle-focused@4x.png
index b9d2234c3f..b9d2234c3f 100644
--- a/src/imports/controls/imagine/images/dial-handle-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-focused@4x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-hovered.png b/src/quickcontrols2/imagine/images/dial-handle-hovered.png
index f5d0ac6f7f..f5d0ac6f7f 100644
--- a/src/imports/controls/imagine/images/dial-handle-hovered.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-hovered.png
diff --git a/src/imports/controls/imagine/images/dial-handle-hovered@2x.png b/src/quickcontrols2/imagine/images/dial-handle-hovered@2x.png
index da23baaa90..da23baaa90 100644
--- a/src/imports/controls/imagine/images/dial-handle-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-hovered@3x.png b/src/quickcontrols2/imagine/images/dial-handle-hovered@3x.png
index 7287a41923..7287a41923 100644
--- a/src/imports/controls/imagine/images/dial-handle-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-hovered@4x.png b/src/quickcontrols2/imagine/images/dial-handle-hovered@4x.png
index 9f6982dd56..9f6982dd56 100644
--- a/src/imports/controls/imagine/images/dial-handle-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-pressed.png b/src/quickcontrols2/imagine/images/dial-handle-pressed.png
index 3b98e1245c..3b98e1245c 100644
--- a/src/imports/controls/imagine/images/dial-handle-pressed.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-pressed.png
diff --git a/src/imports/controls/imagine/images/dial-handle-pressed@2x.png b/src/quickcontrols2/imagine/images/dial-handle-pressed@2x.png
index 454e73644d..454e73644d 100644
--- a/src/imports/controls/imagine/images/dial-handle-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-pressed@3x.png b/src/quickcontrols2/imagine/images/dial-handle-pressed@3x.png
index 794516da1e..794516da1e 100644
--- a/src/imports/controls/imagine/images/dial-handle-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/dial-handle-pressed@4x.png b/src/quickcontrols2/imagine/images/dial-handle-pressed@4x.png
index 211b1135be..211b1135be 100644
--- a/src/imports/controls/imagine/images/dial-handle-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/dial-handle.png b/src/quickcontrols2/imagine/images/dial-handle.png
index 652b82d30e..652b82d30e 100644
--- a/src/imports/controls/imagine/images/dial-handle.png
+++ b/src/quickcontrols2/imagine/images/dial-handle.png
diff --git a/src/imports/controls/imagine/images/dial-handle@2x.png b/src/quickcontrols2/imagine/images/dial-handle@2x.png
index 3c86a59bff..3c86a59bff 100644
--- a/src/imports/controls/imagine/images/dial-handle@2x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle@2x.png
diff --git a/src/imports/controls/imagine/images/dial-handle@3x.png b/src/quickcontrols2/imagine/images/dial-handle@3x.png
index cbfcdbcdc6..cbfcdbcdc6 100644
--- a/src/imports/controls/imagine/images/dial-handle@3x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle@3x.png
diff --git a/src/imports/controls/imagine/images/dial-handle@4x.png b/src/quickcontrols2/imagine/images/dial-handle@4x.png
index 2872e006fa..2872e006fa 100644
--- a/src/imports/controls/imagine/images/dial-handle@4x.png
+++ b/src/quickcontrols2/imagine/images/dial-handle@4x.png
diff --git a/src/imports/controls/imagine/images/dialog-background.9.png b/src/quickcontrols2/imagine/images/dialog-background.9.png
index c842b5ff58..c842b5ff58 100644
--- a/src/imports/controls/imagine/images/dialog-background.9.png
+++ b/src/quickcontrols2/imagine/images/dialog-background.9.png
diff --git a/src/imports/controls/imagine/images/dialog-background@2x.9.png b/src/quickcontrols2/imagine/images/dialog-background@2x.9.png
index ca23df1f0d..ca23df1f0d 100644
--- a/src/imports/controls/imagine/images/dialog-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/dialog-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/dialog-background@3x.9.png b/src/quickcontrols2/imagine/images/dialog-background@3x.9.png
index 46cd406536..46cd406536 100644
--- a/src/imports/controls/imagine/images/dialog-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/dialog-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/dialog-background@4x.9.png b/src/quickcontrols2/imagine/images/dialog-background@4x.9.png
index 3da74119cc..3da74119cc 100644
--- a/src/imports/controls/imagine/images/dialog-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/dialog-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/dialog-overlay-modal.png b/src/quickcontrols2/imagine/images/dialog-overlay-modal.png
index d4a43d1c70..d4a43d1c70 100644
--- a/src/imports/controls/imagine/images/dialog-overlay-modal.png
+++ b/src/quickcontrols2/imagine/images/dialog-overlay-modal.png
diff --git a/src/imports/controls/imagine/images/dialog-overlay-modal@2x.png b/src/quickcontrols2/imagine/images/dialog-overlay-modal@2x.png
index c9a8f4124b..c9a8f4124b 100644
--- a/src/imports/controls/imagine/images/dialog-overlay-modal@2x.png
+++ b/src/quickcontrols2/imagine/images/dialog-overlay-modal@2x.png
diff --git a/src/imports/controls/imagine/images/dialog-overlay-modal@3x.png b/src/quickcontrols2/imagine/images/dialog-overlay-modal@3x.png
index 4a1084a919..4a1084a919 100644
--- a/src/imports/controls/imagine/images/dialog-overlay-modal@3x.png
+++ b/src/quickcontrols2/imagine/images/dialog-overlay-modal@3x.png
diff --git a/src/imports/controls/imagine/images/dialog-overlay-modal@4x.png b/src/quickcontrols2/imagine/images/dialog-overlay-modal@4x.png
index b92e600dae..b92e600dae 100644
--- a/src/imports/controls/imagine/images/dialog-overlay-modal@4x.png
+++ b/src/quickcontrols2/imagine/images/dialog-overlay-modal@4x.png
diff --git a/src/imports/controls/imagine/images/dialog-overlay.png b/src/quickcontrols2/imagine/images/dialog-overlay.png
index b7da23c00f..b7da23c00f 100644
--- a/src/imports/controls/imagine/images/dialog-overlay.png
+++ b/src/quickcontrols2/imagine/images/dialog-overlay.png
diff --git a/src/imports/controls/imagine/images/dialog-overlay@2x.png b/src/quickcontrols2/imagine/images/dialog-overlay@2x.png
index 23828d5a1c..23828d5a1c 100644
--- a/src/imports/controls/imagine/images/dialog-overlay@2x.png
+++ b/src/quickcontrols2/imagine/images/dialog-overlay@2x.png
diff --git a/src/imports/controls/imagine/images/dialog-overlay@3x.png b/src/quickcontrols2/imagine/images/dialog-overlay@3x.png
index d9d5382867..d9d5382867 100644
--- a/src/imports/controls/imagine/images/dialog-overlay@3x.png
+++ b/src/quickcontrols2/imagine/images/dialog-overlay@3x.png
diff --git a/src/imports/controls/imagine/images/dialog-overlay@4x.png b/src/quickcontrols2/imagine/images/dialog-overlay@4x.png
index a76c1a3a71..a76c1a3a71 100644
--- a/src/imports/controls/imagine/images/dialog-overlay@4x.png
+++ b/src/quickcontrols2/imagine/images/dialog-overlay@4x.png
diff --git a/src/imports/controls/imagine/images/dialogbuttonbox-background.9.png b/src/quickcontrols2/imagine/images/dialogbuttonbox-background.9.png
index 4b080c7f8b..4b080c7f8b 100644
--- a/src/imports/controls/imagine/images/dialogbuttonbox-background.9.png
+++ b/src/quickcontrols2/imagine/images/dialogbuttonbox-background.9.png
diff --git a/src/imports/controls/imagine/images/dialogbuttonbox-background@2x.9.png b/src/quickcontrols2/imagine/images/dialogbuttonbox-background@2x.9.png
index 38306bea93..38306bea93 100644
--- a/src/imports/controls/imagine/images/dialogbuttonbox-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/dialogbuttonbox-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/dialogbuttonbox-background@3x.9.png b/src/quickcontrols2/imagine/images/dialogbuttonbox-background@3x.9.png
index 66afaabe22..66afaabe22 100644
--- a/src/imports/controls/imagine/images/dialogbuttonbox-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/dialogbuttonbox-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/dialogbuttonbox-background@4x.9.png b/src/quickcontrols2/imagine/images/dialogbuttonbox-background@4x.9.png
index 7d0db539c1..7d0db539c1 100644
--- a/src/imports/controls/imagine/images/dialogbuttonbox-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/dialogbuttonbox-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-bottom.9.png b/src/quickcontrols2/imagine/images/drawer-background-bottom.9.png
index 023d8bf806..023d8bf806 100644
--- a/src/imports/controls/imagine/images/drawer-background-bottom.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-bottom.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-bottom@2x.9.png b/src/quickcontrols2/imagine/images/drawer-background-bottom@2x.9.png
index 6b229ce9e7..6b229ce9e7 100644
--- a/src/imports/controls/imagine/images/drawer-background-bottom@2x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-bottom@2x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-bottom@3x.9.png b/src/quickcontrols2/imagine/images/drawer-background-bottom@3x.9.png
index c61118b651..c61118b651 100644
--- a/src/imports/controls/imagine/images/drawer-background-bottom@3x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-bottom@3x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-bottom@4x.9.png b/src/quickcontrols2/imagine/images/drawer-background-bottom@4x.9.png
index 08b2e25f30..08b2e25f30 100644
--- a/src/imports/controls/imagine/images/drawer-background-bottom@4x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-bottom@4x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-left.9.png b/src/quickcontrols2/imagine/images/drawer-background-left.9.png
index 5145a3a3f9..5145a3a3f9 100644
--- a/src/imports/controls/imagine/images/drawer-background-left.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-left.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-left@2x.9.png b/src/quickcontrols2/imagine/images/drawer-background-left@2x.9.png
index 95a80ab530..95a80ab530 100644
--- a/src/imports/controls/imagine/images/drawer-background-left@2x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-left@2x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-left@3x.9.png b/src/quickcontrols2/imagine/images/drawer-background-left@3x.9.png
index bd330b7f8e..bd330b7f8e 100644
--- a/src/imports/controls/imagine/images/drawer-background-left@3x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-left@3x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-left@4x.9.png b/src/quickcontrols2/imagine/images/drawer-background-left@4x.9.png
index 10f0702a11..10f0702a11 100644
--- a/src/imports/controls/imagine/images/drawer-background-left@4x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-left@4x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-right.9.png b/src/quickcontrols2/imagine/images/drawer-background-right.9.png
index 37afb73465..37afb73465 100644
--- a/src/imports/controls/imagine/images/drawer-background-right.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-right.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-right@2x.9.png b/src/quickcontrols2/imagine/images/drawer-background-right@2x.9.png
index cfbc8f35a2..cfbc8f35a2 100644
--- a/src/imports/controls/imagine/images/drawer-background-right@2x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-right@2x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-right@3x.9.png b/src/quickcontrols2/imagine/images/drawer-background-right@3x.9.png
index 9a49b6d530..9a49b6d530 100644
--- a/src/imports/controls/imagine/images/drawer-background-right@3x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-right@3x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-right@4x.9.png b/src/quickcontrols2/imagine/images/drawer-background-right@4x.9.png
index 564057760a..564057760a 100644
--- a/src/imports/controls/imagine/images/drawer-background-right@4x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-right@4x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-top.9.png b/src/quickcontrols2/imagine/images/drawer-background-top.9.png
index 56da059ff9..56da059ff9 100644
--- a/src/imports/controls/imagine/images/drawer-background-top.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-top.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-top@2x.9.png b/src/quickcontrols2/imagine/images/drawer-background-top@2x.9.png
index 976671ce59..976671ce59 100644
--- a/src/imports/controls/imagine/images/drawer-background-top@2x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-top@2x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-top@3x.9.png b/src/quickcontrols2/imagine/images/drawer-background-top@3x.9.png
index 7c07deba34..7c07deba34 100644
--- a/src/imports/controls/imagine/images/drawer-background-top@3x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-top@3x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-background-top@4x.9.png b/src/quickcontrols2/imagine/images/drawer-background-top@4x.9.png
index e3b1edf7c2..e3b1edf7c2 100644
--- a/src/imports/controls/imagine/images/drawer-background-top@4x.9.png
+++ b/src/quickcontrols2/imagine/images/drawer-background-top@4x.9.png
diff --git a/src/imports/controls/imagine/images/drawer-overlay-modal.png b/src/quickcontrols2/imagine/images/drawer-overlay-modal.png
index d4a43d1c70..d4a43d1c70 100644
--- a/src/imports/controls/imagine/images/drawer-overlay-modal.png
+++ b/src/quickcontrols2/imagine/images/drawer-overlay-modal.png
diff --git a/src/imports/controls/imagine/images/drawer-overlay-modal@2x.png b/src/quickcontrols2/imagine/images/drawer-overlay-modal@2x.png
index c9a8f4124b..c9a8f4124b 100644
--- a/src/imports/controls/imagine/images/drawer-overlay-modal@2x.png
+++ b/src/quickcontrols2/imagine/images/drawer-overlay-modal@2x.png
diff --git a/src/imports/controls/imagine/images/drawer-overlay-modal@3x.png b/src/quickcontrols2/imagine/images/drawer-overlay-modal@3x.png
index 4a1084a919..4a1084a919 100644
--- a/src/imports/controls/imagine/images/drawer-overlay-modal@3x.png
+++ b/src/quickcontrols2/imagine/images/drawer-overlay-modal@3x.png
diff --git a/src/imports/controls/imagine/images/drawer-overlay-modal@4x.png b/src/quickcontrols2/imagine/images/drawer-overlay-modal@4x.png
index b92e600dae..b92e600dae 100644
--- a/src/imports/controls/imagine/images/drawer-overlay-modal@4x.png
+++ b/src/quickcontrols2/imagine/images/drawer-overlay-modal@4x.png
diff --git a/src/imports/controls/imagine/images/drawer-overlay.png b/src/quickcontrols2/imagine/images/drawer-overlay.png
index b7da23c00f..b7da23c00f 100644
--- a/src/imports/controls/imagine/images/drawer-overlay.png
+++ b/src/quickcontrols2/imagine/images/drawer-overlay.png
diff --git a/src/imports/controls/imagine/images/drawer-overlay@2x.png b/src/quickcontrols2/imagine/images/drawer-overlay@2x.png
index 23828d5a1c..23828d5a1c 100644
--- a/src/imports/controls/imagine/images/drawer-overlay@2x.png
+++ b/src/quickcontrols2/imagine/images/drawer-overlay@2x.png
diff --git a/src/imports/controls/imagine/images/drawer-overlay@3x.png b/src/quickcontrols2/imagine/images/drawer-overlay@3x.png
index d9d5382867..d9d5382867 100644
--- a/src/imports/controls/imagine/images/drawer-overlay@3x.png
+++ b/src/quickcontrols2/imagine/images/drawer-overlay@3x.png
diff --git a/src/imports/controls/imagine/images/drawer-overlay@4x.png b/src/quickcontrols2/imagine/images/drawer-overlay@4x.png
index a76c1a3a71..a76c1a3a71 100644
--- a/src/imports/controls/imagine/images/drawer-overlay@4x.png
+++ b/src/quickcontrols2/imagine/images/drawer-overlay@4x.png
diff --git a/src/imports/controls/imagine/images/frame-background.9.png b/src/quickcontrols2/imagine/images/frame-background.9.png
index 8674059de8..8674059de8 100644
--- a/src/imports/controls/imagine/images/frame-background.9.png
+++ b/src/quickcontrols2/imagine/images/frame-background.9.png
diff --git a/src/imports/controls/imagine/images/frame-background@2x.9.png b/src/quickcontrols2/imagine/images/frame-background@2x.9.png
index 196614964a..196614964a 100644
--- a/src/imports/controls/imagine/images/frame-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/frame-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/frame-background@3x.9.png b/src/quickcontrols2/imagine/images/frame-background@3x.9.png
index 07d644be96..07d644be96 100644
--- a/src/imports/controls/imagine/images/frame-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/frame-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/frame-background@4x.9.png b/src/quickcontrols2/imagine/images/frame-background@4x.9.png
index 8bf47d2a88..8bf47d2a88 100644
--- a/src/imports/controls/imagine/images/frame-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/frame-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/groupbox-background.9.png b/src/quickcontrols2/imagine/images/groupbox-background.9.png
index 8674059de8..8674059de8 100644
--- a/src/imports/controls/imagine/images/groupbox-background.9.png
+++ b/src/quickcontrols2/imagine/images/groupbox-background.9.png
diff --git a/src/imports/controls/imagine/images/groupbox-background@2x.9.png b/src/quickcontrols2/imagine/images/groupbox-background@2x.9.png
index 196614964a..196614964a 100644
--- a/src/imports/controls/imagine/images/groupbox-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/groupbox-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/groupbox-background@3x.9.png b/src/quickcontrols2/imagine/images/groupbox-background@3x.9.png
index 07d644be96..07d644be96 100644
--- a/src/imports/controls/imagine/images/groupbox-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/groupbox-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/groupbox-background@4x.9.png b/src/quickcontrols2/imagine/images/groupbox-background@4x.9.png
index 8bf47d2a88..8bf47d2a88 100644
--- a/src/imports/controls/imagine/images/groupbox-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/groupbox-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/groupbox-title.9.png b/src/quickcontrols2/imagine/images/groupbox-title.9.png
index e85e0cb135..e85e0cb135 100644
--- a/src/imports/controls/imagine/images/groupbox-title.9.png
+++ b/src/quickcontrols2/imagine/images/groupbox-title.9.png
diff --git a/src/imports/controls/imagine/images/groupbox-title@2x.9.png b/src/quickcontrols2/imagine/images/groupbox-title@2x.9.png
index d5359d857d..d5359d857d 100644
--- a/src/imports/controls/imagine/images/groupbox-title@2x.9.png
+++ b/src/quickcontrols2/imagine/images/groupbox-title@2x.9.png
diff --git a/src/imports/controls/imagine/images/groupbox-title@3x.9.png b/src/quickcontrols2/imagine/images/groupbox-title@3x.9.png
index 0e4b5c9f9f..0e4b5c9f9f 100644
--- a/src/imports/controls/imagine/images/groupbox-title@3x.9.png
+++ b/src/quickcontrols2/imagine/images/groupbox-title@3x.9.png
diff --git a/src/imports/controls/imagine/images/groupbox-title@4x.9.png b/src/quickcontrols2/imagine/images/groupbox-title@4x.9.png
index 908dfe6b90..908dfe6b90 100644
--- a/src/imports/controls/imagine/images/groupbox-title@4x.9.png
+++ b/src/quickcontrols2/imagine/images/groupbox-title@4x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-disabled.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-disabled.9.png
index 23570729d6..23570729d6 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-focused.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-focused.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-highlighted.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted.9.png
index e79d8e1d01..e79d8e1d01 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-highlighted.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@2x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@2x.9.png
index ea68d35fc4..ea68d35fc4 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@2x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@2x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@3x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@3x.9.png
index 6d61041599..6d61041599 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@3x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@3x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@4x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@4x.9.png
index 590cca96a1..590cca96a1 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@4x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@4x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-hovered.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-hovered.9.png
index b8749743d0..b8749743d0 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-hovered.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-hovered@2x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-hovered@3x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-hovered@4x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-pressed.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-pressed.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-pressed.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-pressed@2x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-pressed@3x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background-pressed@4x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background.9.png
index b8749743d0..b8749743d0 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background@2x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background@3x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/itemdelegate-background@4x.9.png b/src/quickcontrols2/imagine/images/itemdelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/imports/controls/imagine/images/itemdelegate-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/itemdelegate-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/menu-background.9.png b/src/quickcontrols2/imagine/images/menu-background.9.png
index 3195fbc336..3195fbc336 100644
--- a/src/imports/controls/imagine/images/menu-background.9.png
+++ b/src/quickcontrols2/imagine/images/menu-background.9.png
diff --git a/src/imports/controls/imagine/images/menu-background@2x.9.png b/src/quickcontrols2/imagine/images/menu-background@2x.9.png
index 454c347ced..454c347ced 100644
--- a/src/imports/controls/imagine/images/menu-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/menu-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/menu-background@3x.9.png b/src/quickcontrols2/imagine/images/menu-background@3x.9.png
index 32ed60860f..32ed60860f 100644
--- a/src/imports/controls/imagine/images/menu-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/menu-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/menu-background@4x.9.png b/src/quickcontrols2/imagine/images/menu-background@4x.9.png
index 948cc3e95f..948cc3e95f 100644
--- a/src/imports/controls/imagine/images/menu-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/menu-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled.png b/src/quickcontrols2/imagine/images/menuitem-arrow-disabled.png
index 6cad53f6c8..6cad53f6c8 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-disabled.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-disabled.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png b/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@2x.png
index bad6fe8c0f..bad6fe8c0f 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png b/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@3x.png
index da420091a9..da420091a9 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png b/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@4x.png
index 2d8e44e2f6..2d8e44e2f6 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled.png
index 44ac277145..44ac277145 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@2x.png
index 71a9b88a80..71a9b88a80 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@3x.png
index 1e03f2156e..1e03f2156e 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@4x.png
index 0f85b409d9..0f85b409d9 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored.png
index 4ac1160bf2..4ac1160bf2 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@2x.png
index 79b089b654..79b089b654 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@3x.png
index aeb191fdd5..aeb191fdd5 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@4x.png
index 139fab35e0..139fab35e0 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow.png b/src/quickcontrols2/imagine/images/menuitem-arrow.png
index edf1f6bd1a..edf1f6bd1a 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow@2x.png b/src/quickcontrols2/imagine/images/menuitem-arrow@2x.png
index 8e6292653e..8e6292653e 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow@3x.png b/src/quickcontrols2/imagine/images/menuitem-arrow@3x.png
index 0cef53acf5..0cef53acf5 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-arrow@4x.png b/src/quickcontrols2/imagine/images/menuitem-arrow@4x.png
index dbdc83bc16..dbdc83bc16 100644
--- a/src/imports/controls/imagine/images/menuitem-arrow@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-arrow@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-background-highlighted.9.png b/src/quickcontrols2/imagine/images/menuitem-background-highlighted.9.png
index 7b8fa0f42f..7b8fa0f42f 100644
--- a/src/imports/controls/imagine/images/menuitem-background-highlighted.9.png
+++ b/src/quickcontrols2/imagine/images/menuitem-background-highlighted.9.png
diff --git a/src/imports/controls/imagine/images/menuitem-background-highlighted@2x.9.png b/src/quickcontrols2/imagine/images/menuitem-background-highlighted@2x.9.png
index 9edc30793b..9edc30793b 100644
--- a/src/imports/controls/imagine/images/menuitem-background-highlighted@2x.9.png
+++ b/src/quickcontrols2/imagine/images/menuitem-background-highlighted@2x.9.png
diff --git a/src/imports/controls/imagine/images/menuitem-background-highlighted@3x.9.png b/src/quickcontrols2/imagine/images/menuitem-background-highlighted@3x.9.png
index 183f6194ba..183f6194ba 100644
--- a/src/imports/controls/imagine/images/menuitem-background-highlighted@3x.9.png
+++ b/src/quickcontrols2/imagine/images/menuitem-background-highlighted@3x.9.png
diff --git a/src/imports/controls/imagine/images/menuitem-background-highlighted@4x.9.png b/src/quickcontrols2/imagine/images/menuitem-background-highlighted@4x.9.png
index 0a1ab8637d..0a1ab8637d 100644
--- a/src/imports/controls/imagine/images/menuitem-background-highlighted@4x.9.png
+++ b/src/quickcontrols2/imagine/images/menuitem-background-highlighted@4x.9.png
diff --git a/src/imports/controls/imagine/images/menuitem-background.9.png b/src/quickcontrols2/imagine/images/menuitem-background.9.png
index aab131eddf..aab131eddf 100644
--- a/src/imports/controls/imagine/images/menuitem-background.9.png
+++ b/src/quickcontrols2/imagine/images/menuitem-background.9.png
diff --git a/src/imports/controls/imagine/images/menuitem-background@2x.9.png b/src/quickcontrols2/imagine/images/menuitem-background@2x.9.png
index c46938c4d8..c46938c4d8 100644
--- a/src/imports/controls/imagine/images/menuitem-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/menuitem-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/menuitem-background@3x.9.png b/src/quickcontrols2/imagine/images/menuitem-background@3x.9.png
index bac1a83f7f..bac1a83f7f 100644
--- a/src/imports/controls/imagine/images/menuitem-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/menuitem-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/menuitem-background@4x.9.png b/src/quickcontrols2/imagine/images/menuitem-background@4x.9.png
index ba77504c27..ba77504c27 100644
--- a/src/imports/controls/imagine/images/menuitem-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/menuitem-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused.png
index d55a520426..d55a520426 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@2x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@2x.png
index 7289f63949..7289f63949 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@3x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@4x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered.png
index d55a520426..d55a520426 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@2x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@2x.png
index 7289f63949..7289f63949 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@3x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@4x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed.png
index 9c03d096e4..9c03d096e4 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@2x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@2x.png
index 680ba3efca..680ba3efca 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@3x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@3x.png
index 974205de54..974205de54 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@4x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@4x.png
index 2c8b6aabf4..2c8b6aabf4 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked.png
index 598b163aaa..598b163aaa 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked@2x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked@2x.png
index 06382264f9..06382264f9 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked@3x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked@3x.png
index 12a32dcd20..12a32dcd20 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked@4x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-checked@4x.png
index 4bc6701d65..4bc6701d65 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-checked@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-disabled.png b/src/quickcontrols2/imagine/images/menuitem-indicator-disabled.png
index 0a499f8f2d..0a499f8f2d 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-disabled.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-disabled.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-disabled@2x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@2x.png
index db652c5ac9..db652c5ac9 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-disabled@3x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@3x.png
index 482f045d32..482f045d32 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-disabled@4x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@4x.png
index a386e27251..a386e27251 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-focused.png b/src/quickcontrols2/imagine/images/menuitem-indicator-focused.png
index c5eb85276d..c5eb85276d 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-focused.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-focused.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-focused@2x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-focused@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-focused@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-focused@3x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-focused@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-focused@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-focused@4x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-focused@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-focused@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-hovered.png b/src/quickcontrols2/imagine/images/menuitem-indicator-hovered.png
index c5eb85276d..c5eb85276d 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-hovered.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-hovered.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-hovered@2x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-hovered@3x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-hovered@4x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-pressed.png b/src/quickcontrols2/imagine/images/menuitem-indicator-pressed.png
index a1baaf903e..a1baaf903e 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-pressed.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-pressed.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-pressed@2x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@2x.png
index 81a7c3647a..81a7c3647a 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-pressed@3x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@3x.png
index 9325de38cb..9325de38cb 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator-pressed@4x.png b/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@4x.png
index c93b8fb8a3..c93b8fb8a3 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator.png b/src/quickcontrols2/imagine/images/menuitem-indicator.png
index 2b3e2323d7..2b3e2323d7 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator@2x.png b/src/quickcontrols2/imagine/images/menuitem-indicator@2x.png
index ce8985dbb1..ce8985dbb1 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator@2x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator@2x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator@3x.png b/src/quickcontrols2/imagine/images/menuitem-indicator@3x.png
index 2968731dd7..2968731dd7 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator@3x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator@3x.png
diff --git a/src/imports/controls/imagine/images/menuitem-indicator@4x.png b/src/quickcontrols2/imagine/images/menuitem-indicator@4x.png
index ea8da28498..ea8da28498 100644
--- a/src/imports/controls/imagine/images/menuitem-indicator@4x.png
+++ b/src/quickcontrols2/imagine/images/menuitem-indicator@4x.png
diff --git a/src/imports/controls/imagine/images/menuseparator-separator.9.png b/src/quickcontrols2/imagine/images/menuseparator-separator.9.png
index b8825b99ca..b8825b99ca 100644
--- a/src/imports/controls/imagine/images/menuseparator-separator.9.png
+++ b/src/quickcontrols2/imagine/images/menuseparator-separator.9.png
diff --git a/src/imports/controls/imagine/images/menuseparator-separator@2x.9.png b/src/quickcontrols2/imagine/images/menuseparator-separator@2x.9.png
index 3e5a023d76..3e5a023d76 100644
--- a/src/imports/controls/imagine/images/menuseparator-separator@2x.9.png
+++ b/src/quickcontrols2/imagine/images/menuseparator-separator@2x.9.png
diff --git a/src/imports/controls/imagine/images/menuseparator-separator@3x.9.png b/src/quickcontrols2/imagine/images/menuseparator-separator@3x.9.png
index abe775c7a3..abe775c7a3 100644
--- a/src/imports/controls/imagine/images/menuseparator-separator@3x.9.png
+++ b/src/quickcontrols2/imagine/images/menuseparator-separator@3x.9.png
diff --git a/src/imports/controls/imagine/images/menuseparator-separator@4x.9.png b/src/quickcontrols2/imagine/images/menuseparator-separator@4x.9.png
index 164c8e3e22..164c8e3e22 100644
--- a/src/imports/controls/imagine/images/menuseparator-separator@4x.9.png
+++ b/src/quickcontrols2/imagine/images/menuseparator-separator@4x.9.png
diff --git a/src/imports/controls/imagine/images/page-background.png b/src/quickcontrols2/imagine/images/page-background.png
index 2d8d70f288..2d8d70f288 100644
--- a/src/imports/controls/imagine/images/page-background.png
+++ b/src/quickcontrols2/imagine/images/page-background.png
diff --git a/src/imports/controls/imagine/images/page-background@2x.png b/src/quickcontrols2/imagine/images/page-background@2x.png
index 18fbaa4c63..18fbaa4c63 100644
--- a/src/imports/controls/imagine/images/page-background@2x.png
+++ b/src/quickcontrols2/imagine/images/page-background@2x.png
diff --git a/src/imports/controls/imagine/images/page-background@3x.png b/src/quickcontrols2/imagine/images/page-background@3x.png
index 241232b1e0..241232b1e0 100644
--- a/src/imports/controls/imagine/images/page-background@3x.png
+++ b/src/quickcontrols2/imagine/images/page-background@3x.png
diff --git a/src/imports/controls/imagine/images/page-background@4x.png b/src/quickcontrols2/imagine/images/page-background@4x.png
index 8eb1b1ecc1..8eb1b1ecc1 100644
--- a/src/imports/controls/imagine/images/page-background@4x.png
+++ b/src/quickcontrols2/imagine/images/page-background@4x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-current.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-current.png
index dc96d72326..dc96d72326 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-current.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-current.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-current@2x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-current@2x.png
index 3e0d794fd5..3e0d794fd5 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-current@2x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-current@2x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-current@3x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-current@3x.png
index 397501a7db..397501a7db 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-current@3x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-current@3x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-current@4x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-current@4x.png
index f741a8963b..f741a8963b 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-current@4x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-current@4x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current.png
index 848d4351a3..848d4351a3 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@2x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@2x.png
index 65b5a9d42f..65b5a9d42f 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@2x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@2x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@3x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@3x.png
index 99e3b644aa..99e3b644aa 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@3x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@3x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@4x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@4x.png
index f1801fffef..f1801fffef 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@4x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@4x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled.png
index 848d4351a3..848d4351a3 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@2x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@2x.png
index 65b5a9d42f..65b5a9d42f 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@3x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@3x.png
index 99e3b644aa..99e3b644aa 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@4x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@4x.png
index f1801fffef..f1801fffef 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-pressed.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed.png
index dc96d72326..dc96d72326 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-pressed.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@2x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@2x.png
index 3e0d794fd5..3e0d794fd5 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@3x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@3x.png
index 397501a7db..397501a7db 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@4x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@4x.png
index f741a8963b..f741a8963b 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate.png b/src/quickcontrols2/imagine/images/pageindicator-delegate.png
index 84d23cd1ae..84d23cd1ae 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate@2x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate@2x.png
index 0e706372c2..0e706372c2 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate@2x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate@2x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate@3x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate@3x.png
index 85af5a4e4b..85af5a4e4b 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate@3x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate@3x.png
diff --git a/src/imports/controls/imagine/images/pageindicator-delegate@4x.png b/src/quickcontrols2/imagine/images/pageindicator-delegate@4x.png
index 0aacbab1a9..0aacbab1a9 100644
--- a/src/imports/controls/imagine/images/pageindicator-delegate@4x.png
+++ b/src/quickcontrols2/imagine/images/pageindicator-delegate@4x.png
diff --git a/src/imports/controls/imagine/images/pane-background.9.png b/src/quickcontrols2/imagine/images/pane-background.9.png
index 658f4863ea..658f4863ea 100644
--- a/src/imports/controls/imagine/images/pane-background.9.png
+++ b/src/quickcontrols2/imagine/images/pane-background.9.png
diff --git a/src/imports/controls/imagine/images/pane-background@2x.9.png b/src/quickcontrols2/imagine/images/pane-background@2x.9.png
index a84ac04a1f..a84ac04a1f 100644
--- a/src/imports/controls/imagine/images/pane-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/pane-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/pane-background@3x.9.png b/src/quickcontrols2/imagine/images/pane-background@3x.9.png
index 2b1c4da9de..2b1c4da9de 100644
--- a/src/imports/controls/imagine/images/pane-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/pane-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/pane-background@4x.9.png b/src/quickcontrols2/imagine/images/pane-background@4x.9.png
index 90295db412..90295db412 100644
--- a/src/imports/controls/imagine/images/pane-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/pane-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/popup-background.9.png b/src/quickcontrols2/imagine/images/popup-background.9.png
index c842b5ff58..c842b5ff58 100644
--- a/src/imports/controls/imagine/images/popup-background.9.png
+++ b/src/quickcontrols2/imagine/images/popup-background.9.png
diff --git a/src/imports/controls/imagine/images/popup-background@2x.9.png b/src/quickcontrols2/imagine/images/popup-background@2x.9.png
index ca23df1f0d..ca23df1f0d 100644
--- a/src/imports/controls/imagine/images/popup-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/popup-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/popup-background@3x.9.png b/src/quickcontrols2/imagine/images/popup-background@3x.9.png
index 46cd406536..46cd406536 100644
--- a/src/imports/controls/imagine/images/popup-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/popup-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/popup-background@4x.9.png b/src/quickcontrols2/imagine/images/popup-background@4x.9.png
index 3da74119cc..3da74119cc 100644
--- a/src/imports/controls/imagine/images/popup-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/popup-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/popup-overlay-modal.png b/src/quickcontrols2/imagine/images/popup-overlay-modal.png
index d4a43d1c70..d4a43d1c70 100644
--- a/src/imports/controls/imagine/images/popup-overlay-modal.png
+++ b/src/quickcontrols2/imagine/images/popup-overlay-modal.png
diff --git a/src/imports/controls/imagine/images/popup-overlay-modal@2x.png b/src/quickcontrols2/imagine/images/popup-overlay-modal@2x.png
index c9a8f4124b..c9a8f4124b 100644
--- a/src/imports/controls/imagine/images/popup-overlay-modal@2x.png
+++ b/src/quickcontrols2/imagine/images/popup-overlay-modal@2x.png
diff --git a/src/imports/controls/imagine/images/popup-overlay-modal@3x.png b/src/quickcontrols2/imagine/images/popup-overlay-modal@3x.png
index 4a1084a919..4a1084a919 100644
--- a/src/imports/controls/imagine/images/popup-overlay-modal@3x.png
+++ b/src/quickcontrols2/imagine/images/popup-overlay-modal@3x.png
diff --git a/src/imports/controls/imagine/images/popup-overlay-modal@4x.png b/src/quickcontrols2/imagine/images/popup-overlay-modal@4x.png
index b92e600dae..b92e600dae 100644
--- a/src/imports/controls/imagine/images/popup-overlay-modal@4x.png
+++ b/src/quickcontrols2/imagine/images/popup-overlay-modal@4x.png
diff --git a/src/imports/controls/imagine/images/popup-overlay.png b/src/quickcontrols2/imagine/images/popup-overlay.png
index b7da23c00f..b7da23c00f 100644
--- a/src/imports/controls/imagine/images/popup-overlay.png
+++ b/src/quickcontrols2/imagine/images/popup-overlay.png
diff --git a/src/imports/controls/imagine/images/popup-overlay@2x.png b/src/quickcontrols2/imagine/images/popup-overlay@2x.png
index 23828d5a1c..23828d5a1c 100644
--- a/src/imports/controls/imagine/images/popup-overlay@2x.png
+++ b/src/quickcontrols2/imagine/images/popup-overlay@2x.png
diff --git a/src/imports/controls/imagine/images/popup-overlay@3x.png b/src/quickcontrols2/imagine/images/popup-overlay@3x.png
index d9d5382867..d9d5382867 100644
--- a/src/imports/controls/imagine/images/popup-overlay@3x.png
+++ b/src/quickcontrols2/imagine/images/popup-overlay@3x.png
diff --git a/src/imports/controls/imagine/images/popup-overlay@4x.png b/src/quickcontrols2/imagine/images/popup-overlay@4x.png
index a76c1a3a71..a76c1a3a71 100644
--- a/src/imports/controls/imagine/images/popup-overlay@4x.png
+++ b/src/quickcontrols2/imagine/images/popup-overlay@4x.png
diff --git a/src/imports/controls/imagine/images/progressbar-animation.webp b/src/quickcontrols2/imagine/images/progressbar-animation.webp
index 51c35c8823..51c35c8823 100644
--- a/src/imports/controls/imagine/images/progressbar-animation.webp
+++ b/src/quickcontrols2/imagine/images/progressbar-animation.webp
diff --git a/src/imports/controls/imagine/images/progressbar-animation@2x.webp b/src/quickcontrols2/imagine/images/progressbar-animation@2x.webp
index ee1206302a..ee1206302a 100644
--- a/src/imports/controls/imagine/images/progressbar-animation@2x.webp
+++ b/src/quickcontrols2/imagine/images/progressbar-animation@2x.webp
diff --git a/src/imports/controls/imagine/images/progressbar-animation@3x.webp b/src/quickcontrols2/imagine/images/progressbar-animation@3x.webp
index c2f94a74a1..c2f94a74a1 100644
--- a/src/imports/controls/imagine/images/progressbar-animation@3x.webp
+++ b/src/quickcontrols2/imagine/images/progressbar-animation@3x.webp
diff --git a/src/imports/controls/imagine/images/progressbar-animation@4x.webp b/src/quickcontrols2/imagine/images/progressbar-animation@4x.webp
index d49657e934..d49657e934 100644
--- a/src/imports/controls/imagine/images/progressbar-animation@4x.webp
+++ b/src/quickcontrols2/imagine/images/progressbar-animation@4x.webp
diff --git a/src/imports/controls/imagine/images/progressbar-background.9.png b/src/quickcontrols2/imagine/images/progressbar-background.9.png
index e1760070b3..e1760070b3 100644
--- a/src/imports/controls/imagine/images/progressbar-background.9.png
+++ b/src/quickcontrols2/imagine/images/progressbar-background.9.png
diff --git a/src/imports/controls/imagine/images/progressbar-background@2x.9.png b/src/quickcontrols2/imagine/images/progressbar-background@2x.9.png
index e69922d57e..e69922d57e 100644
--- a/src/imports/controls/imagine/images/progressbar-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/progressbar-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/progressbar-background@3x.9.png b/src/quickcontrols2/imagine/images/progressbar-background@3x.9.png
index b3c43205c3..b3c43205c3 100644
--- a/src/imports/controls/imagine/images/progressbar-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/progressbar-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/progressbar-background@4x.9.png b/src/quickcontrols2/imagine/images/progressbar-background@4x.9.png
index 905bdc328f..905bdc328f 100644
--- a/src/imports/controls/imagine/images/progressbar-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/progressbar-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/progressbar-mask.9.png b/src/quickcontrols2/imagine/images/progressbar-mask.9.png
index 35a47dc807..35a47dc807 100644
--- a/src/imports/controls/imagine/images/progressbar-mask.9.png
+++ b/src/quickcontrols2/imagine/images/progressbar-mask.9.png
diff --git a/src/imports/controls/imagine/images/progressbar-mask@2x.9.png b/src/quickcontrols2/imagine/images/progressbar-mask@2x.9.png
index 23ed1a8cf1..23ed1a8cf1 100644
--- a/src/imports/controls/imagine/images/progressbar-mask@2x.9.png
+++ b/src/quickcontrols2/imagine/images/progressbar-mask@2x.9.png
diff --git a/src/imports/controls/imagine/images/progressbar-mask@3x.9.png b/src/quickcontrols2/imagine/images/progressbar-mask@3x.9.png
index 25bc843e3a..25bc843e3a 100644
--- a/src/imports/controls/imagine/images/progressbar-mask@3x.9.png
+++ b/src/quickcontrols2/imagine/images/progressbar-mask@3x.9.png
diff --git a/src/imports/controls/imagine/images/progressbar-mask@4x.9.png b/src/quickcontrols2/imagine/images/progressbar-mask@4x.9.png
index 645ff20179..645ff20179 100644
--- a/src/imports/controls/imagine/images/progressbar-mask@4x.9.png
+++ b/src/quickcontrols2/imagine/images/progressbar-mask@4x.9.png
diff --git a/src/imports/controls/imagine/images/progressbar-progress.png b/src/quickcontrols2/imagine/images/progressbar-progress.png
index bb31dc9b14..bb31dc9b14 100644
--- a/src/imports/controls/imagine/images/progressbar-progress.png
+++ b/src/quickcontrols2/imagine/images/progressbar-progress.png
diff --git a/src/imports/controls/imagine/images/progressbar-progress@2x.png b/src/quickcontrols2/imagine/images/progressbar-progress@2x.png
index 6bb464c90b..6bb464c90b 100644
--- a/src/imports/controls/imagine/images/progressbar-progress@2x.png
+++ b/src/quickcontrols2/imagine/images/progressbar-progress@2x.png
diff --git a/src/imports/controls/imagine/images/progressbar-progress@3x.png b/src/quickcontrols2/imagine/images/progressbar-progress@3x.png
index d514c72772..d514c72772 100644
--- a/src/imports/controls/imagine/images/progressbar-progress@3x.png
+++ b/src/quickcontrols2/imagine/images/progressbar-progress@3x.png
diff --git a/src/imports/controls/imagine/images/progressbar-progress@4x.png b/src/quickcontrols2/imagine/images/progressbar-progress@4x.png
index abc8fa6753..abc8fa6753 100644
--- a/src/imports/controls/imagine/images/progressbar-progress@4x.png
+++ b/src/quickcontrols2/imagine/images/progressbar-progress@4x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused.png
index 2f9e5e18e9..2f9e5e18e9 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@2x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@2x.png
index 47ec553423..47ec553423 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@2x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@3x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@3x.png
index 26cdebf817..26cdebf817 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@3x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@4x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@4x.png
index 708e286ea7..708e286ea7 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@4x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered.png
index 2f9e5e18e9..2f9e5e18e9 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@2x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@2x.png
index 47ec553423..47ec553423 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@3x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@3x.png
index 26cdebf817..26cdebf817 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@4x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@4x.png
index 708e286ea7..708e286ea7 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed.png
index 1e5ebca46a..1e5ebca46a 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@2x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@2x.png
index 6eaae9bf3e..6eaae9bf3e 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@3x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@3x.png
index e54a1624d9..e54a1624d9 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@4x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@4x.png
index 7a7850bada..7a7850bada 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked.png
index 83c8562379..83c8562379 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked@2x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@2x.png
index 4bdeb4566e..4bdeb4566e 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@2x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked@3x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@3x.png
index 2230a8ce09..2230a8ce09 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@3x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked@4x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@4x.png
index e3dce04e56..e3dce04e56 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@4x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-disabled.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled.png
index 05b8bfcadb..05b8bfcadb 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-disabled.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@2x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@2x.png
index e26fa5de81..e26fa5de81 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@3x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@3x.png
index c47e8c7d13..c47e8c7d13 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@4x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@4x.png
index bc66dde78d..bc66dde78d 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-focused.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-focused.png
index 3001638d37..3001638d37 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-focused.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-focused.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-focused@2x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@2x.png
index b98907149e..b98907149e 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@2x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-focused@3x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@3x.png
index b6221277d9..b6221277d9 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@3x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-focused@4x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@4x.png
index 49ae2206ba..49ae2206ba 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@4x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-hovered.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered.png
index 3001638d37..3001638d37 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-hovered.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@2x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@2x.png
index b98907149e..b98907149e 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@3x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@3x.png
index b6221277d9..b6221277d9 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@4x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@4x.png
index 49ae2206ba..49ae2206ba 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-pressed.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed.png
index 76c7b4ed7b..76c7b4ed7b 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-pressed.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@2x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@2x.png
index d5d4cac6d1..d5d4cac6d1 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@3x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@3x.png
index ca2a1ed169..ca2a1ed169 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@4x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@4x.png
index 1cb753d72f..1cb753d72f 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator.png b/src/quickcontrols2/imagine/images/radiobutton-indicator.png
index c05d4bfc05..c05d4bfc05 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator@2x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator@2x.png
index 62744d2726..62744d2726 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator@2x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator@2x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator@3x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator@3x.png
index fa5d241e70..fa5d241e70 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator@3x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator@3x.png
diff --git a/src/imports/controls/imagine/images/radiobutton-indicator@4x.png b/src/quickcontrols2/imagine/images/radiobutton-indicator@4x.png
index 7db85e9432..7db85e9432 100644
--- a/src/imports/controls/imagine/images/radiobutton-indicator@4x.png
+++ b/src/quickcontrols2/imagine/images/radiobutton-indicator@4x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-disabled.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-disabled.9.png
index 23570729d6..23570729d6 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-focused.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-focused.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-highlighted.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted.9.png
index e79d8e1d01..e79d8e1d01 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-highlighted.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-highlighted@2x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@2x.9.png
index ea68d35fc4..ea68d35fc4 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-highlighted@2x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@2x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-highlighted@3x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@3x.9.png
index 6d61041599..6d61041599 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-highlighted@3x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@3x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-highlighted@4x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@4x.9.png
index 590cca96a1..590cca96a1 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-highlighted@4x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@4x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-hovered.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-hovered.9.png
index b8749743d0..b8749743d0 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-hovered.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-hovered@2x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-hovered@3x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-hovered@4x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-pressed.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-pressed.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-pressed.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-pressed@2x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-pressed@3x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background-pressed@4x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background.9.png
index b8749743d0..b8749743d0 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background@2x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background@3x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-background@4x.9.png b/src/quickcontrols2/imagine/images/radiodelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/imports/controls/imagine/images/radiodelegate-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused.png
index 2f9e5e18e9..2f9e5e18e9 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@2x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@2x.png
index 47ec553423..47ec553423 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@2x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@3x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@3x.png
index 26cdebf817..26cdebf817 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@3x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@4x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@4x.png
index 708e286ea7..708e286ea7 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@4x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered.png
index 2f9e5e18e9..2f9e5e18e9 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@2x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@2x.png
index 47ec553423..47ec553423 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@3x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@3x.png
index 26cdebf817..26cdebf817 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@4x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@4x.png
index 708e286ea7..708e286ea7 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed.png
index 1e5ebca46a..1e5ebca46a 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@2x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@2x.png
index 6eaae9bf3e..6eaae9bf3e 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@3x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@3x.png
index e54a1624d9..e54a1624d9 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@4x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@4x.png
index 7a7850bada..7a7850bada 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked.png
index 83c8562379..83c8562379 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@2x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@2x.png
index 4bdeb4566e..4bdeb4566e 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@2x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@3x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@3x.png
index 2230a8ce09..2230a8ce09 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@3x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@4x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@4x.png
index e3dce04e56..e3dce04e56 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@4x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled.png
index 05b8bfcadb..05b8bfcadb 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@2x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@2x.png
index e26fa5de81..e26fa5de81 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@3x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@3x.png
index c47e8c7d13..c47e8c7d13 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@4x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@4x.png
index bc66dde78d..bc66dde78d 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-focused.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused.png
index 3001638d37..3001638d37 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-focused.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@2x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@2x.png
index b98907149e..b98907149e 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@2x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@3x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@3x.png
index b6221277d9..b6221277d9 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@3x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@4x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@4x.png
index 49ae2206ba..49ae2206ba 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@4x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered.png
index 3001638d37..3001638d37 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@2x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@2x.png
index b98907149e..b98907149e 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@3x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@3x.png
index b6221277d9..b6221277d9 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@4x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@4x.png
index 49ae2206ba..49ae2206ba 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed.png
index 76c7b4ed7b..76c7b4ed7b 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@2x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@2x.png
index d5d4cac6d1..d5d4cac6d1 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@3x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@3x.png
index ca2a1ed169..ca2a1ed169 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@4x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@4x.png
index 1cb753d72f..1cb753d72f 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator.png
index c05d4bfc05..c05d4bfc05 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator@2x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator@2x.png
index 62744d2726..62744d2726 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator@2x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator@2x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator@3x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator@3x.png
index fa5d241e70..fa5d241e70 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator@3x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator@3x.png
diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator@4x.png b/src/quickcontrols2/imagine/images/radiodelegate-indicator@4x.png
index 7db85e9432..7db85e9432 100644
--- a/src/imports/controls/imagine/images/radiodelegate-indicator@4x.png
+++ b/src/quickcontrols2/imagine/images/radiodelegate-indicator@4x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-background-horizontal.9.png b/src/quickcontrols2/imagine/images/rangeslider-background-horizontal.9.png
index c4e957ad1b..c4e957ad1b 100644
--- a/src/imports/controls/imagine/images/rangeslider-background-horizontal.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-background-horizontal.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-background-horizontal@2x.9.png b/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@2x.9.png
index 6d8391130b..6d8391130b 100644
--- a/src/imports/controls/imagine/images/rangeslider-background-horizontal@2x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@2x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-background-horizontal@3x.9.png b/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@3x.9.png
index 6b2e634c97..6b2e634c97 100644
--- a/src/imports/controls/imagine/images/rangeslider-background-horizontal@3x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@3x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-background-horizontal@4x.9.png b/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@4x.9.png
index 969c791a38..969c791a38 100644
--- a/src/imports/controls/imagine/images/rangeslider-background-horizontal@4x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@4x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-background-vertical.9.png b/src/quickcontrols2/imagine/images/rangeslider-background-vertical.9.png
index f76e0b21f2..f76e0b21f2 100644
--- a/src/imports/controls/imagine/images/rangeslider-background-vertical.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-background-vertical.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-background-vertical@2x.9.png b/src/quickcontrols2/imagine/images/rangeslider-background-vertical@2x.9.png
index fecd0ab2ba..fecd0ab2ba 100644
--- a/src/imports/controls/imagine/images/rangeslider-background-vertical@2x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-background-vertical@2x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-background-vertical@3x.9.png b/src/quickcontrols2/imagine/images/rangeslider-background-vertical@3x.9.png
index 77a9c830a5..77a9c830a5 100644
--- a/src/imports/controls/imagine/images/rangeslider-background-vertical@3x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-background-vertical@3x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-background-vertical@4x.9.png b/src/quickcontrols2/imagine/images/rangeslider-background-vertical@4x.9.png
index f1613684c0..f1613684c0 100644
--- a/src/imports/controls/imagine/images/rangeslider-background-vertical@4x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-background-vertical@4x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-disabled.png b/src/quickcontrols2/imagine/images/rangeslider-handle-disabled.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-disabled.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-disabled.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-disabled@2x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@2x.png
index 451b719e60..451b719e60 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-disabled@3x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@3x.png
index 1daffca729..1daffca729 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-disabled@4x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@4x.png
index 6483070710..6483070710 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered.png
index c2958f1b3d..c2958f1b3d 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@2x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@2x.png
index 12a4d1f83f..12a4d1f83f 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@3x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@3x.png
index 1696ac9507..1696ac9507 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@4x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@4x.png
index e1d1305623..e1d1305623 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed.png
index c2958f1b3d..c2958f1b3d 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@2x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@2x.png
index 12a4d1f83f..12a4d1f83f 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@3x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@3x.png
index 1696ac9507..1696ac9507 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@4x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@4x.png
index e1d1305623..e1d1305623 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused.png
index bdf8239a46..bdf8239a46 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused@2x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused@2x.png
index 9f887c5ea1..9f887c5ea1 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused@2x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused@3x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused@3x.png
index 8042d4c2a2..8042d4c2a2 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused@3x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused@4x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-focused@4x.png
index e7e68c47e3..e7e68c47e3 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-focused@4x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-hovered.png b/src/quickcontrols2/imagine/images/rangeslider-handle-hovered.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-hovered.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-hovered.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-hovered@2x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@2x.png
index 451b719e60..451b719e60 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-hovered@3x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@3x.png
index 1daffca729..1daffca729 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-hovered@4x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@4x.png
index 6483070710..6483070710 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-pressed.png b/src/quickcontrols2/imagine/images/rangeslider-handle-pressed.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-pressed.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-pressed.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-pressed@2x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@2x.png
index 451b719e60..451b719e60 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-pressed@3x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@3x.png
index 1daffca729..1daffca729 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle-pressed@4x.png b/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@4x.png
index 6483070710..6483070710 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle.png b/src/quickcontrols2/imagine/images/rangeslider-handle.png
index fd72dedfb0..fd72dedfb0 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle@2x.png b/src/quickcontrols2/imagine/images/rangeslider-handle@2x.png
index 57eed9f8ae..57eed9f8ae 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle@2x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle@2x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle@3x.png b/src/quickcontrols2/imagine/images/rangeslider-handle@3x.png
index e217a6444f..e217a6444f 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle@3x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle@3x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-handle@4x.png b/src/quickcontrols2/imagine/images/rangeslider-handle@4x.png
index c212b59f55..c212b59f55 100644
--- a/src/imports/controls/imagine/images/rangeslider-handle@4x.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-handle@4x.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled.9.png
index 7f7e6b935a..7f7e6b935a 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png
index cbf6fb6352..cbf6fb6352 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png
index 643776b8c9..643776b8c9 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png
index d64acb904d..d64acb904d 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal.9.png
index 43192f5416..43192f5416 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@2x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@2x.9.png
index ebbbbf82f8..ebbbbf82f8 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@2x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@2x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@3x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@3x.9.png
index 0a029b53e4..0a029b53e4 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@3x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@3x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@4x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@4x.9.png
index a13541691a..a13541691a 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@4x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@4x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled.9.png
index a4edafc971..a4edafc971 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png
index 8c38226e61..8c38226e61 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png
index a939bffde8..a939bffde8 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png
index 9f653770e2..9f653770e2 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical.9.png
index d3e877fc34..d3e877fc34 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-vertical.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical@2x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@2x.9.png
index 7790050e64..7790050e64 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-vertical@2x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@2x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical@3x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@3x.9.png
index 039d198751..039d198751 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-vertical@3x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@3x.9.png
diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical@4x.9.png b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@4x.9.png
index b3051d1f46..b3051d1f46 100644
--- a/src/imports/controls/imagine/images/rangeslider-progress-vertical@4x.9.png
+++ b/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@4x.9.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-focused.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused.png
index 032a7caa65..032a7caa65 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked-focused.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@2x.png
index a2944b6ac8..a2944b6ac8 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@3x.png
index ffd4d210c4..ffd4d210c4 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@4x.png
index 35a41fc502..35a41fc502 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered.png
index 032a7caa65..032a7caa65 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@2x.png
index a2944b6ac8..a2944b6ac8 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@3x.png
index ffd4d210c4..ffd4d210c4 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@4x.png
index 35a41fc502..35a41fc502 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked.png
index d57d3894fa..d57d3894fa 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked@2x.png
index 7c37452818..7c37452818 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked@3x.png
index b0e0b9bebd..b0e0b9bebd 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-checked@4x.png
index 748864efb3..748864efb3 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-checked@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked.png b/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked.png
index e26fa5de81..e26fa5de81 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@2x.png
index bc66dde78d..bc66dde78d 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@3x.png
index a0c5f9ad4f..a0c5f9ad4f 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@4x.png
index 190210c8f8..190210c8f8 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled.png b/src/quickcontrols2/imagine/images/roundbutton-background-disabled.png
index e26fa5de81..e26fa5de81 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-disabled.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-disabled.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-disabled@2x.png
index bc66dde78d..bc66dde78d 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-disabled@3x.png
index a0c5f9ad4f..a0c5f9ad4f 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-disabled@4x.png
index 190210c8f8..190210c8f8 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-focused.png b/src/quickcontrols2/imagine/images/roundbutton-background-focused.png
index 832955c4e1..832955c4e1 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-focused.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-focused.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-focused@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-focused@2x.png
index bb1ed2ac4b..bb1ed2ac4b 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-focused@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-focused@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-focused@3x.png
index cbf0291321..cbf0291321 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-focused@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-focused@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-focused@4x.png
index 1c765dee15..1c765dee15 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-focused@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused.png
index 269a9d52d5..269a9d52d5 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@2x.png
index bd79565126..bd79565126 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@3x.png
index 5ed0f662b4..5ed0f662b4 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@4x.png
index 5bbb8e7afb..5bbb8e7afb 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered.png
index 269a9d52d5..269a9d52d5 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@2x.png
index bd79565126..bd79565126 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@3x.png
index 5ed0f662b4..5ed0f662b4 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@4x.png
index 5bbb8e7afb..5bbb8e7afb 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed.png
index a0fa8df033..a0fa8df033 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@2x.png
index 3082a1d9c6..3082a1d9c6 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@3x.png
index d32e8af040..d32e8af040 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@4x.png
index f4916e0bca..f4916e0bca 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted.png
index f90e29f9cf..f90e29f9cf 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@2x.png
index 7dce11b40d..7dce11b40d 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@3x.png
index 436abbddce..436abbddce 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@4x.png
index e728d6fa1c..e728d6fa1c 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-highlighted@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-hovered.png b/src/quickcontrols2/imagine/images/roundbutton-background-hovered.png
index 832955c4e1..832955c4e1 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-hovered.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-hovered.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-hovered@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-hovered@2x.png
index bb1ed2ac4b..bb1ed2ac4b 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-hovered@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-hovered@3x.png
index cbf0291321..cbf0291321 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-hovered@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-hovered@4x.png
index 1c765dee15..1c765dee15 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-pressed.png b/src/quickcontrols2/imagine/images/roundbutton-background-pressed.png
index d57d3894fa..d57d3894fa 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-pressed.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-pressed.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-pressed@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background-pressed@2x.png
index 7c37452818..7c37452818 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-pressed@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background-pressed@3x.png
index b0e0b9bebd..b0e0b9bebd 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background-pressed@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background-pressed@4x.png
index 748864efb3..748864efb3 100644
--- a/src/imports/controls/imagine/images/roundbutton-background-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background.png b/src/quickcontrols2/imagine/images/roundbutton-background.png
index d5d4cac6d1..d5d4cac6d1 100644
--- a/src/imports/controls/imagine/images/roundbutton-background.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background@2x.png b/src/quickcontrols2/imagine/images/roundbutton-background@2x.png
index 1cb753d72f..1cb753d72f 100644
--- a/src/imports/controls/imagine/images/roundbutton-background@2x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background@2x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background@3x.png b/src/quickcontrols2/imagine/images/roundbutton-background@3x.png
index 6cc304bf42..6cc304bf42 100644
--- a/src/imports/controls/imagine/images/roundbutton-background@3x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background@3x.png
diff --git a/src/imports/controls/imagine/images/roundbutton-background@4x.png b/src/quickcontrols2/imagine/images/roundbutton-background@4x.png
index 56ea82f6de..56ea82f6de 100644
--- a/src/imports/controls/imagine/images/roundbutton-background@4x.png
+++ b/src/quickcontrols2/imagine/images/roundbutton-background@4x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-disabled.png b/src/quickcontrols2/imagine/images/scrollbar-handle-disabled.png
index b0b95bed99..b0b95bed99 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-disabled.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-disabled.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-disabled@2x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@2x.png
index 8ab854b0a3..8ab854b0a3 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-disabled@3x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@3x.png
index f3c97231f5..f3c97231f5 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-disabled@4x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@4x.png
index 325469b8d8..325469b8d8 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled.png
index 236002fff6..236002fff6 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@2x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@2x.png
index abc3d2c05c..abc3d2c05c 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@3x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@3x.png
index e215cf5b7a..e215cf5b7a 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@4x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@4x.png
index c6ec0520bd..c6ec0520bd 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered.png
index 19b48f1d49..19b48f1d49 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@2x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@2x.png
index 8f5abb8494..8f5abb8494 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@3x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@3x.png
index 73963d754c..73963d754c 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@4x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@4x.png
index 04d6131ec9..04d6131ec9 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed.png
index f48f514df2..f48f514df2 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@2x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@2x.png
index e31820add9..e31820add9 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@3x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@3x.png
index 278ba90007..278ba90007 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@4x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@4x.png
index 01e4e5c85b..01e4e5c85b 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive.png
index fd7832a6aa..fd7832a6aa 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive@2x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@2x.png
index bd63a1b1e8..bd63a1b1e8 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive@2x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@2x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive@3x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@3x.png
index 3145295446..3145295446 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive@3x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@3x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive@4x.png b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@4x.png
index 6db4d81da9..6db4d81da9 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle-interactive@4x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@4x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle.png b/src/quickcontrols2/imagine/images/scrollbar-handle.png
index 255f6c4d60..255f6c4d60 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle@2x.png b/src/quickcontrols2/imagine/images/scrollbar-handle@2x.png
index 2b69cef6a3..2b69cef6a3 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle@2x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle@2x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle@3x.png b/src/quickcontrols2/imagine/images/scrollbar-handle@3x.png
index 6fdfa487d0..6fdfa487d0 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle@3x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle@3x.png
diff --git a/src/imports/controls/imagine/images/scrollbar-handle@4x.png b/src/quickcontrols2/imagine/images/scrollbar-handle@4x.png
index cc3205f125..cc3205f125 100644
--- a/src/imports/controls/imagine/images/scrollbar-handle@4x.png
+++ b/src/quickcontrols2/imagine/images/scrollbar-handle@4x.png
diff --git a/src/imports/controls/imagine/images/scrollindicator-handle.png b/src/quickcontrols2/imagine/images/scrollindicator-handle.png
index 255f6c4d60..255f6c4d60 100644
--- a/src/imports/controls/imagine/images/scrollindicator-handle.png
+++ b/src/quickcontrols2/imagine/images/scrollindicator-handle.png
diff --git a/src/imports/controls/imagine/images/scrollindicator-handle@2x.png b/src/quickcontrols2/imagine/images/scrollindicator-handle@2x.png
index 2b69cef6a3..2b69cef6a3 100644
--- a/src/imports/controls/imagine/images/scrollindicator-handle@2x.png
+++ b/src/quickcontrols2/imagine/images/scrollindicator-handle@2x.png
diff --git a/src/imports/controls/imagine/images/scrollindicator-handle@3x.png b/src/quickcontrols2/imagine/images/scrollindicator-handle@3x.png
index 6fdfa487d0..6fdfa487d0 100644
--- a/src/imports/controls/imagine/images/scrollindicator-handle@3x.png
+++ b/src/quickcontrols2/imagine/images/scrollindicator-handle@3x.png
diff --git a/src/imports/controls/imagine/images/scrollindicator-handle@4x.png b/src/quickcontrols2/imagine/images/scrollindicator-handle@4x.png
index cc3205f125..cc3205f125 100644
--- a/src/imports/controls/imagine/images/scrollindicator-handle@4x.png
+++ b/src/quickcontrols2/imagine/images/scrollindicator-handle@4x.png
diff --git a/src/imports/controls/imagine/images/slider-background-horizontal.9.png b/src/quickcontrols2/imagine/images/slider-background-horizontal.9.png
index c4e957ad1b..c4e957ad1b 100644
--- a/src/imports/controls/imagine/images/slider-background-horizontal.9.png
+++ b/src/quickcontrols2/imagine/images/slider-background-horizontal.9.png
diff --git a/src/imports/controls/imagine/images/slider-background-horizontal@2x.9.png b/src/quickcontrols2/imagine/images/slider-background-horizontal@2x.9.png
index 6d8391130b..6d8391130b 100644
--- a/src/imports/controls/imagine/images/slider-background-horizontal@2x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-background-horizontal@2x.9.png
diff --git a/src/imports/controls/imagine/images/slider-background-horizontal@3x.9.png b/src/quickcontrols2/imagine/images/slider-background-horizontal@3x.9.png
index 6b2e634c97..6b2e634c97 100644
--- a/src/imports/controls/imagine/images/slider-background-horizontal@3x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-background-horizontal@3x.9.png
diff --git a/src/imports/controls/imagine/images/slider-background-horizontal@4x.9.png b/src/quickcontrols2/imagine/images/slider-background-horizontal@4x.9.png
index 969c791a38..969c791a38 100644
--- a/src/imports/controls/imagine/images/slider-background-horizontal@4x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-background-horizontal@4x.9.png
diff --git a/src/imports/controls/imagine/images/slider-background-vertical.9.png b/src/quickcontrols2/imagine/images/slider-background-vertical.9.png
index f76e0b21f2..f76e0b21f2 100644
--- a/src/imports/controls/imagine/images/slider-background-vertical.9.png
+++ b/src/quickcontrols2/imagine/images/slider-background-vertical.9.png
diff --git a/src/imports/controls/imagine/images/slider-background-vertical@2x.9.png b/src/quickcontrols2/imagine/images/slider-background-vertical@2x.9.png
index fecd0ab2ba..fecd0ab2ba 100644
--- a/src/imports/controls/imagine/images/slider-background-vertical@2x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-background-vertical@2x.9.png
diff --git a/src/imports/controls/imagine/images/slider-background-vertical@3x.9.png b/src/quickcontrols2/imagine/images/slider-background-vertical@3x.9.png
index 77a9c830a5..77a9c830a5 100644
--- a/src/imports/controls/imagine/images/slider-background-vertical@3x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-background-vertical@3x.9.png
diff --git a/src/imports/controls/imagine/images/slider-background-vertical@4x.9.png b/src/quickcontrols2/imagine/images/slider-background-vertical@4x.9.png
index f1613684c0..f1613684c0 100644
--- a/src/imports/controls/imagine/images/slider-background-vertical@4x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-background-vertical@4x.9.png
diff --git a/src/imports/controls/imagine/images/slider-handle-disabled.png b/src/quickcontrols2/imagine/images/slider-handle-disabled.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/imports/controls/imagine/images/slider-handle-disabled.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-disabled.png
diff --git a/src/imports/controls/imagine/images/slider-handle-disabled@2x.png b/src/quickcontrols2/imagine/images/slider-handle-disabled@2x.png
index 451b719e60..451b719e60 100644
--- a/src/imports/controls/imagine/images/slider-handle-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-disabled@3x.png b/src/quickcontrols2/imagine/images/slider-handle-disabled@3x.png
index 1daffca729..1daffca729 100644
--- a/src/imports/controls/imagine/images/slider-handle-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-disabled@4x.png b/src/quickcontrols2/imagine/images/slider-handle-disabled@4x.png
index 6483070710..6483070710 100644
--- a/src/imports/controls/imagine/images/slider-handle-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused-hovered.png b/src/quickcontrols2/imagine/images/slider-handle-focused-hovered.png
index c2958f1b3d..c2958f1b3d 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused-hovered.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused-hovered.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused-hovered@2x.png b/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@2x.png
index 12a4d1f83f..12a4d1f83f 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused-hovered@3x.png b/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@3x.png
index 1696ac9507..1696ac9507 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused-hovered@4x.png b/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@4x.png
index e1d1305623..e1d1305623 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused-pressed.png b/src/quickcontrols2/imagine/images/slider-handle-focused-pressed.png
index c2958f1b3d..c2958f1b3d 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused-pressed.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused-pressed.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused-pressed@2x.png b/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@2x.png
index 12a4d1f83f..12a4d1f83f 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused-pressed@3x.png b/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@3x.png
index 1696ac9507..1696ac9507 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused-pressed@4x.png b/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@4x.png
index e1d1305623..e1d1305623 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused.png b/src/quickcontrols2/imagine/images/slider-handle-focused.png
index bdf8239a46..bdf8239a46 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused@2x.png b/src/quickcontrols2/imagine/images/slider-handle-focused@2x.png
index 9f887c5ea1..9f887c5ea1 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused@2x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused@3x.png b/src/quickcontrols2/imagine/images/slider-handle-focused@3x.png
index 8042d4c2a2..8042d4c2a2 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused@3x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-focused@4x.png b/src/quickcontrols2/imagine/images/slider-handle-focused@4x.png
index e7e68c47e3..e7e68c47e3 100644
--- a/src/imports/controls/imagine/images/slider-handle-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-focused@4x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-hovered.png b/src/quickcontrols2/imagine/images/slider-handle-hovered.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/imports/controls/imagine/images/slider-handle-hovered.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-hovered.png
diff --git a/src/imports/controls/imagine/images/slider-handle-hovered@2x.png b/src/quickcontrols2/imagine/images/slider-handle-hovered@2x.png
index 451b719e60..451b719e60 100644
--- a/src/imports/controls/imagine/images/slider-handle-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-hovered@3x.png b/src/quickcontrols2/imagine/images/slider-handle-hovered@3x.png
index 1daffca729..1daffca729 100644
--- a/src/imports/controls/imagine/images/slider-handle-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-hovered@4x.png b/src/quickcontrols2/imagine/images/slider-handle-hovered@4x.png
index 6483070710..6483070710 100644
--- a/src/imports/controls/imagine/images/slider-handle-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-pressed.png b/src/quickcontrols2/imagine/images/slider-handle-pressed.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/imports/controls/imagine/images/slider-handle-pressed.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-pressed.png
diff --git a/src/imports/controls/imagine/images/slider-handle-pressed@2x.png b/src/quickcontrols2/imagine/images/slider-handle-pressed@2x.png
index 451b719e60..451b719e60 100644
--- a/src/imports/controls/imagine/images/slider-handle-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-pressed@3x.png b/src/quickcontrols2/imagine/images/slider-handle-pressed@3x.png
index 1daffca729..1daffca729 100644
--- a/src/imports/controls/imagine/images/slider-handle-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/slider-handle-pressed@4x.png b/src/quickcontrols2/imagine/images/slider-handle-pressed@4x.png
index 6483070710..6483070710 100644
--- a/src/imports/controls/imagine/images/slider-handle-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/slider-handle.png b/src/quickcontrols2/imagine/images/slider-handle.png
index fd72dedfb0..fd72dedfb0 100644
--- a/src/imports/controls/imagine/images/slider-handle.png
+++ b/src/quickcontrols2/imagine/images/slider-handle.png
diff --git a/src/imports/controls/imagine/images/slider-handle@2x.png b/src/quickcontrols2/imagine/images/slider-handle@2x.png
index 57eed9f8ae..57eed9f8ae 100644
--- a/src/imports/controls/imagine/images/slider-handle@2x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle@2x.png
diff --git a/src/imports/controls/imagine/images/slider-handle@3x.png b/src/quickcontrols2/imagine/images/slider-handle@3x.png
index e217a6444f..e217a6444f 100644
--- a/src/imports/controls/imagine/images/slider-handle@3x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle@3x.png
diff --git a/src/imports/controls/imagine/images/slider-handle@4x.png b/src/quickcontrols2/imagine/images/slider-handle@4x.png
index c212b59f55..c212b59f55 100644
--- a/src/imports/controls/imagine/images/slider-handle@4x.png
+++ b/src/quickcontrols2/imagine/images/slider-handle@4x.png
diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled.9.png b/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled.9.png
index 7f7e6b935a..7f7e6b935a 100644
--- a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@2x.9.png b/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@2x.9.png
index cbf6fb6352..cbf6fb6352 100644
--- a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@3x.9.png b/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@3x.9.png
index 643776b8c9..643776b8c9 100644
--- a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@4x.9.png b/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@4x.9.png
index d64acb904d..d64acb904d 100644
--- a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal.9.png b/src/quickcontrols2/imagine/images/slider-progress-horizontal.9.png
index 43192f5416..43192f5416 100644
--- a/src/imports/controls/imagine/images/slider-progress-horizontal.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-horizontal.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal@2x.9.png b/src/quickcontrols2/imagine/images/slider-progress-horizontal@2x.9.png
index ebbbbf82f8..ebbbbf82f8 100644
--- a/src/imports/controls/imagine/images/slider-progress-horizontal@2x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-horizontal@2x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal@3x.9.png b/src/quickcontrols2/imagine/images/slider-progress-horizontal@3x.9.png
index 0a029b53e4..0a029b53e4 100644
--- a/src/imports/controls/imagine/images/slider-progress-horizontal@3x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-horizontal@3x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal@4x.9.png b/src/quickcontrols2/imagine/images/slider-progress-horizontal@4x.9.png
index a13541691a..a13541691a 100644
--- a/src/imports/controls/imagine/images/slider-progress-horizontal@4x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-horizontal@4x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-vertical-disabled.9.png b/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled.9.png
index a4edafc971..a4edafc971 100644
--- a/src/imports/controls/imagine/images/slider-progress-vertical-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@2x.9.png b/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@2x.9.png
index 8c38226e61..8c38226e61 100644
--- a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@3x.9.png b/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@3x.9.png
index a939bffde8..a939bffde8 100644
--- a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@4x.9.png b/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@4x.9.png
index 9f653770e2..9f653770e2 100644
--- a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-vertical.9.png b/src/quickcontrols2/imagine/images/slider-progress-vertical.9.png
index d3e877fc34..d3e877fc34 100644
--- a/src/imports/controls/imagine/images/slider-progress-vertical.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-vertical.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-vertical@2x.9.png b/src/quickcontrols2/imagine/images/slider-progress-vertical@2x.9.png
index 7790050e64..7790050e64 100644
--- a/src/imports/controls/imagine/images/slider-progress-vertical@2x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-vertical@2x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-vertical@3x.9.png b/src/quickcontrols2/imagine/images/slider-progress-vertical@3x.9.png
index 039d198751..039d198751 100644
--- a/src/imports/controls/imagine/images/slider-progress-vertical@3x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-vertical@3x.9.png
diff --git a/src/imports/controls/imagine/images/slider-progress-vertical@4x.9.png b/src/quickcontrols2/imagine/images/slider-progress-vertical@4x.9.png
index b3051d1f46..b3051d1f46 100644
--- a/src/imports/controls/imagine/images/slider-progress-vertical@4x.9.png
+++ b/src/quickcontrols2/imagine/images/slider-progress-vertical@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-disabled.9.png b/src/quickcontrols2/imagine/images/spinbox-background-disabled.9.png
index 7baaeec525..7baaeec525 100644
--- a/src/imports/controls/imagine/images/spinbox-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-background-disabled@2x.9.png
index e0d5907034..e0d5907034 100644
--- a/src/imports/controls/imagine/images/spinbox-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-background-disabled@3x.9.png
index 24b3054ded..24b3054ded 100644
--- a/src/imports/controls/imagine/images/spinbox-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-background-disabled@4x.9.png
index 8ac4740a7b..8ac4740a7b 100644
--- a/src/imports/controls/imagine/images/spinbox-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-editable.9.png b/src/quickcontrols2/imagine/images/spinbox-background-editable.9.png
index 995c827659..995c827659 100644
--- a/src/imports/controls/imagine/images/spinbox-background-editable.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-editable.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-editable@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-background-editable@2x.9.png
index 42c9dd6ba2..42c9dd6ba2 100644
--- a/src/imports/controls/imagine/images/spinbox-background-editable@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-editable@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-editable@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-background-editable@3x.9.png
index 4ee974a144..4ee974a144 100644
--- a/src/imports/controls/imagine/images/spinbox-background-editable@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-editable@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-editable@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-background-editable@4x.9.png
index 59b0091539..59b0091539 100644
--- a/src/imports/controls/imagine/images/spinbox-background-editable@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-editable@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-focused.9.png b/src/quickcontrols2/imagine/images/spinbox-background-focused.9.png
index 27751eacc8..27751eacc8 100644
--- a/src/imports/controls/imagine/images/spinbox-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-background-focused@2x.9.png
index 1692578f6c..1692578f6c 100644
--- a/src/imports/controls/imagine/images/spinbox-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-background-focused@3x.9.png
index 4c44c1bbbc..4c44c1bbbc 100644
--- a/src/imports/controls/imagine/images/spinbox-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-background-focused@4x.9.png
index f8632bf2f8..f8632bf2f8 100644
--- a/src/imports/controls/imagine/images/spinbox-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background.9.png b/src/quickcontrols2/imagine/images/spinbox-background.9.png
index ae8b043beb..ae8b043beb 100644
--- a/src/imports/controls/imagine/images/spinbox-background.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-background@2x.9.png
index eaae097e2f..eaae097e2f 100644
--- a/src/imports/controls/imagine/images/spinbox-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-background@3x.9.png
index d8add8117c..d8add8117c 100644
--- a/src/imports/controls/imagine/images/spinbox-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-background@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-background@4x.9.png
index d954febfc2..d954febfc2 100644
--- a/src/imports/controls/imagine/images/spinbox-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled.9.png
index b3953398d8..b3953398d8 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@2x.9.png
index 18e2ca65d4..18e2ca65d4 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@3x.9.png
index ed6674b47b..ed6674b47b 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@4x.9.png
index 0da2cf93ff..0da2cf93ff 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused.9.png
index 46220a8ebe..46220a8ebe 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png
index b8ebb7b7eb..b8ebb7b7eb 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png
index 10561d8dbb..10561d8dbb 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png
index ccd09d69a5..ccd09d69a5 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered.9.png
index 46220a8ebe..46220a8ebe 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png
index b8ebb7b7eb..b8ebb7b7eb 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png
index 10561d8dbb..10561d8dbb 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png
index ccd09d69a5..ccd09d69a5 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png
index 23842de4e6..23842de4e6 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png
index e50789323a..e50789323a 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png
index 7edec0c9b3..7edec0c9b3 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png
index f6e5ff8201..f6e5ff8201 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png
index 23842de4e6..23842de4e6 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png
index e50789323a..e50789323a 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png
index 7edec0c9b3..7edec0c9b3 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png
index f6e5ff8201..f6e5ff8201 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png
index b6917a036b..b6917a036b 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png
index 8999d3e441..8999d3e441 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png
index 77aa004465..77aa004465 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png
index 4f2fd261ab..4f2fd261ab 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored.9.png
index 3c3da5b1a1..3c3da5b1a1 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png
index e0760e07cd..e0760e07cd 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png
index c37080f5b8..c37080f5b8 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png
index bdc248231a..bdc248231a 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed.9.png
index 65f2821bcd..65f2821bcd 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png
index 010dd9d0bb..010dd9d0bb 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png
index f647f489d2..f647f489d2 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png
index db0486d1fc..db0486d1fc 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable.9.png
index c3207f311b..c3207f311b 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@2x.9.png
index c8c2630e83..c8c2630e83 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@3x.9.png
index d0a6c81816..d0a6c81816 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@4x.9.png
index 40e897623b..40e897623b 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-focused.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused.9.png
index 6ad31bb0e2..6ad31bb0e2 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-focused.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@2x.9.png
index 6cc60b4b54..6cc60b4b54 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@3x.9.png
index 722c7ec708..722c7ec708 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@4x.9.png
index 64fa4ab6c0..64fa4ab6c0 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered.9.png
index 6ad31bb0e2..6ad31bb0e2 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@2x.9.png
index 6cc60b4b54..6cc60b4b54 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@3x.9.png
index 722c7ec708..722c7ec708 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@4x.9.png
index 64fa4ab6c0..64fa4ab6c0 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png
index ac7da20e65..ac7da20e65 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png
index a12f361535..a12f361535 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png
index de11317bc1..de11317bc1 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png
index 8be41f3898..8be41f3898 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused.9.png
index 6b6e526436..6b6e526436 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png
index e0c36da35d..e0c36da35d 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png
index ca2389dac4..ca2389dac4 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png
index 7e6c547419..7e6c547419 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png
index 6b6e526436..6b6e526436 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png
index e0c36da35d..e0c36da35d 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png
index ca2389dac4..ca2389dac4 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png
index 7e6c547419..7e6c547419 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png
index d756679feb..d756679feb 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png
index e49c7e8985..e49c7e8985 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png
index 6041ffdcc0..6041ffdcc0 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png
index e23dda155e..e23dda155e 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored.9.png
index 58be212032..58be212032 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@2x.9.png
index 709a1ab6c6..709a1ab6c6 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@3x.9.png
index ee5b5b8225..ee5b5b8225 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@4x.9.png
index 1e88d44dba..1e88d44dba 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed.9.png
index 9703314b47..9703314b47 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@2x.9.png
index 173eccfbe3..173eccfbe3 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@3x.9.png
index 77737c7593..77737c7593 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@4x.9.png
index 6a2bb865cb..6a2bb865cb 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down.9.png
index a6c9679a43..a6c9679a43 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down@2x.9.png
index bd14cdbbfc..bd14cdbbfc 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down@3x.9.png
index 02d18c1d8e..02d18c1d8e 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-down@4x.9.png
index 9ec1bf0459..9ec1bf0459 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-down@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-down@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled.9.png
index 5fe5ab6ad5..5fe5ab6ad5 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@2x.9.png
index f7a2a5d56d..f7a2a5d56d 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@3x.9.png
index 3244c93f14..3244c93f14 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@4x.9.png
index 8248200559..8248200559 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused.9.png
index d291c50a76..d291c50a76 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png
index 06e27b1b8e..06e27b1b8e 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png
index 34b4373558..34b4373558 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png
index 4a95cca469..4a95cca469 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered.9.png
index d291c50a76..d291c50a76 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png
index 06e27b1b8e..06e27b1b8e 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png
index 34b4373558..34b4373558 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png
index 4a95cca469..4a95cca469 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png
index a98d5a1d42..a98d5a1d42 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png
index 4b8458600a..4b8458600a 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png
index da241c07ae..da241c07ae 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png
index d1333671ff..d1333671ff 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png
index a98d5a1d42..a98d5a1d42 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png
index 4b8458600a..4b8458600a 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png
index da241c07ae..da241c07ae 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png
index d1333671ff..d1333671ff 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png
index 793e009d82..793e009d82 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png
index aca00c57c0..aca00c57c0 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png
index a49b95498c..a49b95498c 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png
index e0814f3be3..e0814f3be3 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored.9.png
index ac4c46d184..ac4c46d184 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png
index b1c335ee53..b1c335ee53 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png
index 3f0d9f2f25..3f0d9f2f25 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png
index cac6eca867..cac6eca867 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed.9.png
index 87a1ae7a9a..87a1ae7a9a 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png
index 95c5ea063d..95c5ea063d 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png
index 3ed6cddfb8..3ed6cddfb8 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png
index 8f5e3f02bd..8f5e3f02bd 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable.9.png
index b3cc7bea02..b3cc7bea02 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@2x.9.png
index 51313f5953..51313f5953 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@3x.9.png
index 8db540f593..8db540f593 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@4x.9.png
index 310400a2b5..310400a2b5 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-focused.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused.9.png
index d88bd00d22..d88bd00d22 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-focused.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@2x.9.png
index 77dbb52a6a..77dbb52a6a 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@3x.9.png
index 0739b1b173..0739b1b173 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@4x.9.png
index d53ee543e3..d53ee543e3 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered.9.png
index d88bd00d22..d88bd00d22 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@2x.9.png
index 77dbb52a6a..77dbb52a6a 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@3x.9.png
index 0739b1b173..0739b1b173 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@4x.9.png
index d53ee543e3..d53ee543e3 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png
index 53f6d7e59c..53f6d7e59c 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png
index 7c7bb214af..7c7bb214af 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png
index 5a69027cf3..5a69027cf3 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png
index fe2171a546..fe2171a546 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused.9.png
index cf31f93668..cf31f93668 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png
index 48b8861eac..48b8861eac 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png
index d6a417202b..d6a417202b 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png
index e0c7e374ad..e0c7e374ad 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png
index cf31f93668..cf31f93668 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png
index 48b8861eac..48b8861eac 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png
index d6a417202b..d6a417202b 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png
index e0c7e374ad..e0c7e374ad 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png
index 4548cddd91..4548cddd91 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png
index c5fb9d1b3d..c5fb9d1b3d 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png
index ffbe520a19..ffbe520a19 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png
index 784f9bee96..784f9bee96 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored.9.png
index f26794570d..f26794570d 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@2x.9.png
index 7f07e625ad..7f07e625ad 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@3x.9.png
index 0b060816ec..0b060816ec 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@4x.9.png
index df76dfcec1..df76dfcec1 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed.9.png
index cbba897fc4..cbba897fc4 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@2x.9.png
index a49e11fa4e..a49e11fa4e 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@3x.9.png
index 720e454326..720e454326 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@4x.9.png
index 46333e3df8..46333e3df8 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up.9.png
index 67cbe4345b..67cbe4345b 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up@2x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up@2x.9.png
index 8e804b8735..8e804b8735 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up@2x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up@2x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up@3x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up@3x.9.png
index 15baec74c8..15baec74c8 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up@3x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up@3x.9.png
diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up@4x.9.png b/src/quickcontrols2/imagine/images/spinbox-indicator-up@4x.9.png
index 7112de67e3..7112de67e3 100644
--- a/src/imports/controls/imagine/images/spinbox-indicator-up@4x.9.png
+++ b/src/quickcontrols2/imagine/images/spinbox-indicator-up@4x.9.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-disabled.png b/src/quickcontrols2/imagine/images/splitview-handle-disabled.png
index 8ab854b0a3..8ab854b0a3 100644
--- a/src/imports/controls/imagine/images/splitview-handle-disabled.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-disabled.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-disabled@2x.png b/src/quickcontrols2/imagine/images/splitview-handle-disabled@2x.png
index 325469b8d8..325469b8d8 100644
--- a/src/imports/controls/imagine/images/splitview-handle-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-disabled@3x.png b/src/quickcontrols2/imagine/images/splitview-handle-disabled@3x.png
index 5357e84783..5357e84783 100644
--- a/src/imports/controls/imagine/images/splitview-handle-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-disabled@4x.png b/src/quickcontrols2/imagine/images/splitview-handle-disabled@4x.png
index e215cf5b7a..e215cf5b7a 100644
--- a/src/imports/controls/imagine/images/splitview-handle-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-hovered.png b/src/quickcontrols2/imagine/images/splitview-handle-hovered.png
index 429d55081f..429d55081f 100644
--- a/src/imports/controls/imagine/images/splitview-handle-hovered.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-hovered.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-hovered@2x.png b/src/quickcontrols2/imagine/images/splitview-handle-hovered@2x.png
index 6f17b06ef3..6f17b06ef3 100644
--- a/src/imports/controls/imagine/images/splitview-handle-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-hovered@3x.png b/src/quickcontrols2/imagine/images/splitview-handle-hovered@3x.png
index 11dcfa261c..11dcfa261c 100644
--- a/src/imports/controls/imagine/images/splitview-handle-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-hovered@4x.png b/src/quickcontrols2/imagine/images/splitview-handle-hovered@4x.png
index 73963d754c..73963d754c 100644
--- a/src/imports/controls/imagine/images/splitview-handle-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-pressed.png b/src/quickcontrols2/imagine/images/splitview-handle-pressed.png
index 6e00db20e6..6e00db20e6 100644
--- a/src/imports/controls/imagine/images/splitview-handle-pressed.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-pressed.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-pressed@2x.png b/src/quickcontrols2/imagine/images/splitview-handle-pressed@2x.png
index e1392de62b..e1392de62b 100644
--- a/src/imports/controls/imagine/images/splitview-handle-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-pressed@3x.png b/src/quickcontrols2/imagine/images/splitview-handle-pressed@3x.png
index ff6a397f69..ff6a397f69 100644
--- a/src/imports/controls/imagine/images/splitview-handle-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle-pressed@4x.png b/src/quickcontrols2/imagine/images/splitview-handle-pressed@4x.png
index 278ba90007..278ba90007 100644
--- a/src/imports/controls/imagine/images/splitview-handle-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle.png b/src/quickcontrols2/imagine/images/splitview-handle.png
index 2b69cef6a3..2b69cef6a3 100644
--- a/src/imports/controls/imagine/images/splitview-handle.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle.png
diff --git a/src/imports/controls/imagine/images/splitview-handle@2x.png b/src/quickcontrols2/imagine/images/splitview-handle@2x.png
index cc3205f125..cc3205f125 100644
--- a/src/imports/controls/imagine/images/splitview-handle@2x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle@2x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle@3x.png b/src/quickcontrols2/imagine/images/splitview-handle@3x.png
index b8be2b4d8f..b8be2b4d8f 100644
--- a/src/imports/controls/imagine/images/splitview-handle@3x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle@3x.png
diff --git a/src/imports/controls/imagine/images/splitview-handle@4x.png b/src/quickcontrols2/imagine/images/splitview-handle@4x.png
index 3145295446..3145295446 100644
--- a/src/imports/controls/imagine/images/splitview-handle@4x.png
+++ b/src/quickcontrols2/imagine/images/splitview-handle@4x.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-disabled.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-disabled.9.png
index 23570729d6..23570729d6 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-focused.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-focused.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-highlighted.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted.9.png
index e79d8e1d01..e79d8e1d01 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-highlighted.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-highlighted@2x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@2x.9.png
index ea68d35fc4..ea68d35fc4 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-highlighted@2x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@2x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-highlighted@3x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@3x.9.png
index 6d61041599..6d61041599 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-highlighted@3x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@3x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-highlighted@4x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@4x.9.png
index 590cca96a1..590cca96a1 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-highlighted@4x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@4x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-hovered.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-hovered.9.png
index b8749743d0..b8749743d0 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-hovered.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-hovered@2x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-hovered@3x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-hovered@4x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-pressed.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-pressed.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-pressed.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-pressed@2x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-pressed@3x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background-pressed@4x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background.9.png
index b8749743d0..b8749743d0 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background@2x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background@3x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/swipedelegate-background@4x.9.png b/src/quickcontrols2/imagine/images/swipedelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/imports/controls/imagine/images/swipedelegate-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/swipedelegate-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/switch-handle-disabled.png b/src/quickcontrols2/imagine/images/switch-handle-disabled.png
index 595dd5465d..595dd5465d 100644
--- a/src/imports/controls/imagine/images/switch-handle-disabled.png
+++ b/src/quickcontrols2/imagine/images/switch-handle-disabled.png
diff --git a/src/imports/controls/imagine/images/switch-handle-disabled@2x.png b/src/quickcontrols2/imagine/images/switch-handle-disabled@2x.png
index 5be736aafa..5be736aafa 100644
--- a/src/imports/controls/imagine/images/switch-handle-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-handle-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/switch-handle-disabled@3x.png b/src/quickcontrols2/imagine/images/switch-handle-disabled@3x.png
index c8002ca3d9..c8002ca3d9 100644
--- a/src/imports/controls/imagine/images/switch-handle-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-handle-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/switch-handle-disabled@4x.png b/src/quickcontrols2/imagine/images/switch-handle-disabled@4x.png
index 00e70c1ba5..00e70c1ba5 100644
--- a/src/imports/controls/imagine/images/switch-handle-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-handle-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/switch-handle-pressed.png b/src/quickcontrols2/imagine/images/switch-handle-pressed.png
index 595dd5465d..595dd5465d 100644
--- a/src/imports/controls/imagine/images/switch-handle-pressed.png
+++ b/src/quickcontrols2/imagine/images/switch-handle-pressed.png
diff --git a/src/imports/controls/imagine/images/switch-handle-pressed@2x.png b/src/quickcontrols2/imagine/images/switch-handle-pressed@2x.png
index 5be736aafa..5be736aafa 100644
--- a/src/imports/controls/imagine/images/switch-handle-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-handle-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/switch-handle-pressed@3x.png b/src/quickcontrols2/imagine/images/switch-handle-pressed@3x.png
index c8002ca3d9..c8002ca3d9 100644
--- a/src/imports/controls/imagine/images/switch-handle-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-handle-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/switch-handle-pressed@4x.png b/src/quickcontrols2/imagine/images/switch-handle-pressed@4x.png
index 00e70c1ba5..00e70c1ba5 100644
--- a/src/imports/controls/imagine/images/switch-handle-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-handle-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/switch-handle.png b/src/quickcontrols2/imagine/images/switch-handle.png
index 15649c34c7..15649c34c7 100644
--- a/src/imports/controls/imagine/images/switch-handle.png
+++ b/src/quickcontrols2/imagine/images/switch-handle.png
diff --git a/src/imports/controls/imagine/images/switch-handle@2x.png b/src/quickcontrols2/imagine/images/switch-handle@2x.png
index 04f84ed920..04f84ed920 100644
--- a/src/imports/controls/imagine/images/switch-handle@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-handle@2x.png
diff --git a/src/imports/controls/imagine/images/switch-handle@3x.png b/src/quickcontrols2/imagine/images/switch-handle@3x.png
index e0cfb63718..e0cfb63718 100644
--- a/src/imports/controls/imagine/images/switch-handle@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-handle@3x.png
diff --git a/src/imports/controls/imagine/images/switch-handle@4x.png b/src/quickcontrols2/imagine/images/switch-handle@4x.png
index 73fa381a4a..73fa381a4a 100644
--- a/src/imports/controls/imagine/images/switch-handle@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-handle@4x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-focused.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-focused.png
index 7f5ba5dfc4..7f5ba5dfc4 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-focused.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-focused.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-focused@2x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@2x.png
index a0090df49f..a0090df49f 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@2x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-focused@3x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@3x.png
index 0c7e526459..0c7e526459 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@3x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-focused@4x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@4x.png
index 3a5e1d36ca..3a5e1d36ca 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@4x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-hovered.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered.png
index 7f5ba5dfc4..7f5ba5dfc4 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-hovered.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@2x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@2x.png
index a0090df49f..a0090df49f 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@3x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@3x.png
index 0c7e526459..0c7e526459 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@4x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@4x.png
index 3a5e1d36ca..3a5e1d36ca 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-pressed.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed.png
index ecbc552a17..ecbc552a17 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-pressed.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@2x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@2x.png
index 07fe7241d8..07fe7241d8 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@3x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@3x.png
index 8c65c27f4e..8c65c27f4e 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@4x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@4x.png
index f6a1e47658..f6a1e47658 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked.png b/src/quickcontrols2/imagine/images/switch-indicator-checked.png
index 2b7265cd0f..2b7265cd0f 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked@2x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked@2x.png
index 6ec88c7fc8..6ec88c7fc8 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked@2x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked@3x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked@3x.png
index 48c979856a..48c979856a 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked@3x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-checked@4x.png b/src/quickcontrols2/imagine/images/switch-indicator-checked@4x.png
index e9f81807da..e9f81807da 100644
--- a/src/imports/controls/imagine/images/switch-indicator-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-checked@4x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-disabled.png b/src/quickcontrols2/imagine/images/switch-indicator-disabled.png
index 9cfab79197..9cfab79197 100644
--- a/src/imports/controls/imagine/images/switch-indicator-disabled.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-disabled.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-disabled@2x.png b/src/quickcontrols2/imagine/images/switch-indicator-disabled@2x.png
index 3bbbb8dfbc..3bbbb8dfbc 100644
--- a/src/imports/controls/imagine/images/switch-indicator-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-disabled@3x.png b/src/quickcontrols2/imagine/images/switch-indicator-disabled@3x.png
index 80d9a74685..80d9a74685 100644
--- a/src/imports/controls/imagine/images/switch-indicator-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-disabled@4x.png b/src/quickcontrols2/imagine/images/switch-indicator-disabled@4x.png
index 9ee7bfabbc..9ee7bfabbc 100644
--- a/src/imports/controls/imagine/images/switch-indicator-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-focused.png b/src/quickcontrols2/imagine/images/switch-indicator-focused.png
index 4867bcac54..4867bcac54 100644
--- a/src/imports/controls/imagine/images/switch-indicator-focused.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-focused.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-focused@2x.png b/src/quickcontrols2/imagine/images/switch-indicator-focused@2x.png
index d833a0cdb4..d833a0cdb4 100644
--- a/src/imports/controls/imagine/images/switch-indicator-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-focused@2x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-focused@3x.png b/src/quickcontrols2/imagine/images/switch-indicator-focused@3x.png
index a632b6ae1c..a632b6ae1c 100644
--- a/src/imports/controls/imagine/images/switch-indicator-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-focused@3x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-focused@4x.png b/src/quickcontrols2/imagine/images/switch-indicator-focused@4x.png
index b5affab772..b5affab772 100644
--- a/src/imports/controls/imagine/images/switch-indicator-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-focused@4x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-hovered.png b/src/quickcontrols2/imagine/images/switch-indicator-hovered.png
index 4867bcac54..4867bcac54 100644
--- a/src/imports/controls/imagine/images/switch-indicator-hovered.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-hovered.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-hovered@2x.png b/src/quickcontrols2/imagine/images/switch-indicator-hovered@2x.png
index d833a0cdb4..d833a0cdb4 100644
--- a/src/imports/controls/imagine/images/switch-indicator-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-hovered@3x.png b/src/quickcontrols2/imagine/images/switch-indicator-hovered@3x.png
index a632b6ae1c..a632b6ae1c 100644
--- a/src/imports/controls/imagine/images/switch-indicator-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-hovered@4x.png b/src/quickcontrols2/imagine/images/switch-indicator-hovered@4x.png
index b5affab772..b5affab772 100644
--- a/src/imports/controls/imagine/images/switch-indicator-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-pressed.png b/src/quickcontrols2/imagine/images/switch-indicator-pressed.png
index 4fbbc060e8..4fbbc060e8 100644
--- a/src/imports/controls/imagine/images/switch-indicator-pressed.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-pressed.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-pressed@2x.png b/src/quickcontrols2/imagine/images/switch-indicator-pressed@2x.png
index 7939f943e5..7939f943e5 100644
--- a/src/imports/controls/imagine/images/switch-indicator-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-pressed@3x.png b/src/quickcontrols2/imagine/images/switch-indicator-pressed@3x.png
index adcbe45bb7..adcbe45bb7 100644
--- a/src/imports/controls/imagine/images/switch-indicator-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator-pressed@4x.png b/src/quickcontrols2/imagine/images/switch-indicator-pressed@4x.png
index 74c0c77e6f..74c0c77e6f 100644
--- a/src/imports/controls/imagine/images/switch-indicator-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator.png b/src/quickcontrols2/imagine/images/switch-indicator.png
index b6b4f1cd79..b6b4f1cd79 100644
--- a/src/imports/controls/imagine/images/switch-indicator.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator.png
diff --git a/src/imports/controls/imagine/images/switch-indicator@2x.png b/src/quickcontrols2/imagine/images/switch-indicator@2x.png
index bfeedeb720..bfeedeb720 100644
--- a/src/imports/controls/imagine/images/switch-indicator@2x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator@2x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator@3x.png b/src/quickcontrols2/imagine/images/switch-indicator@3x.png
index 19e5ba2ca7..19e5ba2ca7 100644
--- a/src/imports/controls/imagine/images/switch-indicator@3x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator@3x.png
diff --git a/src/imports/controls/imagine/images/switch-indicator@4x.png b/src/quickcontrols2/imagine/images/switch-indicator@4x.png
index 9345cd4fdb..9345cd4fdb 100644
--- a/src/imports/controls/imagine/images/switch-indicator@4x.png
+++ b/src/quickcontrols2/imagine/images/switch-indicator@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-disabled.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-disabled.9.png
index 23570729d6..23570729d6 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-focused.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-focused.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-hovered.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-hovered.9.png
index b8749743d0..b8749743d0 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-hovered.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-hovered@2x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-hovered@3x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-hovered@4x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-pressed.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-pressed.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-pressed.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-pressed@2x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-pressed@3x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background-pressed@4x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background.9.png
index b8749743d0..b8749743d0 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background@2x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background@3x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-background@4x.9.png b/src/quickcontrols2/imagine/images/switchdelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/imports/controls/imagine/images/switchdelegate-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-disabled.png b/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled.png
index 595dd5465d..595dd5465d 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle-disabled.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@2x.png
index 5be736aafa..5be736aafa 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@3x.png
index c8002ca3d9..c8002ca3d9 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@4x.png
index 00e70c1ba5..00e70c1ba5 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-pressed.png b/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed.png
index 595dd5465d..595dd5465d 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle-pressed.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-pressed@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@2x.png
index 5be736aafa..5be736aafa 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-pressed@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@3x.png
index c8002ca3d9..c8002ca3d9 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-pressed@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@4x.png
index 00e70c1ba5..00e70c1ba5 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle.png b/src/quickcontrols2/imagine/images/switchdelegate-handle.png
index 15649c34c7..15649c34c7 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-handle@2x.png
index 04f84ed920..04f84ed920 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-handle@3x.png
index e0cfb63718..e0cfb63718 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-handle@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-handle@4x.png
index 73fa381a4a..73fa381a4a 100644
--- a/src/imports/controls/imagine/images/switchdelegate-handle@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-handle@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused.png
index 7f5ba5dfc4..7f5ba5dfc4 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@2x.png
index a0090df49f..a0090df49f 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@3x.png
index 0c7e526459..0c7e526459 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@4x.png
index 3a5e1d36ca..3a5e1d36ca 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered.png
index 7f5ba5dfc4..7f5ba5dfc4 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@2x.png
index a0090df49f..a0090df49f 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@3x.png
index 0c7e526459..0c7e526459 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@4x.png
index 3a5e1d36ca..3a5e1d36ca 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed.png
index ecbc552a17..ecbc552a17 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@2x.png
index 07fe7241d8..07fe7241d8 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@3x.png
index 8c65c27f4e..8c65c27f4e 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@4x.png
index f6a1e47658..f6a1e47658 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked.png
index 2b7265cd0f..2b7265cd0f 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@2x.png
index 6ec88c7fc8..6ec88c7fc8 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@3x.png
index 48c979856a..48c979856a 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@4x.png
index e9f81807da..e9f81807da 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled.png
index 9cfab79197..9cfab79197 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@2x.png
index 3bbbb8dfbc..3bbbb8dfbc 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@3x.png
index 80d9a74685..80d9a74685 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@4x.png
index 9ee7bfabbc..9ee7bfabbc 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-focused.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused.png
index 4867bcac54..4867bcac54 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-focused.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@2x.png
index d833a0cdb4..d833a0cdb4 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@3x.png
index a632b6ae1c..a632b6ae1c 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@4x.png
index b5affab772..b5affab772 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered.png
index 4867bcac54..4867bcac54 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@2x.png
index d833a0cdb4..d833a0cdb4 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@3x.png
index a632b6ae1c..a632b6ae1c 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@4x.png
index b5affab772..b5affab772 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed.png
index 4fbbc060e8..4fbbc060e8 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@2x.png
index 7939f943e5..7939f943e5 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@3x.png
index adcbe45bb7..adcbe45bb7 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@4x.png
index 74c0c77e6f..74c0c77e6f 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@4x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator.png
index b6b4f1cd79..b6b4f1cd79 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator@2x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator@2x.png
index bfeedeb720..bfeedeb720 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator@2x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator@2x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator@3x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator@3x.png
index 19e5ba2ca7..19e5ba2ca7 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator@3x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator@3x.png
diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator@4x.png b/src/quickcontrols2/imagine/images/switchdelegate-indicator@4x.png
index 9345cd4fdb..9345cd4fdb 100644
--- a/src/imports/controls/imagine/images/switchdelegate-indicator@4x.png
+++ b/src/quickcontrols2/imagine/images/switchdelegate-indicator@4x.png
diff --git a/src/imports/controls/imagine/images/tabbar-background.png b/src/quickcontrols2/imagine/images/tabbar-background.png
index 002efdedde..002efdedde 100644
--- a/src/imports/controls/imagine/images/tabbar-background.png
+++ b/src/quickcontrols2/imagine/images/tabbar-background.png
diff --git a/src/imports/controls/imagine/images/tabbar-background@2x.png b/src/quickcontrols2/imagine/images/tabbar-background@2x.png
index aaa1cbaf4b..aaa1cbaf4b 100644
--- a/src/imports/controls/imagine/images/tabbar-background@2x.png
+++ b/src/quickcontrols2/imagine/images/tabbar-background@2x.png
diff --git a/src/imports/controls/imagine/images/tabbar-background@3x.png b/src/quickcontrols2/imagine/images/tabbar-background@3x.png
index c4eb9e1f02..c4eb9e1f02 100644
--- a/src/imports/controls/imagine/images/tabbar-background@3x.png
+++ b/src/quickcontrols2/imagine/images/tabbar-background@3x.png
diff --git a/src/imports/controls/imagine/images/tabbar-background@4x.png b/src/quickcontrols2/imagine/images/tabbar-background@4x.png
index 4a4e234a6a..4a4e234a6a 100644
--- a/src/imports/controls/imagine/images/tabbar-background@4x.png
+++ b/src/quickcontrols2/imagine/images/tabbar-background@4x.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-checked.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-checked.9.png
index d2f0fa76a6..d2f0fa76a6 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-checked.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-checked.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-checked@2x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-checked@2x.9.png
index bee1329202..bee1329202 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-checked@2x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-checked@2x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-checked@3x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-checked@3x.9.png
index 70afb7d337..70afb7d337 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-checked@3x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-checked@3x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-checked@4x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-checked@4x.9.png
index 3a2015c464..3a2015c464 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-checked@4x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-checked@4x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked.9.png
index a6d3011bd9..a6d3011bd9 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@2x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@2x.9.png
index 8ebfa02686..8ebfa02686 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@2x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@2x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@3x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@3x.9.png
index 1d5a1d5149..1d5a1d5149 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@3x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@3x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@4x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@4x.9.png
index f06dc55f9b..f06dc55f9b 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@4x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@4x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-disabled.9.png
index a6d3011bd9..a6d3011bd9 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-disabled@2x.9.png
index 8ebfa02686..8ebfa02686 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-disabled@3x.9.png
index 1d5a1d5149..1d5a1d5149 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-disabled@4x.9.png
index f06dc55f9b..f06dc55f9b 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-hovered.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-hovered.9.png
index 3f945184f8..3f945184f8 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-hovered.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-hovered@2x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-hovered@2x.9.png
index 8a19720a2a..8a19720a2a 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-hovered@3x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-hovered@3x.9.png
index eadcf45714..eadcf45714 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-hovered@4x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-hovered@4x.9.png
index 8bf8e992aa..8bf8e992aa 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-pressed.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-pressed.9.png
index d48733ed81..d48733ed81 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-pressed.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-pressed@2x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-pressed@2x.9.png
index fbbaad7bec..fbbaad7bec 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-pressed@3x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-pressed@3x.9.png
index 3a0ba70e63..3a0ba70e63 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background-pressed@4x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background-pressed@4x.9.png
index c04f124e5e..c04f124e5e 100644
--- a/src/imports/controls/imagine/images/tabbutton-background-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background.9.png b/src/quickcontrols2/imagine/images/tabbutton-background.9.png
index 2266c72223..2266c72223 100644
--- a/src/imports/controls/imagine/images/tabbutton-background.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background@2x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background@2x.9.png
index b7adb7adc3..b7adb7adc3 100644
--- a/src/imports/controls/imagine/images/tabbutton-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background@3x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background@3x.9.png
index d8f4eae55f..d8f4eae55f 100644
--- a/src/imports/controls/imagine/images/tabbutton-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/tabbutton-background@4x.9.png b/src/quickcontrols2/imagine/images/tabbutton-background@4x.9.png
index 066d35b38c..066d35b38c 100644
--- a/src/imports/controls/imagine/images/tabbutton-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/tabbutton-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background-disabled.9.png b/src/quickcontrols2/imagine/images/textarea-background-disabled.9.png
index 97d48f8c00..97d48f8c00 100644
--- a/src/imports/controls/imagine/images/textarea-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/textarea-background-disabled@2x.9.png
index f9ea1d49dd..f9ea1d49dd 100644
--- a/src/imports/controls/imagine/images/textarea-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/textarea-background-disabled@3x.9.png
index 04e7ef6f07..04e7ef6f07 100644
--- a/src/imports/controls/imagine/images/textarea-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/textarea-background-disabled@4x.9.png
index feaaa3bcbc..feaaa3bcbc 100644
--- a/src/imports/controls/imagine/images/textarea-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background-focused.9.png b/src/quickcontrols2/imagine/images/textarea-background-focused.9.png
index 1d73acfa0a..1d73acfa0a 100644
--- a/src/imports/controls/imagine/images/textarea-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/textarea-background-focused@2x.9.png
index 5be4cd6f8c..5be4cd6f8c 100644
--- a/src/imports/controls/imagine/images/textarea-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/textarea-background-focused@3x.9.png
index 6ba3e24610..6ba3e24610 100644
--- a/src/imports/controls/imagine/images/textarea-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/textarea-background-focused@4x.9.png
index 366aa5112f..366aa5112f 100644
--- a/src/imports/controls/imagine/images/textarea-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background.9.png b/src/quickcontrols2/imagine/images/textarea-background.9.png
index 0b9ca9f3ec..0b9ca9f3ec 100644
--- a/src/imports/controls/imagine/images/textarea-background.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background@2x.9.png b/src/quickcontrols2/imagine/images/textarea-background@2x.9.png
index a806ed1b11..a806ed1b11 100644
--- a/src/imports/controls/imagine/images/textarea-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background@3x.9.png b/src/quickcontrols2/imagine/images/textarea-background@3x.9.png
index 547ef33c41..547ef33c41 100644
--- a/src/imports/controls/imagine/images/textarea-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/textarea-background@4x.9.png b/src/quickcontrols2/imagine/images/textarea-background@4x.9.png
index b759b1e80b..b759b1e80b 100644
--- a/src/imports/controls/imagine/images/textarea-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/textarea-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background-disabled.9.png b/src/quickcontrols2/imagine/images/textfield-background-disabled.9.png
index 312a1294d1..312a1294d1 100644
--- a/src/imports/controls/imagine/images/textfield-background-disabled.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background-disabled.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background-disabled@2x.9.png b/src/quickcontrols2/imagine/images/textfield-background-disabled@2x.9.png
index 2c6c7e9165..2c6c7e9165 100644
--- a/src/imports/controls/imagine/images/textfield-background-disabled@2x.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background-disabled@2x.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background-disabled@3x.9.png b/src/quickcontrols2/imagine/images/textfield-background-disabled@3x.9.png
index 1d1aca7177..1d1aca7177 100644
--- a/src/imports/controls/imagine/images/textfield-background-disabled@3x.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background-disabled@3x.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background-disabled@4x.9.png b/src/quickcontrols2/imagine/images/textfield-background-disabled@4x.9.png
index ed93182a70..ed93182a70 100644
--- a/src/imports/controls/imagine/images/textfield-background-disabled@4x.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background-disabled@4x.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background-focused.9.png b/src/quickcontrols2/imagine/images/textfield-background-focused.9.png
index 1251f4e4cc..1251f4e4cc 100644
--- a/src/imports/controls/imagine/images/textfield-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/textfield-background-focused@2x.9.png
index d535e8bc98..d535e8bc98 100644
--- a/src/imports/controls/imagine/images/textfield-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/textfield-background-focused@3x.9.png
index 9fca3bb239..9fca3bb239 100644
--- a/src/imports/controls/imagine/images/textfield-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/textfield-background-focused@4x.9.png
index a275a52e89..a275a52e89 100644
--- a/src/imports/controls/imagine/images/textfield-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background.9.png b/src/quickcontrols2/imagine/images/textfield-background.9.png
index 7ea6096880..7ea6096880 100644
--- a/src/imports/controls/imagine/images/textfield-background.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background@2x.9.png b/src/quickcontrols2/imagine/images/textfield-background@2x.9.png
index 0a4c3f2a9f..0a4c3f2a9f 100644
--- a/src/imports/controls/imagine/images/textfield-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background@3x.9.png b/src/quickcontrols2/imagine/images/textfield-background@3x.9.png
index e855274187..e855274187 100644
--- a/src/imports/controls/imagine/images/textfield-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/textfield-background@4x.9.png b/src/quickcontrols2/imagine/images/textfield-background@4x.9.png
index 29ef5bb9d2..29ef5bb9d2 100644
--- a/src/imports/controls/imagine/images/textfield-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/textfield-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/toolbar-background.png b/src/quickcontrols2/imagine/images/toolbar-background.png
index 9c67cf2702..9c67cf2702 100644
--- a/src/imports/controls/imagine/images/toolbar-background.png
+++ b/src/quickcontrols2/imagine/images/toolbar-background.png
diff --git a/src/imports/controls/imagine/images/toolbar-background@2x.png b/src/quickcontrols2/imagine/images/toolbar-background@2x.png
index b0602519a7..b0602519a7 100644
--- a/src/imports/controls/imagine/images/toolbar-background@2x.png
+++ b/src/quickcontrols2/imagine/images/toolbar-background@2x.png
diff --git a/src/imports/controls/imagine/images/toolbar-background@3x.png b/src/quickcontrols2/imagine/images/toolbar-background@3x.png
index 7f227ca343..7f227ca343 100644
--- a/src/imports/controls/imagine/images/toolbar-background@3x.png
+++ b/src/quickcontrols2/imagine/images/toolbar-background@3x.png
diff --git a/src/imports/controls/imagine/images/toolbar-background@4x.png b/src/quickcontrols2/imagine/images/toolbar-background@4x.png
index 4788ecc743..4788ecc743 100644
--- a/src/imports/controls/imagine/images/toolbar-background@4x.png
+++ b/src/quickcontrols2/imagine/images/toolbar-background@4x.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-focused.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused.9.png
index 287a2872de..287a2872de 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked-focused.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@2x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@3x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@4x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered.9.png
index 287a2872de..287a2872de 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@2x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@3x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@4x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked.9.png
index 287a2872de..287a2872de 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked@2x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked@2x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked@2x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked@3x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked@3x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked@3x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked@4x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-checked@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-checked@4x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-checked@4x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked.9.png
index 287a2872de..287a2872de 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@2x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@2x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@2x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@3x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@3x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@3x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@4x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@4x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@4x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-focused.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-focused.9.png
index 287a2872de..287a2872de 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-focused.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-focused.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-focused@2x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-focused@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-focused@2x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-focused@2x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-focused@3x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-focused@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-focused@3x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-focused@3x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-focused@4x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-focused@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-focused@4x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-focused@4x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-hovered.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-hovered.9.png
index 287a2872de..287a2872de 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-hovered.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-hovered.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-hovered@2x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-hovered@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-hovered@2x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-hovered@2x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-hovered@3x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-hovered@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-hovered@3x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-hovered@3x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-hovered@4x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-hovered@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-hovered@4x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-hovered@4x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-pressed.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-pressed.9.png
index 287a2872de..287a2872de 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-pressed.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-pressed.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-pressed@2x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-pressed@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-pressed@2x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-pressed@2x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-pressed@3x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-pressed@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-pressed@3x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-pressed@3x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background-pressed@4x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background-pressed@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/imports/controls/imagine/images/toolbutton-background-pressed@4x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background-pressed@4x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background.9.png b/src/quickcontrols2/imagine/images/toolbutton-background.9.png
index 5a72a62128..5a72a62128 100644
--- a/src/imports/controls/imagine/images/toolbutton-background.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background@2x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background@2x.9.png
index 688a071a84..688a071a84 100644
--- a/src/imports/controls/imagine/images/toolbutton-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background@3x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background@3x.9.png
index 64375a7e5b..64375a7e5b 100644
--- a/src/imports/controls/imagine/images/toolbutton-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/toolbutton-background@4x.9.png b/src/quickcontrols2/imagine/images/toolbutton-background@4x.9.png
index 96004a103c..96004a103c 100644
--- a/src/imports/controls/imagine/images/toolbutton-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/toolbutton-background@4x.9.png
diff --git a/src/imports/controls/imagine/images/toolseparator-separator-horizontal.9.png b/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal.9.png
index 75e3e66229..75e3e66229 100644
--- a/src/imports/controls/imagine/images/toolseparator-separator-horizontal.9.png
+++ b/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal.9.png
diff --git a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@2x.9.png b/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@2x.9.png
index 3662dec944..3662dec944 100644
--- a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@2x.9.png
+++ b/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@2x.9.png
diff --git a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@3x.9.png b/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@3x.9.png
index 2771470175..2771470175 100644
--- a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@3x.9.png
+++ b/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@3x.9.png
diff --git a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@4x.9.png b/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@4x.9.png
index deeda9f5fd..deeda9f5fd 100644
--- a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@4x.9.png
+++ b/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@4x.9.png
diff --git a/src/imports/controls/imagine/images/toolseparator-separator-vertical.9.png b/src/quickcontrols2/imagine/images/toolseparator-separator-vertical.9.png
index 5b607aaf5c..5b607aaf5c 100644
--- a/src/imports/controls/imagine/images/toolseparator-separator-vertical.9.png
+++ b/src/quickcontrols2/imagine/images/toolseparator-separator-vertical.9.png
diff --git a/src/imports/controls/imagine/images/toolseparator-separator-vertical@2x.9.png b/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@2x.9.png
index f5a11e0467..f5a11e0467 100644
--- a/src/imports/controls/imagine/images/toolseparator-separator-vertical@2x.9.png
+++ b/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@2x.9.png
diff --git a/src/imports/controls/imagine/images/toolseparator-separator-vertical@3x.9.png b/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@3x.9.png
index c957280f37..c957280f37 100644
--- a/src/imports/controls/imagine/images/toolseparator-separator-vertical@3x.9.png
+++ b/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@3x.9.png
diff --git a/src/imports/controls/imagine/images/toolseparator-separator-vertical@4x.9.png b/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@4x.9.png
index c888689df7..c888689df7 100644
--- a/src/imports/controls/imagine/images/toolseparator-separator-vertical@4x.9.png
+++ b/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@4x.9.png
diff --git a/src/imports/controls/imagine/images/tooltip-background.9.png b/src/quickcontrols2/imagine/images/tooltip-background.9.png
index 2e0dc67c3e..2e0dc67c3e 100644
--- a/src/imports/controls/imagine/images/tooltip-background.9.png
+++ b/src/quickcontrols2/imagine/images/tooltip-background.9.png
diff --git a/src/imports/controls/imagine/images/tooltip-background@2x.9.png b/src/quickcontrols2/imagine/images/tooltip-background@2x.9.png
index dd5609982f..dd5609982f 100644
--- a/src/imports/controls/imagine/images/tooltip-background@2x.9.png
+++ b/src/quickcontrols2/imagine/images/tooltip-background@2x.9.png
diff --git a/src/imports/controls/imagine/images/tooltip-background@3x.9.png b/src/quickcontrols2/imagine/images/tooltip-background@3x.9.png
index fed465427e..fed465427e 100644
--- a/src/imports/controls/imagine/images/tooltip-background@3x.9.png
+++ b/src/quickcontrols2/imagine/images/tooltip-background@3x.9.png
diff --git a/src/imports/controls/imagine/images/tooltip-background@4x.9.png b/src/quickcontrols2/imagine/images/tooltip-background@4x.9.png
index 9bc964908f..9bc964908f 100644
--- a/src/imports/controls/imagine/images/tooltip-background@4x.9.png
+++ b/src/quickcontrols2/imagine/images/tooltip-background@4x.9.png
diff --git a/src/imports/controls/imagine/imagine.pri b/src/quickcontrols2/imagine/imagine.pri
index 134aa2c34e..134aa2c34e 100644
--- a/src/imports/controls/imagine/imagine.pri
+++ b/src/quickcontrols2/imagine/imagine.pri
diff --git a/src/imports/controls/imagine/impl/CMakeLists.txt b/src/quickcontrols2/imagine/impl/CMakeLists.txt
index 61d5390738..f69bc5a5b1 100644
--- a/src/imports/controls/imagine/impl/CMakeLists.txt
+++ b/src/quickcontrols2/imagine/impl/CMakeLists.txt
@@ -1,19 +1,25 @@
-# Generated from imagine-impl.pro.
-
 #####################################################################
 ## qtquickcontrols2imaginestyleimplplugin Plugin:
 #####################################################################
 
+set(qml_files
+    "OpacityMask.qml"
+)
+set_source_files_properties(OpacityMask.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "6.0"
+)
+
 qt_internal_add_qml_module(qtquickcontrols2imaginestyleimplplugin
     URI "QtQuick.Controls.Imagine.impl"
     VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2ImagineStyleImplPlugin
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
+    CLASS_NAME QtQuickControls2ImagineStyleImplPlugin
+    PLUGIN_TARGET qtquickcontrols2imaginestyleimplplugin
+    NO_PLUGIN_OPTIONAL
     SOURCES
         qquickimageselector.cpp qquickimageselector_p.h
         qquickninepatchimage.cpp qquickninepatchimage_p.h
-        qtquickcontrols2imaginestyleimplplugin.cpp
+    QML_FILES
+        ${qml_files}
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
@@ -32,37 +38,15 @@ qt_internal_add_qml_module(qtquickcontrols2imaginestyleimplplugin
 )
 
 # Resources:
-set(qmake_qtquickcontrols2imaginestyleimpl_resource_files
+set(qmake_qtquickcontrols2imaginestyleimplplugin_resource_files
     "shaders/+glslcore/OpacityMask.frag"
     "shaders/+qsb/OpacityMask.frag"
     "shaders/OpacityMask.frag"
 )
 
-qt_internal_add_resource(qtquickcontrols2imaginestyleimplplugin "qmake_qtquickcontrols2imaginestyleimpl"
+qt_internal_add_resource(qtquickcontrols2imaginestyleimplplugin "qmake_qtquickcontrols2imaginestyleimplplugin"
     PREFIX
         "qt-project.org/imports/QtQuick/Controls/Imagine/impl"
     FILES
-        ${qmake_qtquickcontrols2imaginestyleimpl_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:imagine-impl.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_FILES = "$$PWD/OpacityMask.qml"
-# QML_IMPORT_NAME = "QtQuick.Controls.Imagine.impl"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# QT_FOR_CONFIG = "quickcontrols2-private"
-# TARGETPATH = "QtQuick/Controls/Imagine/impl"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-imagine)"
-
-set(qml_files
-    "OpacityMask.qml"
-)
-set_source_files_properties(OpacityMask.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "6.0"
-)
-
-qt6_target_qml_files(qtquickcontrols2imaginestyleimplplugin
-    FILES
-        ${qml_files}
+        ${qmake_qtquickcontrols2imaginestyleimplplugin_resource_files}
 )
diff --git a/src/imports/controls/imagine/impl/OpacityMask.qml b/src/quickcontrols2/imagine/impl/OpacityMask.qml
index 26663a1b53..26663a1b53 100644
--- a/src/imports/controls/imagine/impl/OpacityMask.qml
+++ b/src/quickcontrols2/imagine/impl/OpacityMask.qml
diff --git a/src/imports/controls/imagine/impl/qquickimageselector.cpp b/src/quickcontrols2/imagine/impl/qquickimageselector.cpp
index dcb7738c4f..dcb7738c4f 100644
--- a/src/imports/controls/imagine/impl/qquickimageselector.cpp
+++ b/src/quickcontrols2/imagine/impl/qquickimageselector.cpp
diff --git a/src/imports/controls/imagine/impl/qquickimageselector_p.h b/src/quickcontrols2/imagine/impl/qquickimageselector_p.h
index 351caefbef..351caefbef 100644
--- a/src/imports/controls/imagine/impl/qquickimageselector_p.h
+++ b/src/quickcontrols2/imagine/impl/qquickimageselector_p.h
diff --git a/src/imports/controls/imagine/impl/qquickninepatchimage.cpp b/src/quickcontrols2/imagine/impl/qquickninepatchimage.cpp
index 66404ba4cd..66404ba4cd 100644
--- a/src/imports/controls/imagine/impl/qquickninepatchimage.cpp
+++ b/src/quickcontrols2/imagine/impl/qquickninepatchimage.cpp
diff --git a/src/imports/controls/imagine/impl/qquickninepatchimage_p.h b/src/quickcontrols2/imagine/impl/qquickninepatchimage_p.h
index 78cc306885..78cc306885 100644
--- a/src/imports/controls/imagine/impl/qquickninepatchimage_p.h
+++ b/src/quickcontrols2/imagine/impl/qquickninepatchimage_p.h
diff --git a/src/imports/controls/imagine/impl/shaders/+glslcore/OpacityMask.frag b/src/quickcontrols2/imagine/impl/shaders/+glslcore/OpacityMask.frag
index 529e269614..529e269614 100644
--- a/src/imports/controls/imagine/impl/shaders/+glslcore/OpacityMask.frag
+++ b/src/quickcontrols2/imagine/impl/shaders/+glslcore/OpacityMask.frag
diff --git a/src/imports/controls/imagine/impl/shaders/+qsb/OpacityMask.frag b/src/quickcontrols2/imagine/impl/shaders/+qsb/OpacityMask.frag
index 331b30b807..331b30b807 100644
--- a/src/imports/controls/imagine/impl/shaders/+qsb/OpacityMask.frag
+++ b/src/quickcontrols2/imagine/impl/shaders/+qsb/OpacityMask.frag
diff --git a/src/imports/controls/imagine/impl/shaders/OpacityMask.frag b/src/quickcontrols2/imagine/impl/shaders/OpacityMask.frag
index 84f9bc3ee6..84f9bc3ee6 100644
--- a/src/imports/controls/imagine/impl/shaders/OpacityMask.frag
+++ b/src/quickcontrols2/imagine/impl/shaders/OpacityMask.frag
diff --git a/src/imports/controls/imagine/impl/shaders/OpacityMask_rhi.frag b/src/quickcontrols2/imagine/impl/shaders/OpacityMask_rhi.frag
index 9ae3249978..9ae3249978 100644
--- a/src/imports/controls/imagine/impl/shaders/OpacityMask_rhi.frag
+++ b/src/quickcontrols2/imagine/impl/shaders/OpacityMask_rhi.frag
diff --git a/src/imports/controls/imagine/impl/shaders/compile.bat b/src/quickcontrols2/imagine/impl/shaders/compile.bat
index 8f16d7acf0..8f16d7acf0 100644
--- a/src/imports/controls/imagine/impl/shaders/compile.bat
+++ b/src/quickcontrols2/imagine/impl/shaders/compile.bat
diff --git a/src/imports/controls/imagine/qquickimaginestyle.cpp b/src/quickcontrols2/imagine/qquickimaginestyle.cpp
index 37e55b6121..37e55b6121 100644
--- a/src/imports/controls/imagine/qquickimaginestyle.cpp
+++ b/src/quickcontrols2/imagine/qquickimaginestyle.cpp
diff --git a/src/imports/controls/imagine/qquickimaginestyle_p.h b/src/quickcontrols2/imagine/qquickimaginestyle_p.h
index 212096b93b..212096b93b 100644
--- a/src/imports/controls/imagine/qquickimaginestyle_p.h
+++ b/src/quickcontrols2/imagine/qquickimaginestyle_p.h
diff --git a/src/imports/controls/imagine/qquickimaginetheme.cpp b/src/quickcontrols2/imagine/qquickimaginetheme.cpp
index 7bae036a83..7bae036a83 100644
--- a/src/imports/controls/imagine/qquickimaginetheme.cpp
+++ b/src/quickcontrols2/imagine/qquickimaginetheme.cpp
diff --git a/src/imports/controls/imagine/qquickimaginetheme_p.h b/src/quickcontrols2/imagine/qquickimaginetheme_p.h
index d3d43074af..d3d43074af 100644
--- a/src/imports/controls/imagine/qquickimaginetheme_p.h
+++ b/src/quickcontrols2/imagine/qquickimaginetheme_p.h
diff --git a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp b/src/quickcontrols2/imagine/qtquickcontrols2imaginestyleplugin.cpp
index bc885cfda1..bc885cfda1 100644
--- a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp
+++ b/src/quickcontrols2/imagine/qtquickcontrols2imaginestyleplugin.cpp
diff --git a/src/imports/controls/macos/Button.qml b/src/quickcontrols2/macos/Button.qml
index 58658c526f..58658c526f 100644
--- a/src/imports/controls/macos/Button.qml
+++ b/src/quickcontrols2/macos/Button.qml
diff --git a/src/quickcontrols2/macos/CMakeLists.txt b/src/quickcontrols2/macos/CMakeLists.txt
new file mode 100644
index 0000000000..05640ac5c7
--- /dev/null
+++ b/src/quickcontrols2/macos/CMakeLists.txt
@@ -0,0 +1,56 @@
+#####################################################################
+## qtquickcontrols2macosstyleplugin Plugin:
+#####################################################################
+
+set(qml_files
+    "Button.qml"
+    "Slider.qml"
+    "GroupBox.qml"
+    "CheckBox.qml"
+    "RadioButton.qml"
+    "SpinBox.qml"
+    "TextField.qml"
+    "Frame.qml"
+    "TextArea.qml"
+    "ComboBox.qml"
+    "ScrollView.qml"
+    "ScrollBar.qml"
+    "ProgressBar.qml"
+    "Dial.qml"
+)
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SOURCE_VERSION "2.0;6.0"
+)
+
+qt_internal_add_qml_module(qtquickcontrols2macosstyleplugin
+    URI "QtQuick.Controls.macOS"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickControls2MacOSStylePlugin
+    IMPORTS
+        QtQuick.Controls.Fusion/auto
+    PAST_MAJOR_VERSIONS 2
+    PLUGIN_TARGET qtquickcontrols2macosstyleplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
+    SOURCES
+        qtquickcontrols2macosstyleplugin.cpp
+    QML_FILES
+        ${qml_files}
+    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
+        Qt::QuickControls2
+        Qt::QuickTemplates2
+)
diff --git a/src/imports/controls/macos/CheckBox.qml b/src/quickcontrols2/macos/CheckBox.qml
index 23ad442634..23ad442634 100644
--- a/src/imports/controls/macos/CheckBox.qml
+++ b/src/quickcontrols2/macos/CheckBox.qml
diff --git a/src/imports/controls/macos/ComboBox.qml b/src/quickcontrols2/macos/ComboBox.qml
index 53baabf8b6..53baabf8b6 100644
--- a/src/imports/controls/macos/ComboBox.qml
+++ b/src/quickcontrols2/macos/ComboBox.qml
diff --git a/src/imports/controls/macos/Dial.qml b/src/quickcontrols2/macos/Dial.qml
index 2076a54ad6..2076a54ad6 100644
--- a/src/imports/controls/macos/Dial.qml
+++ b/src/quickcontrols2/macos/Dial.qml
diff --git a/src/imports/controls/macos/Frame.qml b/src/quickcontrols2/macos/Frame.qml
index f16a083517..f16a083517 100644
--- a/src/imports/controls/macos/Frame.qml
+++ b/src/quickcontrols2/macos/Frame.qml
diff --git a/src/imports/controls/macos/GroupBox.qml b/src/quickcontrols2/macos/GroupBox.qml
index 142ddd15ed..142ddd15ed 100644
--- a/src/imports/controls/macos/GroupBox.qml
+++ b/src/quickcontrols2/macos/GroupBox.qml
diff --git a/src/imports/controls/macos/ProgressBar.qml b/src/quickcontrols2/macos/ProgressBar.qml
index 59a1689dba..59a1689dba 100644
--- a/src/imports/controls/macos/ProgressBar.qml
+++ b/src/quickcontrols2/macos/ProgressBar.qml
diff --git a/src/imports/controls/macos/RadioButton.qml b/src/quickcontrols2/macos/RadioButton.qml
index c9cdf9850c..c9cdf9850c 100644
--- a/src/imports/controls/macos/RadioButton.qml
+++ b/src/quickcontrols2/macos/RadioButton.qml
diff --git a/src/imports/controls/macos/ScrollBar.qml b/src/quickcontrols2/macos/ScrollBar.qml
index 4a9f764b2a..4a9f764b2a 100644
--- a/src/imports/controls/macos/ScrollBar.qml
+++ b/src/quickcontrols2/macos/ScrollBar.qml
diff --git a/src/imports/controls/macos/ScrollView.qml b/src/quickcontrols2/macos/ScrollView.qml
index 954c5d8aed..954c5d8aed 100644
--- a/src/imports/controls/macos/ScrollView.qml
+++ b/src/quickcontrols2/macos/ScrollView.qml
diff --git a/src/imports/controls/macos/Slider.qml b/src/quickcontrols2/macos/Slider.qml
index 77543577d6..77543577d6 100644
--- a/src/imports/controls/macos/Slider.qml
+++ b/src/quickcontrols2/macos/Slider.qml
diff --git a/src/imports/controls/macos/SpinBox.qml b/src/quickcontrols2/macos/SpinBox.qml
index 5928d37eb5..5928d37eb5 100644
--- a/src/imports/controls/macos/SpinBox.qml
+++ b/src/quickcontrols2/macos/SpinBox.qml
diff --git a/src/imports/controls/macos/TextArea.qml b/src/quickcontrols2/macos/TextArea.qml
index f6b883038b..f6b883038b 100644
--- a/src/imports/controls/macos/TextArea.qml
+++ b/src/quickcontrols2/macos/TextArea.qml
diff --git a/src/imports/controls/macos/TextField.qml b/src/quickcontrols2/macos/TextField.qml
index f3a748f604..f3a748f604 100644
--- a/src/imports/controls/macos/TextField.qml
+++ b/src/quickcontrols2/macos/TextField.qml
diff --git a/src/imports/controls/macos/macos.pri b/src/quickcontrols2/macos/macos.pri
index d059151e2d..d059151e2d 100644
--- a/src/imports/controls/macos/macos.pri
+++ b/src/quickcontrols2/macos/macos.pri
diff --git a/src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp b/src/quickcontrols2/macos/qtquickcontrols2macosstyleplugin.cpp
index 9a4fd0ce2b..9a4fd0ce2b 100644
--- a/src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp
+++ b/src/quickcontrols2/macos/qtquickcontrols2macosstyleplugin.cpp
diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/quickcontrols2/material/ApplicationWindow.qml
index 82a0da8b3a..82a0da8b3a 100644
--- a/src/imports/controls/material/ApplicationWindow.qml
+++ b/src/quickcontrols2/material/ApplicationWindow.qml
diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/quickcontrols2/material/BusyIndicator.qml
index 621b2b434a..621b2b434a 100644
--- a/src/imports/controls/material/BusyIndicator.qml
+++ b/src/quickcontrols2/material/BusyIndicator.qml
diff --git a/src/imports/controls/material/Button.qml b/src/quickcontrols2/material/Button.qml
index 352eebeca0..352eebeca0 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/quickcontrols2/material/Button.qml
diff --git a/src/imports/controls/material/CMakeLists.txt b/src/quickcontrols2/material/CMakeLists.txt
index 286f25b893..2962385ede 100644
--- a/src/imports/controls/material/CMakeLists.txt
+++ b/src/quickcontrols2/material/CMakeLists.txt
@@ -1,74 +1,7 @@
-# Generated from material.pro.
-
 #####################################################################
 ## qtquickcontrols2materialstyleplugin Plugin:
 #####################################################################
 
-qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin
-    URI "QtQuick.Controls.Material"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2MaterialStylePlugin
-    IMPORTS
-        QtQuick.Controls.Basic/auto
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
-    SOURCES
-        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::QuickControls2ImplPrivate
-        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"
-)
-
-qt_internal_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin"
-    PREFIX
-        "/qt-project.org/imports/QtQuick/Controls/Material"
-    FILES
-        ${qtquickcontrols2materialstyleplugin_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:material.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.Material"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls/Material"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-material)"
-
 set(qml_files
     "ApplicationWindow.qml"
     "BusyIndicator.qml"
@@ -276,7 +209,59 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
 
-qt6_target_qml_files(qtquickcontrols2materialstyleplugin
-    FILES
+qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin
+    URI "QtQuick.Controls.Material"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickControls2MaterialStylePlugin
+    IMPORTS
+        QtQuick.Controls.Basic/auto
+    PLUGIN_TARGET qtquickcontrols2materialstyleplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
+    SOURCES
+        qquickmaterialstyle.cpp qquickmaterialstyle_p.h
+        qquickmaterialtheme.cpp qquickmaterialtheme_p.h
+        qtquickcontrols2materialstyleplugin.cpp
+    QML_FILES
         ${qml_files}
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2ImplPrivate
+        Qt::QuickControls2Private
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
+
+qt_internal_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin"
+    PREFIX
+        "/qt-project.org/imports/QtQuick/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/+qsb/RectangularGlow.frag"
+        "shaders/RectangularGlow.frag"
 )
+
+add_subdirectory(impl)
diff --git a/src/imports/controls/material/CheckBox.qml b/src/quickcontrols2/material/CheckBox.qml
index a3f717be6a..a3f717be6a 100644
--- a/src/imports/controls/material/CheckBox.qml
+++ b/src/quickcontrols2/material/CheckBox.qml
diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/quickcontrols2/material/CheckDelegate.qml
index ea42d6661f..ea42d6661f 100644
--- a/src/imports/controls/material/CheckDelegate.qml
+++ b/src/quickcontrols2/material/CheckDelegate.qml
diff --git a/src/imports/controls/material/ComboBox.qml b/src/quickcontrols2/material/ComboBox.qml
index 15f4c1addf..15f4c1addf 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/quickcontrols2/material/ComboBox.qml
diff --git a/src/imports/controls/material/DelayButton.qml b/src/quickcontrols2/material/DelayButton.qml
index d35df35c23..d35df35c23 100644
--- a/src/imports/controls/material/DelayButton.qml
+++ b/src/quickcontrols2/material/DelayButton.qml
diff --git a/src/imports/controls/material/Dial.qml b/src/quickcontrols2/material/Dial.qml
index 2731436f60..2731436f60 100644
--- a/src/imports/controls/material/Dial.qml
+++ b/src/quickcontrols2/material/Dial.qml
diff --git a/src/imports/controls/material/Dialog.qml b/src/quickcontrols2/material/Dialog.qml
index 1cb7f8c186..1cb7f8c186 100644
--- a/src/imports/controls/material/Dialog.qml
+++ b/src/quickcontrols2/material/Dialog.qml
diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/quickcontrols2/material/DialogButtonBox.qml
index e32fa81264..e32fa81264 100644
--- a/src/imports/controls/material/DialogButtonBox.qml
+++ b/src/quickcontrols2/material/DialogButtonBox.qml
diff --git a/src/imports/controls/material/Drawer.qml b/src/quickcontrols2/material/Drawer.qml
index 93c4bf5698..93c4bf5698 100644
--- a/src/imports/controls/material/Drawer.qml
+++ b/src/quickcontrols2/material/Drawer.qml
diff --git a/src/imports/controls/material/Frame.qml b/src/quickcontrols2/material/Frame.qml
index 8626f7661a..8626f7661a 100644
--- a/src/imports/controls/material/Frame.qml
+++ b/src/quickcontrols2/material/Frame.qml
diff --git a/src/imports/controls/material/GroupBox.qml b/src/quickcontrols2/material/GroupBox.qml
index 4a27b83241..4a27b83241 100644
--- a/src/imports/controls/material/GroupBox.qml
+++ b/src/quickcontrols2/material/GroupBox.qml
diff --git a/src/imports/controls/material/HorizontalHeaderView.qml b/src/quickcontrols2/material/HorizontalHeaderView.qml
index d2608c76bc..d2608c76bc 100644
--- a/src/imports/controls/material/HorizontalHeaderView.qml
+++ b/src/quickcontrols2/material/HorizontalHeaderView.qml
diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/quickcontrols2/material/ItemDelegate.qml
index 7d06b05bb9..7d06b05bb9 100644
--- a/src/imports/controls/material/ItemDelegate.qml
+++ b/src/quickcontrols2/material/ItemDelegate.qml
diff --git a/src/imports/controls/material/LICENSE_ANGULARJS.txt b/src/quickcontrols2/material/LICENSE_ANGULARJS.txt
index c1f2a826bb..c1f2a826bb 100644
--- a/src/imports/controls/material/LICENSE_ANGULARJS.txt
+++ b/src/quickcontrols2/material/LICENSE_ANGULARJS.txt
diff --git a/src/imports/controls/material/Label.qml b/src/quickcontrols2/material/Label.qml
index 77e85f4297..77e85f4297 100644
--- a/src/imports/controls/material/Label.qml
+++ b/src/quickcontrols2/material/Label.qml
diff --git a/src/imports/controls/material/Menu.qml b/src/quickcontrols2/material/Menu.qml
index b7e80c92ef..b7e80c92ef 100644
--- a/src/imports/controls/material/Menu.qml
+++ b/src/quickcontrols2/material/Menu.qml
diff --git a/src/imports/controls/material/MenuBar.qml b/src/quickcontrols2/material/MenuBar.qml
index a0c3bd3fc5..a0c3bd3fc5 100644
--- a/src/imports/controls/material/MenuBar.qml
+++ b/src/quickcontrols2/material/MenuBar.qml
diff --git a/src/imports/controls/material/MenuBarItem.qml b/src/quickcontrols2/material/MenuBarItem.qml
index f1d4e87d8a..f1d4e87d8a 100644
--- a/src/imports/controls/material/MenuBarItem.qml
+++ b/src/quickcontrols2/material/MenuBarItem.qml
diff --git a/src/imports/controls/material/MenuItem.qml b/src/quickcontrols2/material/MenuItem.qml
index fab2de2696..fab2de2696 100644
--- a/src/imports/controls/material/MenuItem.qml
+++ b/src/quickcontrols2/material/MenuItem.qml
diff --git a/src/imports/controls/material/MenuSeparator.qml b/src/quickcontrols2/material/MenuSeparator.qml
index 08a33ffe15..08a33ffe15 100644
--- a/src/imports/controls/material/MenuSeparator.qml
+++ b/src/quickcontrols2/material/MenuSeparator.qml
diff --git a/src/imports/controls/material/Page.qml b/src/quickcontrols2/material/Page.qml
index 711fac2ddb..711fac2ddb 100644
--- a/src/imports/controls/material/Page.qml
+++ b/src/quickcontrols2/material/Page.qml
diff --git a/src/imports/controls/material/PageIndicator.qml b/src/quickcontrols2/material/PageIndicator.qml
index 8ccd7de3ab..8ccd7de3ab 100644
--- a/src/imports/controls/material/PageIndicator.qml
+++ b/src/quickcontrols2/material/PageIndicator.qml
diff --git a/src/imports/controls/material/Pane.qml b/src/quickcontrols2/material/Pane.qml
index 055a8d236d..055a8d236d 100644
--- a/src/imports/controls/material/Pane.qml
+++ b/src/quickcontrols2/material/Pane.qml
diff --git a/src/imports/controls/material/Popup.qml b/src/quickcontrols2/material/Popup.qml
index cb5b62ece7..cb5b62ece7 100644
--- a/src/imports/controls/material/Popup.qml
+++ b/src/quickcontrols2/material/Popup.qml
diff --git a/src/imports/controls/material/ProgressBar.qml b/src/quickcontrols2/material/ProgressBar.qml
index dd4fae0e36..dd4fae0e36 100644
--- a/src/imports/controls/material/ProgressBar.qml
+++ b/src/quickcontrols2/material/ProgressBar.qml
diff --git a/src/imports/controls/material/RadioButton.qml b/src/quickcontrols2/material/RadioButton.qml
index 664cb19ecd..664cb19ecd 100644
--- a/src/imports/controls/material/RadioButton.qml
+++ b/src/quickcontrols2/material/RadioButton.qml
diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/quickcontrols2/material/RadioDelegate.qml
index 334e570bbf..334e570bbf 100644
--- a/src/imports/controls/material/RadioDelegate.qml
+++ b/src/quickcontrols2/material/RadioDelegate.qml
diff --git a/src/imports/controls/material/RangeSlider.qml b/src/quickcontrols2/material/RangeSlider.qml
index d1d22115aa..d1d22115aa 100644
--- a/src/imports/controls/material/RangeSlider.qml
+++ b/src/quickcontrols2/material/RangeSlider.qml
diff --git a/src/imports/controls/material/RoundButton.qml b/src/quickcontrols2/material/RoundButton.qml
index f93f2425f9..f93f2425f9 100644
--- a/src/imports/controls/material/RoundButton.qml
+++ b/src/quickcontrols2/material/RoundButton.qml
diff --git a/src/imports/controls/material/ScrollBar.qml b/src/quickcontrols2/material/ScrollBar.qml
index 55de0d13d1..55de0d13d1 100644
--- a/src/imports/controls/material/ScrollBar.qml
+++ b/src/quickcontrols2/material/ScrollBar.qml
diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/quickcontrols2/material/ScrollIndicator.qml
index bc81c630ee..bc81c630ee 100644
--- a/src/imports/controls/material/ScrollIndicator.qml
+++ b/src/quickcontrols2/material/ScrollIndicator.qml
diff --git a/src/imports/controls/material/ScrollView.qml b/src/quickcontrols2/material/ScrollView.qml
index a6bba9de05..a6bba9de05 100644
--- a/src/imports/controls/material/ScrollView.qml
+++ b/src/quickcontrols2/material/ScrollView.qml
diff --git a/src/imports/controls/material/Slider.qml b/src/quickcontrols2/material/Slider.qml
index 2a36673434..2a36673434 100644
--- a/src/imports/controls/material/Slider.qml
+++ b/src/quickcontrols2/material/Slider.qml
diff --git a/src/imports/controls/material/SpinBox.qml b/src/quickcontrols2/material/SpinBox.qml
index 4f69dd2512..4f69dd2512 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/quickcontrols2/material/SpinBox.qml
diff --git a/src/imports/controls/material/SplitView.qml b/src/quickcontrols2/material/SplitView.qml
index 95556cd091..95556cd091 100644
--- a/src/imports/controls/material/SplitView.qml
+++ b/src/quickcontrols2/material/SplitView.qml
diff --git a/src/imports/controls/material/StackView.qml b/src/quickcontrols2/material/StackView.qml
index 4c3e6749ac..4c3e6749ac 100644
--- a/src/imports/controls/material/StackView.qml
+++ b/src/quickcontrols2/material/StackView.qml
diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/quickcontrols2/material/SwipeDelegate.qml
index c7aff94a54..c7aff94a54 100644
--- a/src/imports/controls/material/SwipeDelegate.qml
+++ b/src/quickcontrols2/material/SwipeDelegate.qml
diff --git a/src/imports/controls/material/SwipeView.qml b/src/quickcontrols2/material/SwipeView.qml
index cd4da229c2..cd4da229c2 100644
--- a/src/imports/controls/material/SwipeView.qml
+++ b/src/quickcontrols2/material/SwipeView.qml
diff --git a/src/imports/controls/material/Switch.qml b/src/quickcontrols2/material/Switch.qml
index a43e87309b..a43e87309b 100644
--- a/src/imports/controls/material/Switch.qml
+++ b/src/quickcontrols2/material/Switch.qml
diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/quickcontrols2/material/SwitchDelegate.qml
index fd7b7ab01e..fd7b7ab01e 100644
--- a/src/imports/controls/material/SwitchDelegate.qml
+++ b/src/quickcontrols2/material/SwitchDelegate.qml
diff --git a/src/imports/controls/material/TabBar.qml b/src/quickcontrols2/material/TabBar.qml
index 9e9585f31b..9e9585f31b 100644
--- a/src/imports/controls/material/TabBar.qml
+++ b/src/quickcontrols2/material/TabBar.qml
diff --git a/src/imports/controls/material/TabButton.qml b/src/quickcontrols2/material/TabButton.qml
index bae0cdb80a..bae0cdb80a 100644
--- a/src/imports/controls/material/TabButton.qml
+++ b/src/quickcontrols2/material/TabButton.qml
diff --git a/src/imports/controls/material/TextArea.qml b/src/quickcontrols2/material/TextArea.qml
index a213bd7ab0..a213bd7ab0 100644
--- a/src/imports/controls/material/TextArea.qml
+++ b/src/quickcontrols2/material/TextArea.qml
diff --git a/src/imports/controls/material/TextField.qml b/src/quickcontrols2/material/TextField.qml
index 8623ddf5f2..8623ddf5f2 100644
--- a/src/imports/controls/material/TextField.qml
+++ b/src/quickcontrols2/material/TextField.qml
diff --git a/src/imports/controls/material/ToolBar.qml b/src/quickcontrols2/material/ToolBar.qml
index a1aa82bda5..a1aa82bda5 100644
--- a/src/imports/controls/material/ToolBar.qml
+++ b/src/quickcontrols2/material/ToolBar.qml
diff --git a/src/imports/controls/material/ToolButton.qml b/src/quickcontrols2/material/ToolButton.qml
index be7ae332be..be7ae332be 100644
--- a/src/imports/controls/material/ToolButton.qml
+++ b/src/quickcontrols2/material/ToolButton.qml
diff --git a/src/imports/controls/material/ToolSeparator.qml b/src/quickcontrols2/material/ToolSeparator.qml
index 4bce553d1e..4bce553d1e 100644
--- a/src/imports/controls/material/ToolSeparator.qml
+++ b/src/quickcontrols2/material/ToolSeparator.qml
diff --git a/src/imports/controls/material/ToolTip.qml b/src/quickcontrols2/material/ToolTip.qml
index 033e48a3fa..033e48a3fa 100644
--- a/src/imports/controls/material/ToolTip.qml
+++ b/src/quickcontrols2/material/ToolTip.qml
diff --git a/src/imports/controls/material/Tumbler.qml b/src/quickcontrols2/material/Tumbler.qml
index 2c1e5d66c2..2c1e5d66c2 100644
--- a/src/imports/controls/material/Tumbler.qml
+++ b/src/quickcontrols2/material/Tumbler.qml
diff --git a/src/imports/controls/material/VerticalHeaderView.qml b/src/quickcontrols2/material/VerticalHeaderView.qml
index 9769627ea5..9769627ea5 100644
--- a/src/imports/controls/material/VerticalHeaderView.qml
+++ b/src/quickcontrols2/material/VerticalHeaderView.qml
diff --git a/src/imports/controls/material/images/arrow-indicator.png b/src/quickcontrols2/material/images/arrow-indicator.png
index 5a9780015b..5a9780015b 100644
--- a/src/imports/controls/material/images/arrow-indicator.png
+++ b/src/quickcontrols2/material/images/arrow-indicator.png
diff --git a/src/imports/controls/material/images/arrow-indicator.svg b/src/quickcontrols2/material/images/arrow-indicator.svg
index 1e7217c855..1e7217c855 100644
--- a/src/imports/controls/material/images/arrow-indicator.svg
+++ b/src/quickcontrols2/material/images/arrow-indicator.svg
diff --git a/src/imports/controls/material/images/arrow-indicator@2x.png b/src/quickcontrols2/material/images/arrow-indicator@2x.png
index 37ce3a957e..37ce3a957e 100644
--- a/src/imports/controls/material/images/arrow-indicator@2x.png
+++ b/src/quickcontrols2/material/images/arrow-indicator@2x.png
diff --git a/src/imports/controls/material/images/arrow-indicator@3x.png b/src/quickcontrols2/material/images/arrow-indicator@3x.png
index 57abd97295..57abd97295 100644
--- a/src/imports/controls/material/images/arrow-indicator@3x.png
+++ b/src/quickcontrols2/material/images/arrow-indicator@3x.png
diff --git a/src/imports/controls/material/images/arrow-indicator@4x.png b/src/quickcontrols2/material/images/arrow-indicator@4x.png
index 26d3d7c1f1..26d3d7c1f1 100644
--- a/src/imports/controls/material/images/arrow-indicator@4x.png
+++ b/src/quickcontrols2/material/images/arrow-indicator@4x.png
diff --git a/src/imports/controls/material/images/check.png b/src/quickcontrols2/material/images/check.png
index 756a43a579..756a43a579 100644
--- a/src/imports/controls/material/images/check.png
+++ b/src/quickcontrols2/material/images/check.png
diff --git a/src/imports/controls/material/images/check@2x.png b/src/quickcontrols2/material/images/check@2x.png
index 9d1d6a32b6..9d1d6a32b6 100644
--- a/src/imports/controls/material/images/check@2x.png
+++ b/src/quickcontrols2/material/images/check@2x.png
diff --git a/src/imports/controls/material/images/check@3x.png b/src/quickcontrols2/material/images/check@3x.png
index 32ed72f017..32ed72f017 100644
--- a/src/imports/controls/material/images/check@3x.png
+++ b/src/quickcontrols2/material/images/check@3x.png
diff --git a/src/imports/controls/material/images/check@4x.png b/src/quickcontrols2/material/images/check@4x.png
index 1767cee617..1767cee617 100644
--- a/src/imports/controls/material/images/check@4x.png
+++ b/src/quickcontrols2/material/images/check@4x.png
diff --git a/src/imports/controls/material/images/drop-indicator.png b/src/quickcontrols2/material/images/drop-indicator.png
index 93560f507a..93560f507a 100644
--- a/src/imports/controls/material/images/drop-indicator.png
+++ b/src/quickcontrols2/material/images/drop-indicator.png
diff --git a/src/imports/controls/material/images/drop-indicator.svg b/src/quickcontrols2/material/images/drop-indicator.svg
index 94b5ca1514..94b5ca1514 100644
--- a/src/imports/controls/material/images/drop-indicator.svg
+++ b/src/quickcontrols2/material/images/drop-indicator.svg
diff --git a/src/imports/controls/material/images/drop-indicator@2x.png b/src/quickcontrols2/material/images/drop-indicator@2x.png
index d32f81604c..d32f81604c 100644
--- a/src/imports/controls/material/images/drop-indicator@2x.png
+++ b/src/quickcontrols2/material/images/drop-indicator@2x.png
diff --git a/src/imports/controls/material/images/drop-indicator@3x.png b/src/quickcontrols2/material/images/drop-indicator@3x.png
index 34c3e7d115..34c3e7d115 100644
--- a/src/imports/controls/material/images/drop-indicator@3x.png
+++ b/src/quickcontrols2/material/images/drop-indicator@3x.png
diff --git a/src/imports/controls/material/images/drop-indicator@4x.png b/src/quickcontrols2/material/images/drop-indicator@4x.png
index 0613f6dd0d..0613f6dd0d 100644
--- a/src/imports/controls/material/images/drop-indicator@4x.png
+++ b/src/quickcontrols2/material/images/drop-indicator@4x.png
diff --git a/src/imports/controls/material/impl/BoxShadow.qml b/src/quickcontrols2/material/impl/BoxShadow.qml
index ea09570e7a..ea09570e7a 100644
--- a/src/imports/controls/material/impl/BoxShadow.qml
+++ b/src/quickcontrols2/material/impl/BoxShadow.qml
diff --git a/src/quickcontrols2/material/impl/CMakeLists.txt b/src/quickcontrols2/material/impl/CMakeLists.txt
new file mode 100644
index 0000000000..315081d0be
--- /dev/null
+++ b/src/quickcontrols2/material/impl/CMakeLists.txt
@@ -0,0 +1,46 @@
+#####################################################################
+## qtquickcontrols2materialstyleimplplugin Plugin:
+#####################################################################
+
+set(qml_files
+    "BoxShadow.qml"
+    "CheckIndicator.qml"
+    "CursorDelegate.qml"
+    "ElevationEffect.qml"
+    "RadioIndicator.qml"
+    "RectangularGlow.qml"
+    "SliderHandle.qml"
+    "SwitchIndicator.qml"
+)
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SOURCE_VERSION "2.0"
+)
+
+qt_internal_add_qml_module(qtquickcontrols2materialstyleimplplugin
+    URI "QtQuick.Controls.Material.impl"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickControls2MaterialStyleImplPlugin
+    PLUGIN_TARGET qtquickcontrols2materialstyleimplplugin
+    NO_PLUGIN_OPTIONAL
+    SOURCES
+        qquickmaterialbusyindicator.cpp qquickmaterialbusyindicator_p.h
+        qquickmaterialprogressbar.cpp qquickmaterialprogressbar_p.h
+        qquickmaterialripple.cpp qquickmaterialripple_p.h
+    QML_FILES
+        ${qml_files}
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::QmlPrivate
+        Qt::QuickControls2ImplPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
diff --git a/src/imports/controls/material/impl/CheckIndicator.qml b/src/quickcontrols2/material/impl/CheckIndicator.qml
index b6593fab8a..b6593fab8a 100644
--- a/src/imports/controls/material/impl/CheckIndicator.qml
+++ b/src/quickcontrols2/material/impl/CheckIndicator.qml
diff --git a/src/imports/controls/material/impl/CursorDelegate.qml b/src/quickcontrols2/material/impl/CursorDelegate.qml
index a913ab849d..a913ab849d 100644
--- a/src/imports/controls/material/impl/CursorDelegate.qml
+++ b/src/quickcontrols2/material/impl/CursorDelegate.qml
diff --git a/src/imports/controls/material/impl/ElevationEffect.qml b/src/quickcontrols2/material/impl/ElevationEffect.qml
index 8a4e98e320..8a4e98e320 100644
--- a/src/imports/controls/material/impl/ElevationEffect.qml
+++ b/src/quickcontrols2/material/impl/ElevationEffect.qml
diff --git a/src/imports/controls/material/impl/RadioIndicator.qml b/src/quickcontrols2/material/impl/RadioIndicator.qml
index 68681c44fb..68681c44fb 100644
--- a/src/imports/controls/material/impl/RadioIndicator.qml
+++ b/src/quickcontrols2/material/impl/RadioIndicator.qml
diff --git a/src/imports/controls/material/impl/RectangularGlow.qml b/src/quickcontrols2/material/impl/RectangularGlow.qml
index b2337afc0b..b2337afc0b 100644
--- a/src/imports/controls/material/impl/RectangularGlow.qml
+++ b/src/quickcontrols2/material/impl/RectangularGlow.qml
diff --git a/src/imports/controls/material/impl/SliderHandle.qml b/src/quickcontrols2/material/impl/SliderHandle.qml
index 60fd7aedf9..60fd7aedf9 100644
--- a/src/imports/controls/material/impl/SliderHandle.qml
+++ b/src/quickcontrols2/material/impl/SliderHandle.qml
diff --git a/src/imports/controls/material/impl/SwitchIndicator.qml b/src/quickcontrols2/material/impl/SwitchIndicator.qml
index ae1709b6e1..ae1709b6e1 100644
--- a/src/imports/controls/material/impl/SwitchIndicator.qml
+++ b/src/quickcontrols2/material/impl/SwitchIndicator.qml
diff --git a/src/imports/controls/material/impl/qquickmaterialbusyindicator.cpp b/src/quickcontrols2/material/impl/qquickmaterialbusyindicator.cpp
index 10bcc03560..10bcc03560 100644
--- a/src/imports/controls/material/impl/qquickmaterialbusyindicator.cpp
+++ b/src/quickcontrols2/material/impl/qquickmaterialbusyindicator.cpp
diff --git a/src/imports/controls/material/impl/qquickmaterialbusyindicator_p.h b/src/quickcontrols2/material/impl/qquickmaterialbusyindicator_p.h
index 72aeaf66f1..72aeaf66f1 100644
--- a/src/imports/controls/material/impl/qquickmaterialbusyindicator_p.h
+++ b/src/quickcontrols2/material/impl/qquickmaterialbusyindicator_p.h
diff --git a/src/imports/controls/material/impl/qquickmaterialprogressbar.cpp b/src/quickcontrols2/material/impl/qquickmaterialprogressbar.cpp
index 8b3dde23c9..8b3dde23c9 100644
--- a/src/imports/controls/material/impl/qquickmaterialprogressbar.cpp
+++ b/src/quickcontrols2/material/impl/qquickmaterialprogressbar.cpp
diff --git a/src/imports/controls/material/impl/qquickmaterialprogressbar_p.h b/src/quickcontrols2/material/impl/qquickmaterialprogressbar_p.h
index bf93812d08..bf93812d08 100644
--- a/src/imports/controls/material/impl/qquickmaterialprogressbar_p.h
+++ b/src/quickcontrols2/material/impl/qquickmaterialprogressbar_p.h
diff --git a/src/imports/controls/material/impl/qquickmaterialripple.cpp b/src/quickcontrols2/material/impl/qquickmaterialripple.cpp
index a39a115bc3..a39a115bc3 100644
--- a/src/imports/controls/material/impl/qquickmaterialripple.cpp
+++ b/src/quickcontrols2/material/impl/qquickmaterialripple.cpp
diff --git a/src/imports/controls/material/impl/qquickmaterialripple_p.h b/src/quickcontrols2/material/impl/qquickmaterialripple_p.h
index 517283896a..517283896a 100644
--- a/src/imports/controls/material/impl/qquickmaterialripple_p.h
+++ b/src/quickcontrols2/material/impl/qquickmaterialripple_p.h
diff --git a/src/imports/controls/material/material.pri b/src/quickcontrols2/material/material.pri
index 9eb14233de..9eb14233de 100644
--- a/src/imports/controls/material/material.pri
+++ b/src/quickcontrols2/material/material.pri
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/quickcontrols2/material/qquickmaterialstyle.cpp
index d70728a051..d70728a051 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/quickcontrols2/material/qquickmaterialstyle.cpp
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/quickcontrols2/material/qquickmaterialstyle_p.h
index 56cf141c57..56cf141c57 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/quickcontrols2/material/qquickmaterialstyle_p.h
diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/quickcontrols2/material/qquickmaterialtheme.cpp
index aec9e23233..aec9e23233 100644
--- a/src/imports/controls/material/qquickmaterialtheme.cpp
+++ b/src/quickcontrols2/material/qquickmaterialtheme.cpp
diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/quickcontrols2/material/qquickmaterialtheme_p.h
index 9a1362b81c..9a1362b81c 100644
--- a/src/imports/controls/material/qquickmaterialtheme_p.h
+++ b/src/quickcontrols2/material/qquickmaterialtheme_p.h
diff --git a/src/imports/controls/material/qt_attribution.json b/src/quickcontrols2/material/qt_attribution.json
index 85fdadf9e0..85fdadf9e0 100644
--- a/src/imports/controls/material/qt_attribution.json
+++ b/src/quickcontrols2/material/qt_attribution.json
diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/quickcontrols2/material/qtquickcontrols2materialstyleplugin.cpp
index c8e7ebbc3d..c8e7ebbc3d 100644
--- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
+++ b/src/quickcontrols2/material/qtquickcontrols2materialstyleplugin.cpp
diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.qrc b/src/quickcontrols2/material/qtquickcontrols2materialstyleplugin.qrc
index 981960c440..981960c440 100644
--- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.qrc
+++ b/src/quickcontrols2/material/qtquickcontrols2materialstyleplugin.qrc
diff --git a/src/imports/controls/material/shaders/+glslcore/RectangularGlow.frag b/src/quickcontrols2/material/shaders/+glslcore/RectangularGlow.frag
index 432d86b5d5..432d86b5d5 100644
--- a/src/imports/controls/material/shaders/+glslcore/RectangularGlow.frag
+++ b/src/quickcontrols2/material/shaders/+glslcore/RectangularGlow.frag
diff --git a/src/imports/controls/material/shaders/+hlsl/RectangularGlow.frag b/src/quickcontrols2/material/shaders/+hlsl/RectangularGlow.frag
index 69d9f852fb..69d9f852fb 100644
--- a/src/imports/controls/material/shaders/+hlsl/RectangularGlow.frag
+++ b/src/quickcontrols2/material/shaders/+hlsl/RectangularGlow.frag
diff --git a/src/imports/controls/material/shaders/+qsb/RectangularGlow.frag b/src/quickcontrols2/material/shaders/+qsb/RectangularGlow.frag
index 5cfa2db6ed..5cfa2db6ed 100644
--- a/src/imports/controls/material/shaders/+qsb/RectangularGlow.frag
+++ b/src/quickcontrols2/material/shaders/+qsb/RectangularGlow.frag
diff --git a/src/imports/controls/material/shaders/RectangularGlow.frag b/src/quickcontrols2/material/shaders/RectangularGlow.frag
index 40bab5806c..40bab5806c 100644
--- a/src/imports/controls/material/shaders/RectangularGlow.frag
+++ b/src/quickcontrols2/material/shaders/RectangularGlow.frag
diff --git a/src/imports/controls/material/shaders/RectangularGlow_rhi.frag b/src/quickcontrols2/material/shaders/RectangularGlow_rhi.frag
index 3e7d2dfe6f..3e7d2dfe6f 100644
--- a/src/imports/controls/material/shaders/RectangularGlow_rhi.frag
+++ b/src/quickcontrols2/material/shaders/RectangularGlow_rhi.frag
diff --git a/src/imports/controls/material/shaders/compile.bat b/src/quickcontrols2/material/shaders/compile.bat
index e87efa7a6d..e87efa7a6d 100644
--- a/src/imports/controls/material/shaders/compile.bat
+++ b/src/quickcontrols2/material/shaders/compile.bat
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/quickcontrols2/qtquickcontrols2plugin.cpp
index fcd025e0f4..fcd025e0f4 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/quickcontrols2/qtquickcontrols2plugin.cpp
diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/quickcontrols2/universal/ApplicationWindow.qml
index 2ec9c56566..2ec9c56566 100644
--- a/src/imports/controls/universal/ApplicationWindow.qml
+++ b/src/quickcontrols2/universal/ApplicationWindow.qml
diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/quickcontrols2/universal/BusyIndicator.qml
index 0bd3ca038a..0bd3ca038a 100644
--- a/src/imports/controls/universal/BusyIndicator.qml
+++ b/src/quickcontrols2/universal/BusyIndicator.qml
diff --git a/src/imports/controls/universal/Button.qml b/src/quickcontrols2/universal/Button.qml
index 18a82e17ed..18a82e17ed 100644
--- a/src/imports/controls/universal/Button.qml
+++ b/src/quickcontrols2/universal/Button.qml
diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/quickcontrols2/universal/CMakeLists.txt
index af7cde6628..dddcc63ae9 100644
--- a/src/imports/controls/universal/CMakeLists.txt
+++ b/src/quickcontrols2/universal/CMakeLists.txt
@@ -1,74 +1,7 @@
-# Generated from universal.pro.
-
 #####################################################################
 ## qtquickcontrols2universalstyleplugin Plugin:
 #####################################################################
 
-qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin
-    URI "QtQuick.Controls.Universal"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2UniversalStylePlugin
-    IMPORTS
-        QtQuick.Controls.Basic/auto
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
-    SOURCES
-        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::QuickControls2ImplPrivate
-        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"
-)
-
-qt_internal_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin"
-    PREFIX
-        "/qt-project.org/imports/QtQuick/Controls/Universal"
-    FILES
-        ${qtquickcontrols2universalstyleplugin_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:universal.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.Universal"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls/Universal"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-universal)"
-
 set(qml_files
     "ApplicationWindow.qml"
     "BusyIndicator.qml"
@@ -272,7 +205,59 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
 
-qt6_target_qml_files(qtquickcontrols2universalstyleplugin
-    FILES
+qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin
+    URI "QtQuick.Controls.Universal"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickControls2UniversalStylePlugin
+    IMPORTS
+        QtQuick.Controls.Basic/auto
+    PLUGIN_TARGET qtquickcontrols2universalstyleplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
+    SOURCES
+        qquickuniversalstyle.cpp qquickuniversalstyle_p.h
+        qquickuniversaltheme.cpp qquickuniversaltheme_p.h
+        qtquickcontrols2universalstyleplugin.cpp
+    QML_FILES
         ${qml_files}
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2ImplPrivate
+        Qt::QuickControls2Private
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
+
+qt_internal_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin"
+    PREFIX
+        "/qt-project.org/imports/QtQuick/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"
 )
+
+add_subdirectory(impl)
diff --git a/src/imports/controls/universal/CheckBox.qml b/src/quickcontrols2/universal/CheckBox.qml
index ff35d37268..ff35d37268 100644
--- a/src/imports/controls/universal/CheckBox.qml
+++ b/src/quickcontrols2/universal/CheckBox.qml
diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/quickcontrols2/universal/CheckDelegate.qml
index 8e455a56e0..8e455a56e0 100644
--- a/src/imports/controls/universal/CheckDelegate.qml
+++ b/src/quickcontrols2/universal/CheckDelegate.qml
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/quickcontrols2/universal/ComboBox.qml
index b3179849b6..b3179849b6 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/quickcontrols2/universal/ComboBox.qml
diff --git a/src/imports/controls/universal/DelayButton.qml b/src/quickcontrols2/universal/DelayButton.qml
index 5840fa8649..5840fa8649 100644
--- a/src/imports/controls/universal/DelayButton.qml
+++ b/src/quickcontrols2/universal/DelayButton.qml
diff --git a/src/imports/controls/universal/Dial.qml b/src/quickcontrols2/universal/Dial.qml
index cd9e615edb..cd9e615edb 100644
--- a/src/imports/controls/universal/Dial.qml
+++ b/src/quickcontrols2/universal/Dial.qml
diff --git a/src/imports/controls/universal/Dialog.qml b/src/quickcontrols2/universal/Dialog.qml
index 3cebf7f07b..3cebf7f07b 100644
--- a/src/imports/controls/universal/Dialog.qml
+++ b/src/quickcontrols2/universal/Dialog.qml
diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/quickcontrols2/universal/DialogButtonBox.qml
index 811c12f7ee..811c12f7ee 100644
--- a/src/imports/controls/universal/DialogButtonBox.qml
+++ b/src/quickcontrols2/universal/DialogButtonBox.qml
diff --git a/src/imports/controls/universal/Drawer.qml b/src/quickcontrols2/universal/Drawer.qml
index 19f78f1e4b..19f78f1e4b 100644
--- a/src/imports/controls/universal/Drawer.qml
+++ b/src/quickcontrols2/universal/Drawer.qml
diff --git a/src/imports/controls/universal/Frame.qml b/src/quickcontrols2/universal/Frame.qml
index 780ba7348b..780ba7348b 100644
--- a/src/imports/controls/universal/Frame.qml
+++ b/src/quickcontrols2/universal/Frame.qml
diff --git a/src/imports/controls/universal/GroupBox.qml b/src/quickcontrols2/universal/GroupBox.qml
index 5104b710ca..5104b710ca 100644
--- a/src/imports/controls/universal/GroupBox.qml
+++ b/src/quickcontrols2/universal/GroupBox.qml
diff --git a/src/imports/controls/universal/HorizontalHeaderView.qml b/src/quickcontrols2/universal/HorizontalHeaderView.qml
index 0bf88ebcc8..0bf88ebcc8 100644
--- a/src/imports/controls/universal/HorizontalHeaderView.qml
+++ b/src/quickcontrols2/universal/HorizontalHeaderView.qml
diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/quickcontrols2/universal/ItemDelegate.qml
index 50fa0af982..50fa0af982 100644
--- a/src/imports/controls/universal/ItemDelegate.qml
+++ b/src/quickcontrols2/universal/ItemDelegate.qml
diff --git a/src/imports/controls/universal/Label.qml b/src/quickcontrols2/universal/Label.qml
index 9460c997eb..9460c997eb 100644
--- a/src/imports/controls/universal/Label.qml
+++ b/src/quickcontrols2/universal/Label.qml
diff --git a/src/imports/controls/universal/Menu.qml b/src/quickcontrols2/universal/Menu.qml
index c4723f32aa..c4723f32aa 100644
--- a/src/imports/controls/universal/Menu.qml
+++ b/src/quickcontrols2/universal/Menu.qml
diff --git a/src/imports/controls/universal/MenuBar.qml b/src/quickcontrols2/universal/MenuBar.qml
index 2ab5891960..2ab5891960 100644
--- a/src/imports/controls/universal/MenuBar.qml
+++ b/src/quickcontrols2/universal/MenuBar.qml
diff --git a/src/imports/controls/universal/MenuBarItem.qml b/src/quickcontrols2/universal/MenuBarItem.qml
index 786be1325c..786be1325c 100644
--- a/src/imports/controls/universal/MenuBarItem.qml
+++ b/src/quickcontrols2/universal/MenuBarItem.qml
diff --git a/src/imports/controls/universal/MenuItem.qml b/src/quickcontrols2/universal/MenuItem.qml
index 8287b0a828..8287b0a828 100644
--- a/src/imports/controls/universal/MenuItem.qml
+++ b/src/quickcontrols2/universal/MenuItem.qml
diff --git a/src/imports/controls/universal/MenuSeparator.qml b/src/quickcontrols2/universal/MenuSeparator.qml
index be6fad4580..be6fad4580 100644
--- a/src/imports/controls/universal/MenuSeparator.qml
+++ b/src/quickcontrols2/universal/MenuSeparator.qml
diff --git a/src/imports/controls/universal/Page.qml b/src/quickcontrols2/universal/Page.qml
index 8946e7adbf..8946e7adbf 100644
--- a/src/imports/controls/universal/Page.qml
+++ b/src/quickcontrols2/universal/Page.qml
diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/quickcontrols2/universal/PageIndicator.qml
index 2adb85c65c..2adb85c65c 100644
--- a/src/imports/controls/universal/PageIndicator.qml
+++ b/src/quickcontrols2/universal/PageIndicator.qml
diff --git a/src/imports/controls/universal/Pane.qml b/src/quickcontrols2/universal/Pane.qml
index 257f9cafd0..257f9cafd0 100644
--- a/src/imports/controls/universal/Pane.qml
+++ b/src/quickcontrols2/universal/Pane.qml
diff --git a/src/imports/controls/universal/Popup.qml b/src/quickcontrols2/universal/Popup.qml
index 5e972ea993..5e972ea993 100644
--- a/src/imports/controls/universal/Popup.qml
+++ b/src/quickcontrols2/universal/Popup.qml
diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/quickcontrols2/universal/ProgressBar.qml
index 4f8cc87428..4f8cc87428 100644
--- a/src/imports/controls/universal/ProgressBar.qml
+++ b/src/quickcontrols2/universal/ProgressBar.qml
diff --git a/src/imports/controls/universal/README.md b/src/quickcontrols2/universal/README.md
index 8d02d18ba3..8d02d18ba3 100644
--- a/src/imports/controls/universal/README.md
+++ b/src/quickcontrols2/universal/README.md
diff --git a/src/imports/controls/universal/RadioButton.qml b/src/quickcontrols2/universal/RadioButton.qml
index abd386ce9d..abd386ce9d 100644
--- a/src/imports/controls/universal/RadioButton.qml
+++ b/src/quickcontrols2/universal/RadioButton.qml
diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/quickcontrols2/universal/RadioDelegate.qml
index fda2560dce..fda2560dce 100644
--- a/src/imports/controls/universal/RadioDelegate.qml
+++ b/src/quickcontrols2/universal/RadioDelegate.qml
diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/quickcontrols2/universal/RangeSlider.qml
index 5bdc4d8f6d..5bdc4d8f6d 100644
--- a/src/imports/controls/universal/RangeSlider.qml
+++ b/src/quickcontrols2/universal/RangeSlider.qml
diff --git a/src/imports/controls/universal/RoundButton.qml b/src/quickcontrols2/universal/RoundButton.qml
index 156a472c25..156a472c25 100644
--- a/src/imports/controls/universal/RoundButton.qml
+++ b/src/quickcontrols2/universal/RoundButton.qml
diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/quickcontrols2/universal/ScrollBar.qml
index d101658c8e..d101658c8e 100644
--- a/src/imports/controls/universal/ScrollBar.qml
+++ b/src/quickcontrols2/universal/ScrollBar.qml
diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/quickcontrols2/universal/ScrollIndicator.qml
index f66a96587c..f66a96587c 100644
--- a/src/imports/controls/universal/ScrollIndicator.qml
+++ b/src/quickcontrols2/universal/ScrollIndicator.qml
diff --git a/src/imports/controls/universal/ScrollView.qml b/src/quickcontrols2/universal/ScrollView.qml
index a6bba9de05..a6bba9de05 100644
--- a/src/imports/controls/universal/ScrollView.qml
+++ b/src/quickcontrols2/universal/ScrollView.qml
diff --git a/src/imports/controls/universal/Slider.qml b/src/quickcontrols2/universal/Slider.qml
index 37c77a3546..37c77a3546 100644
--- a/src/imports/controls/universal/Slider.qml
+++ b/src/quickcontrols2/universal/Slider.qml
diff --git a/src/imports/controls/universal/SpinBox.qml b/src/quickcontrols2/universal/SpinBox.qml
index 10c12589de..10c12589de 100644
--- a/src/imports/controls/universal/SpinBox.qml
+++ b/src/quickcontrols2/universal/SpinBox.qml
diff --git a/src/imports/controls/universal/SplitView.qml b/src/quickcontrols2/universal/SplitView.qml
index 78362cea8b..78362cea8b 100644
--- a/src/imports/controls/universal/SplitView.qml
+++ b/src/quickcontrols2/universal/SplitView.qml
diff --git a/src/imports/controls/universal/StackView.qml b/src/quickcontrols2/universal/StackView.qml
index 41611dd36b..41611dd36b 100644
--- a/src/imports/controls/universal/StackView.qml
+++ b/src/quickcontrols2/universal/StackView.qml
diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/quickcontrols2/universal/SwipeDelegate.qml
index e36f8ee07b..e36f8ee07b 100644
--- a/src/imports/controls/universal/SwipeDelegate.qml
+++ b/src/quickcontrols2/universal/SwipeDelegate.qml
diff --git a/src/imports/controls/universal/Switch.qml b/src/quickcontrols2/universal/Switch.qml
index 33ee4abb96..33ee4abb96 100644
--- a/src/imports/controls/universal/Switch.qml
+++ b/src/quickcontrols2/universal/Switch.qml
diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/quickcontrols2/universal/SwitchDelegate.qml
index 41ea2ce00a..41ea2ce00a 100644
--- a/src/imports/controls/universal/SwitchDelegate.qml
+++ b/src/quickcontrols2/universal/SwitchDelegate.qml
diff --git a/src/imports/controls/universal/TabBar.qml b/src/quickcontrols2/universal/TabBar.qml
index 9b98c10e78..9b98c10e78 100644
--- a/src/imports/controls/universal/TabBar.qml
+++ b/src/quickcontrols2/universal/TabBar.qml
diff --git a/src/imports/controls/universal/TabButton.qml b/src/quickcontrols2/universal/TabButton.qml
index 3709bddaad..3709bddaad 100644
--- a/src/imports/controls/universal/TabButton.qml
+++ b/src/quickcontrols2/universal/TabButton.qml
diff --git a/src/imports/controls/universal/TextArea.qml b/src/quickcontrols2/universal/TextArea.qml
index 6fa0066b75..6fa0066b75 100644
--- a/src/imports/controls/universal/TextArea.qml
+++ b/src/quickcontrols2/universal/TextArea.qml
diff --git a/src/imports/controls/universal/TextField.qml b/src/quickcontrols2/universal/TextField.qml
index 903f672830..903f672830 100644
--- a/src/imports/controls/universal/TextField.qml
+++ b/src/quickcontrols2/universal/TextField.qml
diff --git a/src/imports/controls/universal/ToolBar.qml b/src/quickcontrols2/universal/ToolBar.qml
index 0266056f13..0266056f13 100644
--- a/src/imports/controls/universal/ToolBar.qml
+++ b/src/quickcontrols2/universal/ToolBar.qml
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/quickcontrols2/universal/ToolButton.qml
index c305342d03..c305342d03 100644
--- a/src/imports/controls/universal/ToolButton.qml
+++ b/src/quickcontrols2/universal/ToolButton.qml
diff --git a/src/imports/controls/universal/ToolSeparator.qml b/src/quickcontrols2/universal/ToolSeparator.qml
index cd9be32d8f..cd9be32d8f 100644
--- a/src/imports/controls/universal/ToolSeparator.qml
+++ b/src/quickcontrols2/universal/ToolSeparator.qml
diff --git a/src/imports/controls/universal/ToolTip.qml b/src/quickcontrols2/universal/ToolTip.qml
index bf931a4c84..bf931a4c84 100644
--- a/src/imports/controls/universal/ToolTip.qml
+++ b/src/quickcontrols2/universal/ToolTip.qml
diff --git a/src/imports/controls/universal/Tumbler.qml b/src/quickcontrols2/universal/Tumbler.qml
index 5b9f57258d..5b9f57258d 100644
--- a/src/imports/controls/universal/Tumbler.qml
+++ b/src/quickcontrols2/universal/Tumbler.qml
diff --git a/src/imports/controls/universal/VerticalHeaderView.qml b/src/quickcontrols2/universal/VerticalHeaderView.qml
index 7dc1efd359..7dc1efd359 100644
--- a/src/imports/controls/universal/VerticalHeaderView.qml
+++ b/src/quickcontrols2/universal/VerticalHeaderView.qml
diff --git a/src/imports/controls/universal/images/checkmark.png b/src/quickcontrols2/universal/images/checkmark.png
index e2aae6fe0f..e2aae6fe0f 100644
--- a/src/imports/controls/universal/images/checkmark.png
+++ b/src/quickcontrols2/universal/images/checkmark.png
diff --git a/src/imports/controls/universal/images/checkmark@2x.png b/src/quickcontrols2/universal/images/checkmark@2x.png
index 0df4159a7c..0df4159a7c 100644
--- a/src/imports/controls/universal/images/checkmark@2x.png
+++ b/src/quickcontrols2/universal/images/checkmark@2x.png
diff --git a/src/imports/controls/universal/images/checkmark@3x.png b/src/quickcontrols2/universal/images/checkmark@3x.png
index 43466cbcb6..43466cbcb6 100644
--- a/src/imports/controls/universal/images/checkmark@3x.png
+++ b/src/quickcontrols2/universal/images/checkmark@3x.png
diff --git a/src/imports/controls/universal/images/checkmark@4x.png b/src/quickcontrols2/universal/images/checkmark@4x.png
index 7a47bd2159..7a47bd2159 100644
--- a/src/imports/controls/universal/images/checkmark@4x.png
+++ b/src/quickcontrols2/universal/images/checkmark@4x.png
diff --git a/src/imports/controls/universal/images/downarrow.png b/src/quickcontrols2/universal/images/downarrow.png
index b66e2efc22..b66e2efc22 100644
--- a/src/imports/controls/universal/images/downarrow.png
+++ b/src/quickcontrols2/universal/images/downarrow.png
diff --git a/src/imports/controls/universal/images/downarrow@2x.png b/src/quickcontrols2/universal/images/downarrow@2x.png
index a704376c8f..a704376c8f 100644
--- a/src/imports/controls/universal/images/downarrow@2x.png
+++ b/src/quickcontrols2/universal/images/downarrow@2x.png
diff --git a/src/imports/controls/universal/images/downarrow@3x.png b/src/quickcontrols2/universal/images/downarrow@3x.png
index 3b6d55ab4c..3b6d55ab4c 100644
--- a/src/imports/controls/universal/images/downarrow@3x.png
+++ b/src/quickcontrols2/universal/images/downarrow@3x.png
diff --git a/src/imports/controls/universal/images/downarrow@4x.png b/src/quickcontrols2/universal/images/downarrow@4x.png
index 818c6b24ff..818c6b24ff 100644
--- a/src/imports/controls/universal/images/downarrow@4x.png
+++ b/src/quickcontrols2/universal/images/downarrow@4x.png
diff --git a/src/imports/controls/universal/images/leftarrow.png b/src/quickcontrols2/universal/images/leftarrow.png
index 0153ccd421..0153ccd421 100644
--- a/src/imports/controls/universal/images/leftarrow.png
+++ b/src/quickcontrols2/universal/images/leftarrow.png
diff --git a/src/imports/controls/universal/images/leftarrow@2x.png b/src/quickcontrols2/universal/images/leftarrow@2x.png
index fa692d5b0f..fa692d5b0f 100644
--- a/src/imports/controls/universal/images/leftarrow@2x.png
+++ b/src/quickcontrols2/universal/images/leftarrow@2x.png
diff --git a/src/imports/controls/universal/images/leftarrow@3x.png b/src/quickcontrols2/universal/images/leftarrow@3x.png
index 06b0207a60..06b0207a60 100644
--- a/src/imports/controls/universal/images/leftarrow@3x.png
+++ b/src/quickcontrols2/universal/images/leftarrow@3x.png
diff --git a/src/imports/controls/universal/images/leftarrow@4x.png b/src/quickcontrols2/universal/images/leftarrow@4x.png
index 1049f616e4..1049f616e4 100644
--- a/src/imports/controls/universal/images/leftarrow@4x.png
+++ b/src/quickcontrols2/universal/images/leftarrow@4x.png
diff --git a/src/imports/controls/universal/images/rightarrow.png b/src/quickcontrols2/universal/images/rightarrow.png
index b24d117d79..b24d117d79 100644
--- a/src/imports/controls/universal/images/rightarrow.png
+++ b/src/quickcontrols2/universal/images/rightarrow.png
diff --git a/src/imports/controls/universal/images/rightarrow@2x.png b/src/quickcontrols2/universal/images/rightarrow@2x.png
index 80aca7c18f..80aca7c18f 100644
--- a/src/imports/controls/universal/images/rightarrow@2x.png
+++ b/src/quickcontrols2/universal/images/rightarrow@2x.png
diff --git a/src/imports/controls/universal/images/rightarrow@3x.png b/src/quickcontrols2/universal/images/rightarrow@3x.png
index ba01724065..ba01724065 100644
--- a/src/imports/controls/universal/images/rightarrow@3x.png
+++ b/src/quickcontrols2/universal/images/rightarrow@3x.png
diff --git a/src/imports/controls/universal/images/rightarrow@4x.png b/src/quickcontrols2/universal/images/rightarrow@4x.png
index 21f7ed4d15..21f7ed4d15 100644
--- a/src/imports/controls/universal/images/rightarrow@4x.png
+++ b/src/quickcontrols2/universal/images/rightarrow@4x.png
diff --git a/src/imports/controls/universal/impl/CMakeLists.txt b/src/quickcontrols2/universal/impl/CMakeLists.txt
index 1c1f59849f..b2bdffd212 100644
--- a/src/imports/controls/universal/impl/CMakeLists.txt
+++ b/src/quickcontrols2/universal/impl/CMakeLists.txt
@@ -1,20 +1,28 @@
-# Generated from universal-impl.pro.
-
 #####################################################################
 ## qtquickcontrols2universalstyleimplplugin Plugin:
 #####################################################################
 
+set(qml_files
+    "CheckIndicator.qml"
+    "RadioIndicator.qml"
+    "SwitchIndicator.qml"
+)
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SOURCE_VERSION "2.0"
+)
+
 qt_internal_add_qml_module(qtquickcontrols2universalstyleimplplugin
     URI "QtQuick.Controls.Universal.impl"
     VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2UniversalStyleImplPlugin
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
+    CLASS_NAME QtQuickControls2UniversalStyleImplPlugin
+    PLUGIN_TARGET qtquickcontrols2universalstyleimplplugin
+    NO_PLUGIN_OPTIONAL
     SOURCES
         qquickuniversalbusyindicator.cpp qquickuniversalbusyindicator_p.h
         qquickuniversalfocusrectangle.cpp qquickuniversalfocusrectangle_p.h
         qquickuniversalprogressbar.cpp qquickuniversalprogressbar_p.h
-        qtquickcontrols2universalstyleimplplugin.cpp
+    QML_FILES
+        ${qml_files}
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
@@ -31,32 +39,3 @@ qt_internal_add_qml_module(qtquickcontrols2universalstyleimplplugin
         Qt::Qml
         Qt::Quick
 )
-
-#### Keys ignored in scope 1:.:.:universal-impl.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_FILES = "$$PWD/CheckIndicator.qml" "$$PWD/RadioIndicator.qml" "$$PWD/SwitchIndicator.qml"
-# QML_IMPORT_NAME = "QtQuick.Controls.Universal.impl"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# QT_FOR_CONFIG = "quickcontrols2-private"
-# TARGETPATH = "QtQuick/Controls/Universal/impl"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-universal)"
-
-set(qml_files
-    "CheckIndicator.qml"
-    "RadioIndicator.qml"
-    "SwitchIndicator.qml"
-)
-set_source_files_properties(CheckIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-set_source_files_properties(RadioIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-set_source_files_properties(SwitchIndicator.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0"
-)
-
-qt6_target_qml_files(qtquickcontrols2universalstyleimplplugin
-    FILES
-        ${qml_files}
-)
diff --git a/src/imports/controls/universal/impl/CheckIndicator.qml b/src/quickcontrols2/universal/impl/CheckIndicator.qml
index e4cd5409a4..e4cd5409a4 100644
--- a/src/imports/controls/universal/impl/CheckIndicator.qml
+++ b/src/quickcontrols2/universal/impl/CheckIndicator.qml
diff --git a/src/imports/controls/universal/impl/RadioIndicator.qml b/src/quickcontrols2/universal/impl/RadioIndicator.qml
index 3cf1bf3728..3cf1bf3728 100644
--- a/src/imports/controls/universal/impl/RadioIndicator.qml
+++ b/src/quickcontrols2/universal/impl/RadioIndicator.qml
diff --git a/src/imports/controls/universal/impl/SwitchIndicator.qml b/src/quickcontrols2/universal/impl/SwitchIndicator.qml
index aa4554192c..aa4554192c 100644
--- a/src/imports/controls/universal/impl/SwitchIndicator.qml
+++ b/src/quickcontrols2/universal/impl/SwitchIndicator.qml
diff --git a/src/imports/controls/universal/impl/qquickuniversalbusyindicator.cpp b/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator.cpp
index 2f0ada495d..2f0ada495d 100644
--- a/src/imports/controls/universal/impl/qquickuniversalbusyindicator.cpp
+++ b/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator.cpp
diff --git a/src/imports/controls/universal/impl/qquickuniversalbusyindicator_p.h b/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator_p.h
index 6d3ebb8493..6d3ebb8493 100644
--- a/src/imports/controls/universal/impl/qquickuniversalbusyindicator_p.h
+++ b/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator_p.h
diff --git a/src/imports/controls/universal/impl/qquickuniversalfocusrectangle.cpp b/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle.cpp
index 51508c6f99..51508c6f99 100644
--- a/src/imports/controls/universal/impl/qquickuniversalfocusrectangle.cpp
+++ b/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle.cpp
diff --git a/src/imports/controls/universal/impl/qquickuniversalfocusrectangle_p.h b/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle_p.h
index f309b51227..f309b51227 100644
--- a/src/imports/controls/universal/impl/qquickuniversalfocusrectangle_p.h
+++ b/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle_p.h
diff --git a/src/imports/controls/universal/impl/qquickuniversalprogressbar.cpp b/src/quickcontrols2/universal/impl/qquickuniversalprogressbar.cpp
index 8f907b7578..8f907b7578 100644
--- a/src/imports/controls/universal/impl/qquickuniversalprogressbar.cpp
+++ b/src/quickcontrols2/universal/impl/qquickuniversalprogressbar.cpp
diff --git a/src/imports/controls/universal/impl/qquickuniversalprogressbar_p.h b/src/quickcontrols2/universal/impl/qquickuniversalprogressbar_p.h
index 31cb4a322e..31cb4a322e 100644
--- a/src/imports/controls/universal/impl/qquickuniversalprogressbar_p.h
+++ b/src/quickcontrols2/universal/impl/qquickuniversalprogressbar_p.h
diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/quickcontrols2/universal/qquickuniversalstyle.cpp
index 605cfce237..605cfce237 100644
--- a/src/imports/controls/universal/qquickuniversalstyle.cpp
+++ b/src/quickcontrols2/universal/qquickuniversalstyle.cpp
diff --git a/src/imports/controls/universal/qquickuniversalstyle_p.h b/src/quickcontrols2/universal/qquickuniversalstyle_p.h
index 50b07071fc..50b07071fc 100644
--- a/src/imports/controls/universal/qquickuniversalstyle_p.h
+++ b/src/quickcontrols2/universal/qquickuniversalstyle_p.h
diff --git a/src/imports/controls/universal/qquickuniversaltheme.cpp b/src/quickcontrols2/universal/qquickuniversaltheme.cpp
index 46f7c52e0a..46f7c52e0a 100644
--- a/src/imports/controls/universal/qquickuniversaltheme.cpp
+++ b/src/quickcontrols2/universal/qquickuniversaltheme.cpp
diff --git a/src/imports/controls/universal/qquickuniversaltheme_p.h b/src/quickcontrols2/universal/qquickuniversaltheme_p.h
index f762d0e339..f762d0e339 100644
--- a/src/imports/controls/universal/qquickuniversaltheme_p.h
+++ b/src/quickcontrols2/universal/qquickuniversaltheme_p.h
diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/quickcontrols2/universal/qtquickcontrols2universalstyleplugin.cpp
index e3bbc00a53..e3bbc00a53 100644
--- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
+++ b/src/quickcontrols2/universal/qtquickcontrols2universalstyleplugin.cpp
diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.qrc b/src/quickcontrols2/universal/qtquickcontrols2universalstyleplugin.qrc
index bfcb0974ce..bfcb0974ce 100644
--- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.qrc
+++ b/src/quickcontrols2/universal/qtquickcontrols2universalstyleplugin.qrc
diff --git a/src/imports/controls/universal/universal.pri b/src/quickcontrols2/universal/universal.pri
index b946a8f390..b946a8f390 100644
--- a/src/imports/controls/universal/universal.pri
+++ b/src/quickcontrols2/universal/universal.pri
diff --git a/src/imports/controls/windows/Button.qml b/src/quickcontrols2/windows/Button.qml
index 5480d7f74b..5480d7f74b 100644
--- a/src/imports/controls/windows/Button.qml
+++ b/src/quickcontrols2/windows/Button.qml
diff --git a/src/quickcontrols2/windows/CMakeLists.txt b/src/quickcontrols2/windows/CMakeLists.txt
new file mode 100644
index 0000000000..3a90560ec1
--- /dev/null
+++ b/src/quickcontrols2/windows/CMakeLists.txt
@@ -0,0 +1,55 @@
+#####################################################################
+## qtquickcontrols2windowsstyleplugin Plugin:
+#####################################################################
+
+set(qml_files
+    "Button.qml"
+    "CheckBox.qml"
+    "ComboBox.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "Slider.qml"
+    "SpinBox.qml"
+    "TextArea.qml"
+    "TextField.qml"
+    "ScrollBar.qml"
+    "ScrollView.qml"
+)
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SOURCE_VERSION "2.0;6.0"
+)
+
+qt_internal_add_qml_module(qtquickcontrols2windowsstyleplugin
+    URI "QtQuick.Controls.Windows"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickControls2WindowsStylePlugin
+    IMPORTS
+        QtQuick.Controls.Fusion/auto
+    PAST_MAJOR_VERSIONS 2
+    PLUGIN_TARGET qtquickcontrols2windowsstyleplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
+    SOURCES
+        qtquickcontrols2windowsstyleplugin.cpp
+    QML_FILES
+        ${qml_files}
+    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
+        Qt::QuickControls2
+        Qt::QuickTemplates2
+)
diff --git a/src/imports/controls/windows/CheckBox.qml b/src/quickcontrols2/windows/CheckBox.qml
index 03778c4f48..03778c4f48 100644
--- a/src/imports/controls/windows/CheckBox.qml
+++ b/src/quickcontrols2/windows/CheckBox.qml
diff --git a/src/imports/controls/windows/ComboBox.qml b/src/quickcontrols2/windows/ComboBox.qml
index 237d90b592..237d90b592 100644
--- a/src/imports/controls/windows/ComboBox.qml
+++ b/src/quickcontrols2/windows/ComboBox.qml
diff --git a/src/imports/controls/windows/Frame.qml b/src/quickcontrols2/windows/Frame.qml
index f16a083517..f16a083517 100644
--- a/src/imports/controls/windows/Frame.qml
+++ b/src/quickcontrols2/windows/Frame.qml
diff --git a/src/imports/controls/windows/GroupBox.qml b/src/quickcontrols2/windows/GroupBox.qml
index 4ffbaae6d3..4ffbaae6d3 100644
--- a/src/imports/controls/windows/GroupBox.qml
+++ b/src/quickcontrols2/windows/GroupBox.qml
diff --git a/src/imports/controls/windows/ProgressBar.qml b/src/quickcontrols2/windows/ProgressBar.qml
index 59a1689dba..59a1689dba 100644
--- a/src/imports/controls/windows/ProgressBar.qml
+++ b/src/quickcontrols2/windows/ProgressBar.qml
diff --git a/src/imports/controls/windows/RadioButton.qml b/src/quickcontrols2/windows/RadioButton.qml
index 82b85698d2..82b85698d2 100644
--- a/src/imports/controls/windows/RadioButton.qml
+++ b/src/quickcontrols2/windows/RadioButton.qml
diff --git a/src/imports/controls/windows/ScrollBar.qml b/src/quickcontrols2/windows/ScrollBar.qml
index 0ccbb1557e..0ccbb1557e 100644
--- a/src/imports/controls/windows/ScrollBar.qml
+++ b/src/quickcontrols2/windows/ScrollBar.qml
diff --git a/src/imports/controls/windows/ScrollView.qml b/src/quickcontrols2/windows/ScrollView.qml
index 0e5ffff4b6..0e5ffff4b6 100644
--- a/src/imports/controls/windows/ScrollView.qml
+++ b/src/quickcontrols2/windows/ScrollView.qml
diff --git a/src/imports/controls/windows/Slider.qml b/src/quickcontrols2/windows/Slider.qml
index ab72fcaabd..ab72fcaabd 100644
--- a/src/imports/controls/windows/Slider.qml
+++ b/src/quickcontrols2/windows/Slider.qml
diff --git a/src/imports/controls/windows/SpinBox.qml b/src/quickcontrols2/windows/SpinBox.qml
index 72309c60cd..72309c60cd 100644
--- a/src/imports/controls/windows/SpinBox.qml
+++ b/src/quickcontrols2/windows/SpinBox.qml
diff --git a/src/imports/controls/windows/TextArea.qml b/src/quickcontrols2/windows/TextArea.qml
index f6b883038b..f6b883038b 100644
--- a/src/imports/controls/windows/TextArea.qml
+++ b/src/quickcontrols2/windows/TextArea.qml
diff --git a/src/imports/controls/windows/TextField.qml b/src/quickcontrols2/windows/TextField.qml
index bc0e2cb77a..bc0e2cb77a 100644
--- a/src/imports/controls/windows/TextField.qml
+++ b/src/quickcontrols2/windows/TextField.qml
diff --git a/src/imports/controls/windows/qtquickcontrols2windowsstyleplugin.cpp b/src/quickcontrols2/windows/qtquickcontrols2windowsstyleplugin.cpp
index c893d93ed6..c893d93ed6 100644
--- a/src/imports/controls/windows/qtquickcontrols2windowsstyleplugin.cpp
+++ b/src/quickcontrols2/windows/qtquickcontrols2windowsstyleplugin.cpp
diff --git a/src/imports/controls/windows/windows.pri b/src/quickcontrols2/windows/windows.pri
index 7f13eab02f..7f13eab02f 100644
--- a/src/imports/controls/windows/windows.pri
+++ b/src/quickcontrols2/windows/windows.pri
diff --git a/src/quickcontrols2impl/CMakeLists.txt b/src/quickcontrols2impl/CMakeLists.txt
index 86e3b84a5d..048938a8ce 100644
--- a/src/quickcontrols2impl/CMakeLists.txt
+++ b/src/quickcontrols2impl/CMakeLists.txt
@@ -1,10 +1,14 @@
-# Generated from quickcontrols2impl.pro.
-
 #####################################################################
 ## QuickControls2Impl Module:
 #####################################################################
 
-qt_internal_add_module(QuickControls2Impl
+qt_internal_add_qml_module(QuickControls2Impl
+    URI "QtQuick.Controls.impl"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickControls2ImplPlugin
+    DEPENDENCIES
+        QtQuick/auto
+    PLUGIN_TARGET qtquickcontrols2implplugin
     SOURCES
         qquickanimatednode.cpp qquickanimatednode_p.h
         qquickattachedobject.cpp qquickattachedobject_p.h
@@ -37,27 +41,7 @@ qt_internal_add_module(QuickControls2Impl
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:quickcontrols2impl.pro:<TRUE>:
-# MODULE = "quickcontrols2impl"
-# QMLTYPES_FILENAME = "plugins.qmltypes"
-# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Controls/impl"
-# QML_IMPORT_NAME = "QtQuick.Controls.impl"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-
-## Scopes:
-#####################################################################
-
 qt_internal_extend_target(QuickControls2Impl CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview
     SOURCES
         qquicktumblerview.cpp qquicktumblerview_p.h
 )
-
-set_target_properties(QuickControls2Impl PROPERTIES
-    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
-    QT_QML_MODULE_VERSION ${PROJECT_VERSION}
-    QT_QML_MODULE_URI QtQuick.Controls.impl
-    QT_QMLTYPES_FILENAME plugins.qmltypes
-    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Controls/impl"
-)
-
-qt6_qml_type_registration(QuickControls2Impl)
diff --git a/src/quickdialogs2/quickdialogs2/CMakeLists.txt b/src/quickdialogs2/quickdialogs2/CMakeLists.txt
index 560460d697..e01cd692c4 100644
--- a/src/quickdialogs2/quickdialogs2/CMakeLists.txt
+++ b/src/quickdialogs2/quickdialogs2/CMakeLists.txt
@@ -2,7 +2,11 @@
 ## QuickDialogs2 Module:
 #####################################################################
 
-qt_internal_add_module(QuickDialogs2
+qt_internal_add_qml_module(QuickDialogs2
+    URI "QtQuick.Dialogs"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickDialogsPlugin
+    PLUGIN_TARGET qtquickdialogsplugin
     SOURCES
         qquickabstractdialog.cpp
         qquickabstractdialog_p.h
@@ -31,15 +35,6 @@ qt_internal_add_module(QuickDialogs2
         Qt::Quick
 )
 
-## Scopes:
-#####################################################################
-
-set_target_properties(QuickDialogs2 PROPERTIES
-    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
-    QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
-    QT_QML_MODULE_URI QtQuick.Dialogs
-    QT_QMLTYPES_FILENAME plugins.qmltypes
-    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Dialogs"
+qt_internal_add_docs(QuickDialogs2
+    doc/qtquickdialogs.qdocconf
 )
-
-qt6_qml_type_registration(QuickDialogs2)
diff --git a/src/imports/dialogs/doc/images/qtquickdialogs-filedialog-gtk.png b/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-filedialog-gtk.png
index 9360d747a2..9360d747a2 100644
--- a/src/imports/dialogs/doc/images/qtquickdialogs-filedialog-gtk.png
+++ b/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-filedialog-gtk.png
diff --git a/src/imports/dialogs/doc/images/qtquickdialogs-fontdialog-gtk.png b/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-fontdialog-gtk.png
index 0c6217bdb4..0c6217bdb4 100644
--- a/src/imports/dialogs/doc/images/qtquickdialogs-fontdialog-gtk.png
+++ b/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-fontdialog-gtk.png
diff --git a/src/imports/dialogs/doc/qtquickdialogs.qdocconf b/src/quickdialogs2/quickdialogs2/doc/qtquickdialogs.qdocconf
index 575c84d037..e53a5c22a8 100644
--- a/src/imports/dialogs/doc/qtquickdialogs.qdocconf
+++ b/src/quickdialogs2/quickdialogs2/doc/qtquickdialogs.qdocconf
@@ -28,8 +28,8 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquickcontrols
 # This module has no documented C++ types, clear the module header
 moduleheader =
 
-headerdirs += ../../../quickdialogs2/quickdialogs2
-sourcedirs += ../../../quickdialogs2/quickdialogs2 \
+headerdirs += ..
+sourcedirs += .. \
               src
 
 imagedirs += images
diff --git a/src/imports/dialogs/doc/src/includes/fallback.qdocinc b/src/quickdialogs2/quickdialogs2/doc/src/includes/fallback.qdocinc
index f3a4a1805b..f3a4a1805b 100644
--- a/src/imports/dialogs/doc/src/includes/fallback.qdocinc
+++ b/src/quickdialogs2/quickdialogs2/doc/src/includes/fallback.qdocinc
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt b/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt
index 277be0a34c..20d090c84e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt
+++ b/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt
@@ -2,7 +2,36 @@
 ## QuickDialogs2QuickImpl Module:
 #####################################################################
 
-qt_internal_add_module(QuickDialogs2QuickImpl
+set(qml_files
+    "qml/FileDialog.qml"
+    "qml/FileDialogDelegate.qml"
+    "qml/FileDialogDelegateLabel.qml"
+    "qml/FolderBreadcrumbBar.qml"
+    "qml/FontDialog.qml"
+    "qml/FontDialogContent.qml"
+    "qml/+Fusion/FileDialog.qml"
+    "qml/+Fusion/FileDialogDelegate.qml"
+    "qml/+Fusion/FolderBreadcrumbBar.qml"
+    "qml/+Fusion/FontDialog.qml"
+    "qml/+Imagine/FileDialog.qml"
+    "qml/+Imagine/FileDialogDelegate.qml"
+    "qml/+Imagine/FolderBreadcrumbBar.qml"
+    "qml/+Imagine/FontDialog.qml"
+    "qml/+Material/FileDialog.qml"
+    "qml/+Material/FileDialogDelegate.qml"
+    "qml/+Material/FolderBreadcrumbBar.qml"
+    "qml/+Material/FontDialog.qml"
+    "qml/+Universal/FileDialog.qml"
+    "qml/+Universal/FileDialogDelegate.qml"
+    "qml/+Universal/FolderBreadcrumbBar.qml"
+    "qml/+Universal/FontDialog.qml"
+)
+
+qt_internal_add_qml_module(QuickDialogs2QuickImpl
+    URI "QtQuick.Dialogs.quickimpl"
+    VERSION "${PROJECT_VERSION}"
+    CLASS_NAME QtQuickDialogs2QuickImplPlugin
+    PLUGIN_TARGET qtquickdialogs2quickimplplugin
     SOURCES
         qquickdialogimplfactory.cpp
         qquickdialogimplfactory_p.h
@@ -23,6 +52,8 @@ qt_internal_add_module(QuickDialogs2QuickImpl
         qquickfontdialogimpl_p.h
         qquickfontdialogimpl_p_p.h
         qquickfontdialogimpl.cpp
+    QML_FILES
+        ${qml_files}
     DEFINES
         QT_BUILD_QUICKDIALOGS2QUICKIMPL_LIB
         QT_NO_CAST_FROM_ASCII
@@ -100,28 +131,6 @@ set(qtquickdialogs2quickimpl_resource_files
     "images/up-icon-thick-square@2x.png"
     "images/up-icon-thick-square@3x.png"
     "images/up-icon-thick-square@4x.png"
-    "qml/FileDialog.qml"
-    "qml/FileDialogDelegate.qml"
-    "qml/FileDialogDelegateLabel.qml"
-    "qml/FolderBreadcrumbBar.qml"
-    "qml/FontDialog.qml"
-    "qml/FontDialogContent.qml"
-    "qml/+Fusion/FileDialog.qml"
-    "qml/+Fusion/FileDialogDelegate.qml"
-    "qml/+Fusion/FolderBreadcrumbBar.qml"
-    "qml/+Fusion/FontDialog.qml"
-    "qml/+Imagine/FileDialog.qml"
-    "qml/+Imagine/FileDialogDelegate.qml"
-    "qml/+Imagine/FolderBreadcrumbBar.qml"
-    "qml/+Imagine/FontDialog.qml"
-    "qml/+Material/FileDialog.qml"
-    "qml/+Material/FileDialogDelegate.qml"
-    "qml/+Material/FolderBreadcrumbBar.qml"
-    "qml/+Material/FontDialog.qml"
-    "qml/+Universal/FileDialog.qml"
-    "qml/+Universal/FileDialogDelegate.qml"
-    "qml/+Universal/FolderBreadcrumbBar.qml"
-    "qml/+Universal/FontDialog.qml"
 )
 
 qt_internal_add_resource(QuickDialogs2QuickImpl "QuickDialogs2QuickImpl"
@@ -130,16 +139,3 @@ qt_internal_add_resource(QuickDialogs2QuickImpl "QuickDialogs2QuickImpl"
     FILES
         ${qtquickdialogs2quickimpl_resource_files}
 )
-
-## Scopes:
-#####################################################################
-
-set_target_properties(QuickDialogs2QuickImpl PROPERTIES
-    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
-    QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
-    QT_QML_MODULE_URI QtQuick.Dialogs.quickimpl
-    QT_QMLTYPES_FILENAME plugins.qmltypes
-    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Dialogs/quickimpl"
-)
-
-qt6_qml_type_registration(QuickDialogs2QuickImpl)
diff --git a/src/imports/nativestyle/CMakeLists.txt b/src/quicknativestyle/CMakeLists.txt
index 83e75278de..e34ccf7c91 100644
--- a/src/imports/nativestyle/CMakeLists.txt
+++ b/src/quicknativestyle/CMakeLists.txt
@@ -1,9 +1,31 @@
-# Generated from nativestyle.pro.
-
 #####################################################################
 ## qtquickcontrols2nativestyleplugin Plugin:
 #####################################################################
 
+set(qml_files
+    "controls/DefaultButton.qml"
+    "controls/DefaultSlider.qml"
+    "controls/DefaultGroupBox.qml"
+    "controls/DefaultCheckBox.qml"
+    "controls/DefaultRadioButton.qml"
+    "controls/DefaultSpinBox.qml"
+    "controls/DefaultTextField.qml"
+    "controls/DefaultFrame.qml"
+    "controls/DefaultTextArea.qml"
+    "controls/DefaultComboBox.qml"
+    "controls/DefaultScrollBar.qml"
+    "controls/DefaultProgressBar.qml"
+    "controls/DefaultDial.qml"
+)
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SOURCE_VERSION "2.0;6.0"
+)
+
+if(MACOS)
+    # TODO: QT_QML_SOURCE_VERSION wasn't set on this file before, should it be?
+    list(APPEND qml_files "util/FocusFrame.qml")
+endif()
+
 qt_internal_add_qml_module(qtquickcontrols2nativestyleplugin
     URI "QtQuick.NativeStyle"
     VERSION "${PROJECT_VERSION}"
@@ -12,8 +34,9 @@ qt_internal_add_qml_module(qtquickcontrols2nativestyleplugin
         QtQuick.Controls/auto
         QtQuick.Layouts/auto
     PAST_MAJOR_VERSIONS 2
-    GENERATE_QMLTYPES
-    INSTALL_QMLTYPES
+    PLUGIN_TARGET qtquickcontrols2nativestyleplugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
     SOURCES
         items/qquickstyleitem.cpp items/qquickstyleitem.h
         items/qquickstyleitembutton.cpp items/qquickstyleitembutton.h
@@ -36,6 +59,8 @@ qt_internal_add_qml_module(qtquickcontrols2nativestyleplugin
         qstyle/qquickstylehelper.cpp qstyle/qquickstylehelper_p.h
         qstyle/qquickstyleoption.cpp qstyle/qquickstyleoption.h
         qtquickcontrols2nativestyleplugin.cpp
+    QML_FILES
+        ${qml_files}
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
@@ -59,17 +84,6 @@ qt_internal_add_qml_module(qtquickcontrols2nativestyleplugin
         Qt::QuickTemplates2
 )
 
-#### Keys ignored in scope 1:.:.:nativestyle.pro:<TRUE>:
-# OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_MAJOR_VERSION = "6"
-# QML_IMPORT_NAME = "QtQuick.NativeStyle"
-# QML_PAST_MAJOR_VERSIONS = "2"
-# TARGETPATH = "QtQuick/NativeStyle"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-macos)|qtConfig(quickcontrols2-windows)"
-
-## Scopes:
-#####################################################################
-
 qt_internal_extend_target(qtquickcontrols2nativestyleplugin CONDITION MACOS
     SOURCES
         items/qquickstyleitemscrollviewcorner.cpp items/qquickstyleitemscrollviewcorner.h
@@ -82,20 +96,6 @@ qt_internal_extend_target(qtquickcontrols2nativestyleplugin CONDITION MACOS
         ${FWAppKit}
 )
 
-if(MACOS)
-    # Resources:
-    set(qmake_immediate_resource_files
-        "util/FocusFrame.qml"
-    )
-
-    qt_internal_add_resource(qtquickcontrols2nativestyleplugin "qqc2_mac_native_resources" # special case
-        PREFIX
-            "/"
-        FILES
-            ${qmake_immediate_resource_files}
-    )
-endif()
-
 qt_internal_extend_target(qtquickcontrols2nativestyleplugin CONDITION WIN32
     SOURCES
         qstyle/windows/qquickwindowsstyle.cpp qstyle/windows/qquickwindowsstyle_p.h
@@ -108,63 +108,3 @@ qt_internal_extend_target(qtquickcontrols2nativestyleplugin CONDITION WIN32
         user32
         uxtheme
 )
-
-set(qml_files
-    "controls/DefaultButton.qml"
-    "controls/DefaultSlider.qml"
-    "controls/DefaultGroupBox.qml"
-    "controls/DefaultCheckBox.qml"
-    "controls/DefaultRadioButton.qml"
-    "controls/DefaultSpinBox.qml"
-    "controls/DefaultTextField.qml"
-    "controls/DefaultFrame.qml"
-    "controls/DefaultTextArea.qml"
-    "controls/DefaultComboBox.qml"
-    "controls/DefaultScrollBar.qml"
-    "controls/DefaultProgressBar.qml"
-    "controls/DefaultDial.qml"
-)
-set_source_files_properties(controls/DefaultButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultSlider.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultGroupBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultCheckBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultRadioButton.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultSpinBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultTextField.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultFrame.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultTextArea.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultComboBox.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultScrollBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultProgressBar.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-set_source_files_properties(controls/DefaultDial.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "2.0;6.0"
-)
-
-qt6_target_qml_files(qtquickcontrols2nativestyleplugin
-    FILES
-        ${qml_files}
-)
diff --git a/src/imports/nativestyle/controls/DefaultButton.qml b/src/quicknativestyle/controls/DefaultButton.qml
index 7e55aaa27c..7e55aaa27c 100644
--- a/src/imports/nativestyle/controls/DefaultButton.qml
+++ b/src/quicknativestyle/controls/DefaultButton.qml
diff --git a/src/imports/nativestyle/controls/DefaultCheckBox.qml b/src/quicknativestyle/controls/DefaultCheckBox.qml
index 09166820de..09166820de 100644
--- a/src/imports/nativestyle/controls/DefaultCheckBox.qml
+++ b/src/quicknativestyle/controls/DefaultCheckBox.qml
diff --git a/src/imports/nativestyle/controls/DefaultComboBox.qml b/src/quicknativestyle/controls/DefaultComboBox.qml
index 7b286a1ebc..7b286a1ebc 100644
--- a/src/imports/nativestyle/controls/DefaultComboBox.qml
+++ b/src/quicknativestyle/controls/DefaultComboBox.qml
diff --git a/src/imports/nativestyle/controls/DefaultDial.qml b/src/quicknativestyle/controls/DefaultDial.qml
index b628ed0973..b628ed0973 100644
--- a/src/imports/nativestyle/controls/DefaultDial.qml
+++ b/src/quicknativestyle/controls/DefaultDial.qml
diff --git a/src/imports/nativestyle/controls/DefaultFrame.qml b/src/quicknativestyle/controls/DefaultFrame.qml
index 77ca612501..77ca612501 100644
--- a/src/imports/nativestyle/controls/DefaultFrame.qml
+++ b/src/quicknativestyle/controls/DefaultFrame.qml
diff --git a/src/imports/nativestyle/controls/DefaultGroupBox.qml b/src/quicknativestyle/controls/DefaultGroupBox.qml
index a7f3f9d0a7..a7f3f9d0a7 100644
--- a/src/imports/nativestyle/controls/DefaultGroupBox.qml
+++ b/src/quicknativestyle/controls/DefaultGroupBox.qml
diff --git a/src/imports/nativestyle/controls/DefaultProgressBar.qml b/src/quicknativestyle/controls/DefaultProgressBar.qml
index 037bdbaeea..037bdbaeea 100644
--- a/src/imports/nativestyle/controls/DefaultProgressBar.qml
+++ b/src/quicknativestyle/controls/DefaultProgressBar.qml
diff --git a/src/imports/nativestyle/controls/DefaultRadioButton.qml b/src/quicknativestyle/controls/DefaultRadioButton.qml
index 29746ba7b0..29746ba7b0 100644
--- a/src/imports/nativestyle/controls/DefaultRadioButton.qml
+++ b/src/quicknativestyle/controls/DefaultRadioButton.qml
diff --git a/src/imports/nativestyle/controls/DefaultScrollBar.qml b/src/quicknativestyle/controls/DefaultScrollBar.qml
index b7b7873225..b7b7873225 100644
--- a/src/imports/nativestyle/controls/DefaultScrollBar.qml
+++ b/src/quicknativestyle/controls/DefaultScrollBar.qml
diff --git a/src/imports/nativestyle/controls/DefaultSlider.qml b/src/quicknativestyle/controls/DefaultSlider.qml
index ebc1c2652c..ebc1c2652c 100644
--- a/src/imports/nativestyle/controls/DefaultSlider.qml
+++ b/src/quicknativestyle/controls/DefaultSlider.qml
diff --git a/src/imports/nativestyle/controls/DefaultSpinBox.qml b/src/quicknativestyle/controls/DefaultSpinBox.qml
index 869ff41153..869ff41153 100644
--- a/src/imports/nativestyle/controls/DefaultSpinBox.qml
+++ b/src/quicknativestyle/controls/DefaultSpinBox.qml
diff --git a/src/imports/nativestyle/controls/DefaultTextArea.qml b/src/quicknativestyle/controls/DefaultTextArea.qml
index 5a72b91a0a..5a72b91a0a 100644
--- a/src/imports/nativestyle/controls/DefaultTextArea.qml
+++ b/src/quicknativestyle/controls/DefaultTextArea.qml
diff --git a/src/imports/nativestyle/controls/DefaultTextField.qml b/src/quicknativestyle/controls/DefaultTextField.qml
index d8bee33773..d8bee33773 100644
--- a/src/imports/nativestyle/controls/DefaultTextField.qml
+++ b/src/quicknativestyle/controls/DefaultTextField.qml
diff --git a/src/imports/nativestyle/controls/controls.pri b/src/quicknativestyle/controls/controls.pri
index 8675989e29..8675989e29 100644
--- a/src/imports/nativestyle/controls/controls.pri
+++ b/src/quicknativestyle/controls/controls.pri
diff --git a/src/imports/nativestyle/items/items.pri b/src/quicknativestyle/items/items.pri
index 5b6d9251a2..5b6d9251a2 100644
--- a/src/imports/nativestyle/items/items.pri
+++ b/src/quicknativestyle/items/items.pri
diff --git a/src/imports/nativestyle/items/qquickstyleitem.cpp b/src/quicknativestyle/items/qquickstyleitem.cpp
index 23f290d313..23f290d313 100644
--- a/src/imports/nativestyle/items/qquickstyleitem.cpp
+++ b/src/quicknativestyle/items/qquickstyleitem.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitem.h b/src/quicknativestyle/items/qquickstyleitem.h
index 3b87faf60c..3b87faf60c 100644
--- a/src/imports/nativestyle/items/qquickstyleitem.h
+++ b/src/quicknativestyle/items/qquickstyleitem.h
diff --git a/src/imports/nativestyle/items/qquickstyleitembutton.cpp b/src/quicknativestyle/items/qquickstyleitembutton.cpp
index 5dfe060fad..5dfe060fad 100644
--- a/src/imports/nativestyle/items/qquickstyleitembutton.cpp
+++ b/src/quicknativestyle/items/qquickstyleitembutton.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitembutton.h b/src/quicknativestyle/items/qquickstyleitembutton.h
index 41ca0cf176..41ca0cf176 100644
--- a/src/imports/nativestyle/items/qquickstyleitembutton.h
+++ b/src/quicknativestyle/items/qquickstyleitembutton.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemcheckbox.cpp b/src/quicknativestyle/items/qquickstyleitemcheckbox.cpp
index 6c4ac8ea30..6c4ac8ea30 100644
--- a/src/imports/nativestyle/items/qquickstyleitemcheckbox.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemcheckbox.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemcheckbox.h b/src/quicknativestyle/items/qquickstyleitemcheckbox.h
index 03bf34b933..03bf34b933 100644
--- a/src/imports/nativestyle/items/qquickstyleitemcheckbox.h
+++ b/src/quicknativestyle/items/qquickstyleitemcheckbox.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemcombobox.cpp b/src/quicknativestyle/items/qquickstyleitemcombobox.cpp
index 0ac3756e4e..0ac3756e4e 100644
--- a/src/imports/nativestyle/items/qquickstyleitemcombobox.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemcombobox.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemcombobox.h b/src/quicknativestyle/items/qquickstyleitemcombobox.h
index 79f1995ed3..79f1995ed3 100644
--- a/src/imports/nativestyle/items/qquickstyleitemcombobox.h
+++ b/src/quicknativestyle/items/qquickstyleitemcombobox.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemdial.cpp b/src/quicknativestyle/items/qquickstyleitemdial.cpp
index bf5784e1b5..bf5784e1b5 100644
--- a/src/imports/nativestyle/items/qquickstyleitemdial.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemdial.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemdial.h b/src/quicknativestyle/items/qquickstyleitemdial.h
index 569820fea2..569820fea2 100644
--- a/src/imports/nativestyle/items/qquickstyleitemdial.h
+++ b/src/quicknativestyle/items/qquickstyleitemdial.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemframe.cpp b/src/quicknativestyle/items/qquickstyleitemframe.cpp
index cf0604927e..cf0604927e 100644
--- a/src/imports/nativestyle/items/qquickstyleitemframe.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemframe.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemframe.h b/src/quicknativestyle/items/qquickstyleitemframe.h
index 8e8da68b35..8e8da68b35 100644
--- a/src/imports/nativestyle/items/qquickstyleitemframe.h
+++ b/src/quicknativestyle/items/qquickstyleitemframe.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemgroupbox.cpp b/src/quicknativestyle/items/qquickstyleitemgroupbox.cpp
index a828160d75..a828160d75 100644
--- a/src/imports/nativestyle/items/qquickstyleitemgroupbox.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemgroupbox.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemgroupbox.h b/src/quicknativestyle/items/qquickstyleitemgroupbox.h
index 2b07287f03..2b07287f03 100644
--- a/src/imports/nativestyle/items/qquickstyleitemgroupbox.h
+++ b/src/quicknativestyle/items/qquickstyleitemgroupbox.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemprogressbar.cpp b/src/quicknativestyle/items/qquickstyleitemprogressbar.cpp
index 480e8981b5..480e8981b5 100644
--- a/src/imports/nativestyle/items/qquickstyleitemprogressbar.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemprogressbar.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemprogressbar.h b/src/quicknativestyle/items/qquickstyleitemprogressbar.h
index 53692dbe32..53692dbe32 100644
--- a/src/imports/nativestyle/items/qquickstyleitemprogressbar.h
+++ b/src/quicknativestyle/items/qquickstyleitemprogressbar.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemradiobutton.cpp b/src/quicknativestyle/items/qquickstyleitemradiobutton.cpp
index 655bb0b63b..655bb0b63b 100644
--- a/src/imports/nativestyle/items/qquickstyleitemradiobutton.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemradiobutton.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemradiobutton.h b/src/quicknativestyle/items/qquickstyleitemradiobutton.h
index 56073d8f49..56073d8f49 100644
--- a/src/imports/nativestyle/items/qquickstyleitemradiobutton.h
+++ b/src/quicknativestyle/items/qquickstyleitemradiobutton.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemscrollbar.cpp b/src/quicknativestyle/items/qquickstyleitemscrollbar.cpp
index d6d41d969b..d6d41d969b 100644
--- a/src/imports/nativestyle/items/qquickstyleitemscrollbar.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemscrollbar.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemscrollbar.h b/src/quicknativestyle/items/qquickstyleitemscrollbar.h
index f89d8d3ec3..f89d8d3ec3 100644
--- a/src/imports/nativestyle/items/qquickstyleitemscrollbar.h
+++ b/src/quicknativestyle/items/qquickstyleitemscrollbar.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.cpp b/src/quicknativestyle/items/qquickstyleitemscrollviewcorner.cpp
index 3a992f2d9b..3a992f2d9b 100644
--- a/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemscrollviewcorner.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.h b/src/quicknativestyle/items/qquickstyleitemscrollviewcorner.h
index 637a8ea821..637a8ea821 100644
--- a/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.h
+++ b/src/quicknativestyle/items/qquickstyleitemscrollviewcorner.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemslider.cpp b/src/quicknativestyle/items/qquickstyleitemslider.cpp
index 67161ad3da..67161ad3da 100644
--- a/src/imports/nativestyle/items/qquickstyleitemslider.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemslider.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemslider.h b/src/quicknativestyle/items/qquickstyleitemslider.h
index 9a5142072b..9a5142072b 100644
--- a/src/imports/nativestyle/items/qquickstyleitemslider.h
+++ b/src/quicknativestyle/items/qquickstyleitemslider.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemspinbox.cpp b/src/quicknativestyle/items/qquickstyleitemspinbox.cpp
index 2a232b8a39..2a232b8a39 100644
--- a/src/imports/nativestyle/items/qquickstyleitemspinbox.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemspinbox.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemspinbox.h b/src/quicknativestyle/items/qquickstyleitemspinbox.h
index d4b9f9fa6c..d4b9f9fa6c 100644
--- a/src/imports/nativestyle/items/qquickstyleitemspinbox.h
+++ b/src/quicknativestyle/items/qquickstyleitemspinbox.h
diff --git a/src/imports/nativestyle/items/qquickstyleitemtextfield.cpp b/src/quicknativestyle/items/qquickstyleitemtextfield.cpp
index cd7d35aa67..cd7d35aa67 100644
--- a/src/imports/nativestyle/items/qquickstyleitemtextfield.cpp
+++ b/src/quicknativestyle/items/qquickstyleitemtextfield.cpp
diff --git a/src/imports/nativestyle/items/qquickstyleitemtextfield.h b/src/quicknativestyle/items/qquickstyleitemtextfield.h
index 35aaf753b5..35aaf753b5 100644
--- a/src/imports/nativestyle/items/qquickstyleitemtextfield.h
+++ b/src/quicknativestyle/items/qquickstyleitemtextfield.h
diff --git a/src/imports/nativestyle/qstyle/mac/mac.pri b/src/quicknativestyle/qstyle/mac/mac.pri
index 2f7ee7d436..2f7ee7d436 100644
--- a/src/imports/nativestyle/qstyle/mac/mac.pri
+++ b/src/quicknativestyle/qstyle/mac/mac.pri
diff --git a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm b/src/quicknativestyle/qstyle/mac/qquickmacstyle_mac.mm
index 5d061667da..5d061667da 100644
--- a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm
+++ b/src/quicknativestyle/qstyle/mac/qquickmacstyle_mac.mm
diff --git a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac_p.h b/src/quicknativestyle/qstyle/mac/qquickmacstyle_mac_p.h
index b9e1c5f341..b9e1c5f341 100644
--- a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac_p.h
+++ b/src/quicknativestyle/qstyle/mac/qquickmacstyle_mac_p.h
diff --git a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac_p_p.h b/src/quicknativestyle/qstyle/mac/qquickmacstyle_mac_p_p.h
index a0c67bfb6b..a0c67bfb6b 100644
--- a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac_p_p.h
+++ b/src/quicknativestyle/qstyle/mac/qquickmacstyle_mac_p_p.h
diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp b/src/quicknativestyle/qstyle/qquickcommonstyle.cpp
index 4a23039aad..4a23039aad 100644
--- a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp
+++ b/src/quicknativestyle/qstyle/qquickcommonstyle.cpp
diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle.h b/src/quicknativestyle/qstyle/qquickcommonstyle.h
index 894194a044..894194a044 100644
--- a/src/imports/nativestyle/qstyle/qquickcommonstyle.h
+++ b/src/quicknativestyle/qstyle/qquickcommonstyle.h
diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle_p.h b/src/quicknativestyle/qstyle/qquickcommonstyle_p.h
index ba2b868928..ba2b868928 100644
--- a/src/imports/nativestyle/qstyle/qquickcommonstyle_p.h
+++ b/src/quicknativestyle/qstyle/qquickcommonstyle_p.h
diff --git a/src/imports/nativestyle/qstyle/qquickcommonstylepixmaps_p.h b/src/quicknativestyle/qstyle/qquickcommonstylepixmaps_p.h
index 59f1afac6d..59f1afac6d 100644
--- a/src/imports/nativestyle/qstyle/qquickcommonstylepixmaps_p.h
+++ b/src/quicknativestyle/qstyle/qquickcommonstylepixmaps_p.h
diff --git a/src/imports/nativestyle/qstyle/qquickdrawutil.cpp b/src/quicknativestyle/qstyle/qquickdrawutil.cpp
index d5290a7bea..d5290a7bea 100644
--- a/src/imports/nativestyle/qstyle/qquickdrawutil.cpp
+++ b/src/quicknativestyle/qstyle/qquickdrawutil.cpp
diff --git a/src/imports/nativestyle/qstyle/qquickdrawutil.h b/src/quicknativestyle/qstyle/qquickdrawutil.h
index 4f7a6c2ecd..4f7a6c2ecd 100644
--- a/src/imports/nativestyle/qstyle/qquickdrawutil.h
+++ b/src/quicknativestyle/qstyle/qquickdrawutil.h
diff --git a/src/imports/nativestyle/qstyle/qquicknativestyle.cpp b/src/quicknativestyle/qstyle/qquicknativestyle.cpp
index 7a2030e06d..7a2030e06d 100644
--- a/src/imports/nativestyle/qstyle/qquicknativestyle.cpp
+++ b/src/quicknativestyle/qstyle/qquicknativestyle.cpp
diff --git a/src/imports/nativestyle/qstyle/qquicknativestyle.h b/src/quicknativestyle/qstyle/qquicknativestyle.h
index 13c313f0d8..13c313f0d8 100644
--- a/src/imports/nativestyle/qstyle/qquicknativestyle.h
+++ b/src/quicknativestyle/qstyle/qquicknativestyle.h
diff --git a/src/imports/nativestyle/qstyle/qquickstyle.cpp b/src/quicknativestyle/qstyle/qquickstyle.cpp
index 2278fb6532..2278fb6532 100644
--- a/src/imports/nativestyle/qstyle/qquickstyle.cpp
+++ b/src/quicknativestyle/qstyle/qquickstyle.cpp
diff --git a/src/imports/nativestyle/qstyle/qquickstyle.h b/src/quicknativestyle/qstyle/qquickstyle.h
index 38a0dcf5bd..38a0dcf5bd 100644
--- a/src/imports/nativestyle/qstyle/qquickstyle.h
+++ b/src/quicknativestyle/qstyle/qquickstyle.h
diff --git a/src/imports/nativestyle/qstyle/qquickstyle_p.h b/src/quicknativestyle/qstyle/qquickstyle_p.h
index 46f5374099..46f5374099 100644
--- a/src/imports/nativestyle/qstyle/qquickstyle_p.h
+++ b/src/quicknativestyle/qstyle/qquickstyle_p.h
diff --git a/src/imports/nativestyle/qstyle/qquickstylehelper.cpp b/src/quicknativestyle/qstyle/qquickstylehelper.cpp
index ebc82864f9..ebc82864f9 100644
--- a/src/imports/nativestyle/qstyle/qquickstylehelper.cpp
+++ b/src/quicknativestyle/qstyle/qquickstylehelper.cpp
diff --git a/src/imports/nativestyle/qstyle/qquickstylehelper_p.h b/src/quicknativestyle/qstyle/qquickstylehelper_p.h
index 757d647d36..757d647d36 100644
--- a/src/imports/nativestyle/qstyle/qquickstylehelper_p.h
+++ b/src/quicknativestyle/qstyle/qquickstylehelper_p.h
diff --git a/src/imports/nativestyle/qstyle/qquickstyleoption.cpp b/src/quicknativestyle/qstyle/qquickstyleoption.cpp
index c34dddd7e1..c34dddd7e1 100644
--- a/src/imports/nativestyle/qstyle/qquickstyleoption.cpp
+++ b/src/quicknativestyle/qstyle/qquickstyleoption.cpp
diff --git a/src/imports/nativestyle/qstyle/qquickstyleoption.h b/src/quicknativestyle/qstyle/qquickstyleoption.h
index 05c9ce57ae..05c9ce57ae 100644
--- a/src/imports/nativestyle/qstyle/qquickstyleoption.h
+++ b/src/quicknativestyle/qstyle/qquickstyleoption.h
diff --git a/src/imports/nativestyle/qstyle/qstyle.pri b/src/quicknativestyle/qstyle/qstyle.pri
index 4d02549897..4d02549897 100644
--- a/src/imports/nativestyle/qstyle/qstyle.pri
+++ b/src/quicknativestyle/qstyle/qstyle.pri
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp b/src/quicknativestyle/qstyle/windows/qquickwindowsstyle.cpp
index 242b770ddc..242b770ddc 100644
--- a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp
+++ b/src/quicknativestyle/qstyle/windows/qquickwindowsstyle.cpp
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle_p.h b/src/quicknativestyle/qstyle/windows/qquickwindowsstyle_p.h
index 92926b7129..92926b7129 100644
--- a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle_p.h
+++ b/src/quicknativestyle/qstyle/windows/qquickwindowsstyle_p.h
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle_p_p.h b/src/quicknativestyle/qstyle/windows/qquickwindowsstyle_p_p.h
index 64b95a4016..64b95a4016 100644
--- a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle_p_p.h
+++ b/src/quicknativestyle/qstyle/windows/qquickwindowsstyle_p_p.h
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsvistastyle.cpp b/src/quicknativestyle/qstyle/windows/qquickwindowsvistastyle.cpp
index 512f8291ea..512f8291ea 100644
--- a/src/imports/nativestyle/qstyle/windows/qquickwindowsvistastyle.cpp
+++ b/src/quicknativestyle/qstyle/windows/qquickwindowsvistastyle.cpp
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsvistastyle_p.h b/src/quicknativestyle/qstyle/windows/qquickwindowsvistastyle_p.h
index 07cd2b8ae7..07cd2b8ae7 100644
--- a/src/imports/nativestyle/qstyle/windows/qquickwindowsvistastyle_p.h
+++ b/src/quicknativestyle/qstyle/windows/qquickwindowsvistastyle_p.h
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsvistastyle_p_p.h b/src/quicknativestyle/qstyle/windows/qquickwindowsvistastyle_p_p.h
index a5383175a3..a5383175a3 100644
--- a/src/imports/nativestyle/qstyle/windows/qquickwindowsvistastyle_p_p.h
+++ b/src/quicknativestyle/qstyle/windows/qquickwindowsvistastyle_p_p.h
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsxpstyle.cpp b/src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle.cpp
index a3e8ef2042..a3e8ef2042 100644
--- a/src/imports/nativestyle/qstyle/windows/qquickwindowsxpstyle.cpp
+++ b/src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle.cpp
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsxpstyle_p.h b/src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle_p.h
index 5d8d5e2031..5d8d5e2031 100644
--- a/src/imports/nativestyle/qstyle/windows/qquickwindowsxpstyle_p.h
+++ b/src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle_p.h
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsxpstyle_p_p.h b/src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle_p_p.h
index a449ecdda7..a449ecdda7 100644
--- a/src/imports/nativestyle/qstyle/windows/qquickwindowsxpstyle_p_p.h
+++ b/src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle_p_p.h
diff --git a/src/imports/nativestyle/qstyle/windows/windows.pri b/src/quicknativestyle/qstyle/windows/windows.pri
index beb50a5b20..beb50a5b20 100644
--- a/src/imports/nativestyle/qstyle/windows/windows.pri
+++ b/src/quicknativestyle/qstyle/windows/windows.pri
diff --git a/src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp b/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp
index 7b638704ab..7b638704ab 100644
--- a/src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp
+++ b/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp
diff --git a/src/imports/nativestyle/util/FocusFrame.qml b/src/quicknativestyle/util/FocusFrame.qml
index b3f3a80eb7..b3f3a80eb7 100644
--- a/src/imports/nativestyle/util/FocusFrame.qml
+++ b/src/quicknativestyle/util/FocusFrame.qml
diff --git a/src/imports/nativestyle/util/qquickmacfocusframe.h b/src/quicknativestyle/util/qquickmacfocusframe.h
index 425b2a6827..425b2a6827 100644
--- a/src/imports/nativestyle/util/qquickmacfocusframe.h
+++ b/src/quicknativestyle/util/qquickmacfocusframe.h
diff --git a/src/imports/nativestyle/util/qquickmacfocusframe.mm b/src/quicknativestyle/util/qquickmacfocusframe.mm
index 14b5de60ff..75ef911b91 100644
--- a/src/imports/nativestyle/util/qquickmacfocusframe.mm
+++ b/src/quicknativestyle/util/qquickmacfocusframe.mm
@@ -106,7 +106,10 @@ void QQuickMacFocusFrame::moveToItem(QQuickItem *item)
 
 void QQuickMacFocusFrame::createFocusFrame(QQmlContext *context)
 {
-    QQmlComponent component(context->engine(), QUrl(QStringLiteral("qrc:/util/FocusFrame.qml")));
+    QQmlComponent component(
+            context->engine(),
+            QUrl(QStringLiteral(
+                    "qrc:/qt-project.org/imports/QtQuick/NativeStyle/util/FocusFrame.qml")));
     m_focusFrame.reset(qobject_cast<QQuickItem *>(component.create()));
 
     auto indicatorColor = qt_mac_toQColor(NSColor.keyboardFocusIndicatorColor.CGColor);
diff --git a/src/imports/nativestyle/util/util.pri b/src/quicknativestyle/util/util.pri
index 96786eacaa..96786eacaa 100644
--- a/src/imports/nativestyle/util/util.pri
+++ b/src/quicknativestyle/util/util.pri
diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates2/CMakeLists.txt
index 4f4bf55206..b326e467cb 100644
--- a/src/quicktemplates2/CMakeLists.txt
+++ b/src/quicktemplates2/CMakeLists.txt
@@ -1,10 +1,16 @@
-# Generated from quicktemplates2.pro.
-
 #####################################################################
 ## QuickTemplates2 Module:
 #####################################################################
 
-qt_internal_add_module(QuickTemplates2
+qt_internal_add_qml_module(QuickTemplates2
+    URI "QtQuick.Templates"
+    VERSION "${PROJECT_VERSION}"
+    CLASSNAME QtQuickTemplates2Plugin
+    DEPENDENCIES
+        QtQuick/auto
+    PLUGIN_TARGET qtquicktemplates2plugin
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_PLUGIN_SOURCE
     SOURCES
         accessible/qaccessiblequickpage.cpp accessible/qaccessiblequickpage_p.h
         qquickabstractbutton.cpp qquickabstractbutton_p.h
@@ -131,16 +137,6 @@ qt_internal_add_module(QuickTemplates2
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:quicktemplates2.pro:<TRUE>:
-# MODULE = "quicktemplates2"
-# QMLTYPES_FILENAME = "plugins.qmltypes"
-# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Templates"
-# QML_IMPORT_NAME = "QtQuick.Templates"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-
-## Scopes:
-#####################################################################
-
 qt_internal_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels
     LIBRARIES
         Qt::QmlModelsPrivate
@@ -156,12 +152,9 @@ qt_internal_extend_target(QuickTemplates2 CONDITION QT_FEATURE_quick_listview AN
         qquicktumbler_p_p.h
 )
 
-set_target_properties(QuickTemplates2 PROPERTIES
-    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
-    QT_QML_MODULE_VERSION ${PROJECT_VERSION}
-    QT_QML_MODULE_URI QtQuick.Templates
-    QT_QMLTYPES_FILENAME plugins.qmltypes
-    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Templates"
+qt_internal_extend_Target(qtquicktemplates2plugin
+    SOURCES
+        qtquicktemplates2plugin.cpp
+    LIBRARIES
+        Qt::QuickTemplates2Private
 )
-
-qt6_qml_type_registration(QuickTemplates2)
diff --git a/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc b/src/quicktemplates2/doc/src/qtquicktemplates2-index.qdoc
index c7e2554821..c7e2554821 100644
--- a/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc
+++ b/src/quicktemplates2/doc/src/qtquicktemplates2-index.qdoc
diff --git a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc b/src/quicktemplates2/doc/src/qtquicktemplates2-qmltypes.qdoc
index 396dbdc52f..396dbdc52f 100644
--- a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc
+++ b/src/quicktemplates2/doc/src/qtquicktemplates2-qmltypes.qdoc
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/quicktemplates2/qtquicktemplates2plugin.cpp
index da89601dd3..da89601dd3 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/quicktemplates2/qtquicktemplates2plugin.cpp
diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/accessibility/CMakeLists.txt
index 3286653f3b..596bf3b9bd 100644
--- a/tests/auto/accessibility/CMakeLists.txt
+++ b/tests/auto/accessibility/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_internal_add_test(tst_accessibility
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_accessibility.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/cursor/CMakeLists.txt b/tests/auto/cursor/CMakeLists.txt
index a04e9b4439..5f02758caa 100644
--- a/tests/auto/cursor/CMakeLists.txt
+++ b/tests/auto/cursor/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_cursor
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_cursor.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/customization/CMakeLists.txt b/tests/auto/customization/CMakeLists.txt
index 341e6415b4..54e689f4c1 100644
--- a/tests/auto/customization/CMakeLists.txt
+++ b/tests/auto/customization/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_customization
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_customization.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/CMakeLists.txt b/tests/auto/dialogs/qquickfiledialogimpl/CMakeLists.txt
index 631cb9e896..22e645466a 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/CMakeLists.txt
+++ b/tests/auto/dialogs/qquickfiledialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickfiledialogimpl
         ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h
         tst_qquickfiledialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/focus/CMakeLists.txt b/tests/auto/focus/CMakeLists.txt
index 1d15e0fb2b..b9932df1b4 100644
--- a/tests/auto/focus/CMakeLists.txt
+++ b/tests/auto/focus/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_focus
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_focus.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/font/CMakeLists.txt b/tests/auto/font/CMakeLists.txt
index a9904abcab..2f356eee61 100644
--- a/tests/auto/font/CMakeLists.txt
+++ b/tests/auto/font/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_font
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_font.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/palette/CMakeLists.txt b/tests/auto/palette/CMakeLists.txt
index d281db9457..a924fd1660 100644
--- a/tests/auto/palette/CMakeLists.txt
+++ b/tests/auto/palette/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_palette
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_palette.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickapplicationwindow/CMakeLists.txt b/tests/auto/qquickapplicationwindow/CMakeLists.txt
index 4d4c91ef3d..1c346d15e6 100644
--- a/tests/auto/qquickapplicationwindow/CMakeLists.txt
+++ b/tests/auto/qquickapplicationwindow/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickapplicationwindow
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickapplicationwindow.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickcontrol/CMakeLists.txt b/tests/auto/qquickcontrol/CMakeLists.txt
index 2a580031e5..3448a8c79c 100644
--- a/tests/auto/qquickcontrol/CMakeLists.txt
+++ b/tests/auto/qquickcontrol/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickcontrol
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickcontrol.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/qquickdrawer/CMakeLists.txt
index 9e1057d4b7..812e4d2091 100644
--- a/tests/auto/qquickdrawer/CMakeLists.txt
+++ b/tests/auto/qquickdrawer/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickdrawer
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickdrawer.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickheaderview/CMakeLists.txt b/tests/auto/qquickheaderview/CMakeLists.txt
index 62b0211e00..9f428a4862 100644
--- a/tests/auto/qquickheaderview/CMakeLists.txt
+++ b/tests/auto/qquickheaderview/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickheaderview
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickheaderview.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/qquickiconimage/CMakeLists.txt
index d5d9b5a10f..dbe810acf6 100644
--- a/tests/auto/qquickiconimage/CMakeLists.txt
+++ b/tests/auto/qquickiconimage/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_internal_add_test(tst_qquickiconimage
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickiconimage.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     LIBRARIES
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
diff --git a/tests/auto/qquickiconlabel/CMakeLists.txt b/tests/auto/qquickiconlabel/CMakeLists.txt
index ef7ba09982..a26abc4857 100644
--- a/tests/auto/qquickiconlabel/CMakeLists.txt
+++ b/tests/auto/qquickiconlabel/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickiconlabel
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickiconlabel.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     LIBRARIES
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
diff --git a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt
index 670d1bb69c..72d848dc92 100644
--- a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt
+++ b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickmaterialstyleconf
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickmaterialstyleconf.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickmenu/CMakeLists.txt b/tests/auto/qquickmenu/CMakeLists.txt
index 4a409a618e..10c2811600 100644
--- a/tests/auto/qquickmenu/CMakeLists.txt
+++ b/tests/auto/qquickmenu/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickmenu
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickmenu.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickmenubar/CMakeLists.txt b/tests/auto/qquickmenubar/CMakeLists.txt
index c960f8557c..975751296e 100644
--- a/tests/auto/qquickmenubar/CMakeLists.txt
+++ b/tests/auto/qquickmenubar/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickmenubar
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickmenubar.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickninepatchimage/CMakeLists.txt b/tests/auto/qquickninepatchimage/CMakeLists.txt
index 7e98f01278..9d04164353 100644
--- a/tests/auto/qquickninepatchimage/CMakeLists.txt
+++ b/tests/auto/qquickninepatchimage/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_internal_add_test(tst_qquickninepatchimage
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickninepatchimage.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     LIBRARIES
         Qt::GuiPrivate
         Qt::QuickControls2Private
diff --git a/tests/auto/qquickpopup/CMakeLists.txt b/tests/auto/qquickpopup/CMakeLists.txt
index 20adc5dbed..6fb436763d 100644
--- a/tests/auto/qquickpopup/CMakeLists.txt
+++ b/tests/auto/qquickpopup/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickpopup
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickpopup.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickstyle/CMakeLists.txt b/tests/auto/qquickstyle/CMakeLists.txt
index 258db4cc34..93b63a194a 100644
--- a/tests/auto/qquickstyle/CMakeLists.txt
+++ b/tests/auto/qquickstyle/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickstyle
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickstyle.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
diff --git a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt
index eaa7b47352..6aeeaa32bf 100644
--- a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt
+++ b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickuniversalstyleconf
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickuniversalstyleconf.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/sanity/CMakeLists.txt b/tests/auto/sanity/CMakeLists.txt
index 85c3bc06a6..804640b715 100644
--- a/tests/auto/sanity/CMakeLists.txt
+++ b/tests/auto/sanity/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_sanity
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_sanity.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp
index 8ec590e5bc..a19319b3c2 100644
--- a/tests/auto/sanity/tst_sanity.cpp
+++ b/tests/auto/sanity/tst_sanity.cpp
@@ -171,10 +171,10 @@ void tst_Sanity::initTestCase()
 
     // Then, collect the files from each installed style directory.
     const QVector<QPair<QString, QString>> styleRelativePaths = {
-        { "controls/basic", "QtQuick/Controls/Basic" },
-        { "controls/fusion", "QtQuick/Controls/Fusion" },
-        { "controls/material", "QtQuick/Controls/Material" },
-        { "controls/universal", "QtQuick/Controls/Universal" },
+        { "quickcontrols2/basic", "QtQuick/Controls/Basic" },
+        { "quickcontrols2/fusion", "QtQuick/Controls/Fusion" },
+        { "quickcontrols2/material", "QtQuick/Controls/Material" },
+        { "quickcontrols2/universal", "QtQuick/Controls/Universal" },
     };
     for (const auto &stylePathPair : styleRelativePaths) {
         forEachControl(&engine, stylePathPair.first, stylePathPair.second, QStringList(),
diff --git a/tests/auto/shared/util.pri b/tests/auto/shared/util.pri
index 3e270f06c4..6366776b2b 100644
--- a/tests/auto/shared/util.pri
+++ b/tests/auto/shared/util.pri
@@ -11,4 +11,4 @@ android|ios {
 } else {
     DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\"
 }
-DEFINES += QQC2_IMPORT_PATH=\\\"$$QQC2_SOURCE_TREE/src/imports\\\"
+DEFINES += QQC2_IMPORT_PATH=\\\"$$QQC2_SOURCE_TREE/src\\\"
diff --git a/tests/auto/shared/visualtestutil.h b/tests/auto/shared/visualtestutil.h
index 76c4482160..4fdab95dd0 100644
--- a/tests/auto/shared/visualtestutil.h
+++ b/tests/auto/shared/visualtestutil.h
@@ -154,6 +154,7 @@ namespace QQuickVisualTestUtil
             QQmlComponent component(&engine);
 
             component.loadUrl(testCase->testFileUrl(testFilePath));
+            QVERIFY2(component.isReady(), qPrintable(component.errorString()));
             QObject *rootObject = component.createWithInitialProperties(initialProperties);
             cleanup.reset(rootObject);
             if (component.isError() || !rootObject) {
diff --git a/tests/auto/snippets/CMakeLists.txt b/tests/auto/snippets/CMakeLists.txt
index cecbbc79f1..a8d02b7d5e 100644
--- a/tests/auto/snippets/CMakeLists.txt
+++ b/tests/auto/snippets/CMakeLists.txt
@@ -14,7 +14,7 @@ qt_internal_add_test(tst_snippets
     SOURCES
         tst_snippets.cpp
     DEFINES
-        QQC2_SNIPPETS_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports/controls/doc/snippets\\\"
+        QQC2_SNIPPETS_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/quickcontrols2/doc/snippets\\\"
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Quick
diff --git a/tests/auto/styleimports/CMakeLists.txt b/tests/auto/styleimports/CMakeLists.txt
index fb15608ec6..ee626ac5bf 100644
--- a/tests/auto/styleimports/CMakeLists.txt
+++ b/tests/auto/styleimports/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_styleimports
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_styleimports.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt b/tests/auto/styleimportscompiletimematerial/CMakeLists.txt
index 207f409125..8ea0508b53 100644
--- a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt
+++ b/tests/auto/styleimportscompiletimematerial/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_styleimportscompiletimematerial
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_styleimportscompiletimematerial.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt b/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt
index cdbbf9e802..40dc8dca0f 100644
--- a/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt
+++ b/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_styleimportscompiletimeqmlonly
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_styleimportscompiletimeqmlonly.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/translation/CMakeLists.txt b/tests/auto/translation/CMakeLists.txt
index 783a5072c3..9a2a1bf1b7 100644
--- a/tests/auto/translation/CMakeLists.txt
+++ b/tests/auto/translation/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_translation
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_translation.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/benchmarks/creationtime/CMakeLists.txt b/tests/benchmarks/creationtime/CMakeLists.txt
index 02452b544b..51880533a9 100644
--- a/tests/benchmarks/creationtime/CMakeLists.txt
+++ b/tests/benchmarks/creationtime/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_creationtime
         ../../auto/shared/visualtestutil.cpp ../../auto/shared/visualtestutil.h
         tst_creationtime.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp
index 87869bcaab..f538371620 100644
--- a/tests/benchmarks/creationtime/tst_creationtime.cpp
+++ b/tests/benchmarks/creationtime/tst_creationtime.cpp
@@ -111,7 +111,7 @@ void tst_CreationTime::basicStyle()
 void tst_CreationTime::basicStyle_data()
 {
     QTest::addColumn<QUrl>("url");
-    addTestRowForEachControl(styleHelper.engine.data(), "controls/basic", "QtQuick/Controls/Basic", QStringList() << "ApplicationWindow");
+    addTestRowForEachControl(styleHelper.engine.data(), "quickcontrols2/basic", "QtQuick/Controls/Basic", QStringList() << "ApplicationWindow");
 }
 
 void tst_CreationTime::fusion()
@@ -123,7 +123,7 @@ void tst_CreationTime::fusion()
 void tst_CreationTime::fusion_data()
 {
     QTest::addColumn<QUrl>("url");
-    addTestRowForEachControl(styleHelper.engine.data(), "controls/fusion", "QtQuick/Controls/Fusion", QStringList() << "ApplicationWindow" << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
+    addTestRowForEachControl(styleHelper.engine.data(), "quickcontrols2/fusion", "QtQuick/Controls/Fusion", QStringList() << "ApplicationWindow" << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
 }
 
 void tst_CreationTime::imagine()
@@ -135,7 +135,7 @@ void tst_CreationTime::imagine()
 void tst_CreationTime::imagine_data()
 {
     QTest::addColumn<QUrl>("url");
-    addTestRowForEachControl(styleHelper.engine.data(), "controls/imagine", "QtQuick/Controls/Imagine", QStringList() << "ApplicationWindow");
+    addTestRowForEachControl(styleHelper.engine.data(), "quickcontrols2/imagine", "QtQuick/Controls/Imagine", QStringList() << "ApplicationWindow");
 }
 
 void tst_CreationTime::material()
@@ -147,7 +147,7 @@ void tst_CreationTime::material()
 void tst_CreationTime::material_data()
 {
     QTest::addColumn<QUrl>("url");
-    addTestRowForEachControl(styleHelper.engine.data(), "controls/material", "QtQuick/Controls/Material", QStringList() << "ApplicationWindow" << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate");
+    addTestRowForEachControl(styleHelper.engine.data(), "quickcontrols2/material", "QtQuick/Controls/Material", QStringList() << "ApplicationWindow" << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate");
 }
 
 void tst_CreationTime::universal()
@@ -159,7 +159,7 @@ void tst_CreationTime::universal()
 void tst_CreationTime::universal_data()
 {
     QTest::addColumn<QUrl>("url");
-    addTestRowForEachControl(styleHelper.engine.data(), "controls/universal", "QtQuick/Controls/Universal", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator");
+    addTestRowForEachControl(styleHelper.engine.data(), "quickcontrols2/universal", "QtQuick/Controls/Universal", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator");
 }
 
 QTEST_MAIN(tst_CreationTime)
diff --git a/tests/benchmarks/objectcount/CMakeLists.txt b/tests/benchmarks/objectcount/CMakeLists.txt
index bcd0a2eda5..122842cd5e 100644
--- a/tests/benchmarks/objectcount/CMakeLists.txt
+++ b/tests/benchmarks/objectcount/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_objectcount
         ../../auto/shared/visualtestutil.cpp ../../auto/shared/visualtestutil.h
         tst_objectcount.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp
index cd8b4aee29..c8d294860f 100644
--- a/tests/benchmarks/objectcount/tst_objectcount.cpp
+++ b/tests/benchmarks/objectcount/tst_objectcount.cpp
@@ -93,11 +93,11 @@ void tst_ObjectCount::cleanup()
 
 static void initTestRows(QQmlEngine *engine)
 {
-    addTestRowForEachControl(engine, "controls/basic", "QtQuick/Controls/Basic");
-    addTestRowForEachControl(engine, "controls/fusion", "QtQuick/Controls/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
-    addTestRowForEachControl(engine, "controls/imagine", "QtQuick/Controls/Imagine");
-    addTestRowForEachControl(engine, "controls/material", "QtQuick/Controls/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate");
-    addTestRowForEachControl(engine, "controls/universal", "QtQuick/Controls/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator");
+    addTestRowForEachControl(engine, "quickcontrols2/basic", "QtQuick/Controls/Basic");
+    addTestRowForEachControl(engine, "quickcontrols2/fusion", "QtQuick/Controls/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
+    addTestRowForEachControl(engine, "quickcontrols2/imagine", "QtQuick/Controls/Imagine");
+    addTestRowForEachControl(engine, "quickcontrols2/material", "QtQuick/Controls/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate");
+    addTestRowForEachControl(engine, "quickcontrols2/universal", "QtQuick/Controls/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator");
 }
 
 template <typename T>