2421 files changed, 725 insertions, 1681 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b11240b..deb79c7b 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 d056a899..00000000
--- 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 38454f99..00000000
--- 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 b39bdb5c..00000000
--- 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 d80e69e8..00000000
--- 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 5b02409f..00000000
--- 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 d3b7f94e..00000000
--- 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 bdd45a29..00000000
--- 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 01ab8221..00000000
--- 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 6ac920b1..00000000
--- 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 91c43261..00000000
--- 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 0b552919..00000000
--- 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 06c6179b..00000000
--- 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 d5f29f5c..00000000
--- 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 f96fd9ff..00000000
--- 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 11d5bcdf..00000000
--- 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 9bc06c25..00000000
--- 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 ada7cb59..00000000
--- 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 00000000..72b278fe
--- /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 07c99156..e1ddc4ee 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 12197f7f..12197f7f 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 9360d747..9360d747 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 45f0585c..45f0585c 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 0c6217bd..0c6217bd 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 7945b45f..7945b45f 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 7faa8141..7faa8141 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 3986694f..3986694f 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 b2d3cd37..b2d3cd37 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 670df8ed..670df8ed 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 beaeed92..beaeed92 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 2f7a851c..2f7a851c 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 54ed8204..54ed8204 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 44ebba6d..44ebba6d 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 de1c7a29..de1c7a29 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 c6eff0ba..c6eff0ba 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 51b7601a..51b7601a 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 ec6e8616..ec6e8616 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 04a5e079..04a5e079 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 1df047d9..1df047d9 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 06a26237..06a26237 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 55a54937..55a54937 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 8bfcfc93..8bfcfc93 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 b867f3c8..b867f3c8 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 a28dc828..a28dc828 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 69878cb9..69878cb9 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 f3eca2c3..f3eca2c3 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 e7946477..e7946477 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 7096ff8a..7096ff8a 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 9add9d6e..9add9d6e 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 c7b699b2..c7b699b2 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 d284a513..d284a513 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 16dffd5e..16dffd5e 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 fc66b61b..fc66b61b 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 3b1f4b74..3b1f4b74 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 e644c86c..e644c86c 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 4f61d423..4f61d423 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 01b7482d..01b7482d 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 fcfcc664..fcfcc664 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 7407d266..7407d266 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 f29d5b9e..f29d5b9e 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 9fe973c5..9fe973c5 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 f2e0970c..f2e0970c 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 9434a927..9434a927 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 a6fff1c0..a6fff1c0 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 e2f4e11e..e2f4e11e 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 b97e379f..b97e379f 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 d7cc46c0..d7cc46c0 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 90bdb121..90bdb121 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 cbdaa24a..cbdaa24a 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 6c0043ae..6c0043ae 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 09ed5a1e..09ed5a1e 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 3a206839..3a206839 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 d4f27655..d4f27655 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 21ac6527..21ac6527 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 3dba6038..3dba6038 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 315e7c73..315e7c73 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 e5d13b31..e5d13b31 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 f04620a3..f04620a3 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 9d1ef57e..9d1ef57e 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 ea4de57f..ea4de57f 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 43b3fc17..43b3fc17 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 365692dc..365692dc 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 6581337a..6581337a 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 e406ff03..e406ff03 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 11ea5377..11ea5377 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 54ad7187..54ad7187 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 4ac2d051..77659a2a 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 a4855c21..a4855c21 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 bb66fc8f..bb66fc8f 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 70170f0e..70170f0e 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 ac50d5fa..ac50d5fa 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 0c51c9a2..0c51c9a2 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 f657a0d2..f657a0d2 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 fadc538a..fadc538a 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 ee7dc6c8..0067a53f 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 6465460d..6465460d 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 1a1827e3..1a1827e3 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 6a1924ed..6a1924ed 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 93919075..93919075 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 7a68a431..7a68a431 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 367384c0..367384c0 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 8450e9f9..8450e9f9 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 1f2b4fbb..1f2b4fbb 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 e4cdbd14..e4cdbd14 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 0d286f99..0d286f99 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 22f29806..22f29806 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 27ff8ce6..27ff8ce6 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 e5214593..e5214593 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 3a1cb298..3a1cb298 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 9d7dfdfd..9d7dfdfd 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 475e58cc..475e58cc 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 79199d12..79199d12 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 e7fd1c0b..e7fd1c0b 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 ab1f12f5..ab1f12f5 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 bc17dc39..bc17dc39 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 ff75ee4e..ff75ee4e 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 bd5ef290..bd5ef290 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 181db9e4..181db9e4 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 720483d9..720483d9 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 a49538d1..a49538d1 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 adb91435..adb91435 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 69be290c..69be290c 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 e47cbd52..e47cbd52 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 6ab810fd..6ab810fd 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 763f96bb..763f96bb 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 dcb23d65..dcb23d65 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 43c4e428..43c4e428 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 425f4975..425f4975 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 772cc583..772cc583 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 66d24743..66d24743 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 cbf13f36..cbf13f36 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 f8209a1e..f8209a1e 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 6ce4ee6c..6ce4ee6c 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 0d919f9e..0d919f9e 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 8203e107..8203e107 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 f1b11ac2..f1b11ac2 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 5e38f69c..5e38f69c 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 fa6112f6..fa6112f6 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 9c66e4ba..9c66e4ba 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 1d21c51d..1d21c51d 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 8a4f8097..8a4f8097 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 774e41ec..774e41ec 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 9d10f7fa..9d10f7fa 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 a69df1f3..a69df1f3 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 7c057e01..7c057e01 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 337f7f36..337f7f36 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 d833d52c..d833d52c 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 55c7940a..55c7940a 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 c7067c5c..c7067c5c 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 4c5cf351..4c5cf351 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 479a8442..479a8442 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 79663c0b..79663c0b 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 fd0135ab..fd0135ab 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 e7e0b640..e7e0b640 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 92357c51..92357c51 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 f436443b..f436443b 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 d883045b..d883045b 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 79477712..79477712 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 3ecd7f89..3ecd7f89 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 eeb03e28..eeb03e28 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 f0662d20..f0662d20 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 10891e91..10891e91 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 80c1d958..80c1d958 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 6e0f228c..6e0f228c 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 199752fb..199752fb 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 58311fbe..58311fbe 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 2ae6cf75..a785a11f 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 7fb3b024..7fb3b024 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 7eea6656..7eea6656 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 223e8042..223e8042 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 bd9bbb72..bd9bbb72 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 717082af..717082af 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 1d853ecb..1d853ecb 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 9dcb7c74..9dcb7c74 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 3f3d84b8..3f3d84b8 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 1f876e3d..1f876e3d 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 a0a29953..a0a29953 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 7786223c..7786223c 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 27fd6ac2..27fd6ac2 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 2ccb8231..2ccb8231 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 7b2899d3..7b2899d3 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 ff70d52c..ff70d52c 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 5a46e72a..5a46e72a 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 00000000..38d82ace
--- /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 d3aae9b6..d3aae9b6 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 8014480c..8014480c 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 0f49fa25..0f49fa25 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 810f19b5..810f19b5 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 15d1ddf5..15d1ddf5 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 12033eea..12033eea 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 3937437b..3937437b 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 024fe589..024fe589 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 026cb2b1..026cb2b1 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 36739956..36739956 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 f808b001..f808b001 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 45a4df4f..45a4df4f 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 448a20d9..448a20d9 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 1757521d..1757521d 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 569b44c8..569b44c8 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 325c5698..325c5698 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 c73652e9..c73652e9 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 965ed655..965ed655 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 9dcc2097..9dcc2097 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 36739956..36739956 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 14f87925..14f87925 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 df0af7e7..df0af7e7 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 1757521d..1757521d 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 577033ed..577033ed 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 58d34689..58d34689 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 ae525b74..ae525b74 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 3af20540..3af20540 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 9c07e8c5..9c07e8c5 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 3937437b..3937437b 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 1757521d..1757521d 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 a28a2917..a28a2917 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 4236de67..4236de67 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 df0af7e7..df0af7e7 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 6f02cdaa..6f02cdaa 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 df0af7e7..df0af7e7 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 785d7a50..785d7a50 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 33a90f2a..33a90f2a 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 2b1b17d2..2b1b17d2 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 5a46e72a..5a46e72a 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 a62147ec..a62147ec 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 25fb9275..25fb9275 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 6692b203..6692b203 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 666d1ed9..666d1ed9 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 5aa57d7f..5aa57d7f 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 bb2278ff..bb2278ff 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 c44909f6..c44909f6 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 5c921deb..5c921deb 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 f90a1ba7..f90a1ba7 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 ee669b3a..ee669b3a 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 8d89eab8..8d89eab8 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 51c5601d..51c5601d 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 2d31b17c..2d31b17c 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 15fc3505..15fc3505 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 5f823905..5f823905 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 5a55bd9f..5a55bd9f 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 cd21394e..cd21394e 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 7beee2fa..7beee2fa 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 b3b63e35..b3b63e35 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 8d8c7c09..8d8c7c09 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 22547a16..22547a16 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 32abc8bf..32abc8bf 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 e5b65ad5..e5b65ad5 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 8b876f38..8b876f38 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 5542ecf8..5542ecf8 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 9cf43248..9cf43248 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 80dab3c7..80dab3c7 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 822cf3e7..822cf3e7 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 b3ed007a..b3ed007a 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 cb81308f..cb81308f 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 788bef07..788bef07 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 b68d3845..b68d3845 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 7001413d..7001413d 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 b5ac87e8..b5ac87e8 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 bc6810b6..bc6810b6 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 23db032f..23db032f 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 edb6b377..edb6b377 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 0fb89675..0fb89675 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 7be0ee81..7be0ee81 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 62ebe487..62ebe487 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 2b804844..2b804844 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 55bb116a..55bb116a 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 a023f73c..a023f73c 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 6fede21d..6fede21d 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 00694003..00694003 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 d38170e2..d38170e2 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 07b46a8a..07b46a8a 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 4bbddda4..4bbddda4 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 1c4c7b29..1c4c7b29 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 3be4624d..3be4624d 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 aee69b33..aee69b33 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 d4b470dc..d4b470dc 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 f6f36666..f6f36666 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 4553e165..4553e165 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 5ef73ff1..5ef73ff1 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 f8ca7a36..f8ca7a36 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 0eb7f966..0eb7f966 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 bd0a9729..bd0a9729 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 a08622df..a08622df 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 93842e4c..93842e4c 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 37277c5e..37277c5e 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 f88711dd..f88711dd 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 b62a3bad..b62a3bad 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 a6ced349..a6ced349 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 0f19d0ef..0f19d0ef 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 9b5ef951..9b5ef951 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 031cb27c..031cb27c 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 446c4696..446c4696 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 0ccb978c..0ccb978c 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 e0181592..e0181592 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 9abd2756..9abd2756 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 787f54ca..787f54ca 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 f1b2dc0f..f1b2dc0f 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 4afc1fba..4afc1fba 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 c32ecc71..c32ecc71 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 ba5537ac..ba5537ac 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 c4a62a65..c4a62a65 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 e05fd41b..e05fd41b 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 5cb5b2e1..5cb5b2e1 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 569373af..569373af 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 fd9e6cee..fd9e6cee 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 3298f695..3298f695 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 9ab7861c..9ab7861c 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 e5958cde..e5958cde 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 5e99f06f..5e99f06f 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 68f22c5d..68f22c5d 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 549c11c6..549c11c6 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 98eb8232..98eb8232 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 ff5f95cf..ff5f95cf 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 236abf0c..236abf0c 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 d27f1b90..d27f1b90 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 4bd8bd95..4bd8bd95 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 f3137800..f3137800 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 e971a7aa..e971a7aa 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 099db170..099db170 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 fefae223..fefae223 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 653d200f..653d200f 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 4be09579..4be09579 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 46d3e3eb..46d3e3eb 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 e2bd8b6f..e2bd8b6f 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 7de076d3..7de076d3 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 9c8dd0f4..9c8dd0f4 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 3dc64fb9..3dc64fb9 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 737beb16..737beb16 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 37c40c7c..37c40c7c 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 10d626a3..10d626a3 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 c6c3d1bc..c6c3d1bc 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 d5a0d51b..d5a0d51b 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 56a15867..56a15867 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 d70c0ee4..d70c0ee4 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 c0dd0689..c0dd0689 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 8d058d6c..8d058d6c 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 da3fab98..da3fab98 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 4f7206dc..4f7206dc 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 cf310648..cf310648 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 cf310648..cf310648 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 966a2d4a..966a2d4a 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 0f004a89..0f004a89 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 4b2057d1..4b2057d1 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 551e8a0c..551e8a0c 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 a7bd7c19..a7bd7c19 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 16a198f9..16a198f9 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 6312c999..6312c999 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 9e22b2e7..9e22b2e7 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 005ab7b3..005ab7b3 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 5bbc41a4..5bbc41a4 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 24f6790b..24f6790b 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 cfb1fb5b..cfb1fb5b 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 71c54113..71c54113 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 c17f38ac..c17f38ac 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 33b5f45f..33b5f45f 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 0c92f865..0c92f865 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 74806f17..74806f17 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 736f34f6..736f34f6 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 f628b20c..f628b20c 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 e3cb31dc..e3cb31dc 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 d8061161..d8061161 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 c270c6ef..c270c6ef 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 99e5b597..99e5b597 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 7119ef22..7119ef22 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 820ad79c..820ad79c 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 029679ce..029679ce 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 c26795a7..c26795a7 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 ea2f9ea5..ea2f9ea5 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 bab99a5e..bab99a5e 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 c42df81e..c42df81e 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 0627d085..0627d085 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 0a606c99..0a606c99 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 9598b13a..9598b13a 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 db645375..db645375 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 5a1a1094..5a1a1094 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 144ac97c..144ac97c 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 fb830563..fb830563 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 ecf2bb16..ecf2bb16 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 ffe2c267..ffe2c267 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 35f8892f..35f8892f 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 dccb6efc..dccb6efc 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 7242f343..7242f343 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 5730ff23..5730ff23 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 0bafcf86..0bafcf86 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 97d8a5a4..97d8a5a4 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 4a598ad4..4a598ad4 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 57fd98d6..57fd98d6 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 a85afc68..a85afc68 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 bb54071d..bb54071d 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 62028f52..62028f52 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 f6e45b3b..f6e45b3b 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 d152f145..d152f145 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 0d0e1b65..0d0e1b65 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 c9abe2cb..c9abe2cb 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 b955736b..b955736b 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 1d09a825..1d09a825 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 d758ff18..d758ff18 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 02f39b78..02f39b78 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 c1e366c5..c1e366c5 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 922bf591..922bf591 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 93a873a3..93a873a3 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 926c33ee..926c33ee 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 b6007e46..b6007e46 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 873b7a19..873b7a19 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 78635b9c..78635b9c 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 35307817..35307817 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 f612c243..f612c243 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 a767a51a..a767a51a 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 95acde70..95acde70 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 e2a0a157..e2a0a157 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 03a0369f..03a0369f 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 3801cc3e..3801cc3e 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 cb7813d3..cb7813d3 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 5122158e..5122158e 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 16d26177..16d26177 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 8fc424a8..8fc424a8 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 e39f3dce..e39f3dce 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 9d73df2c..9d73df2c 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 d6756d16..d6756d16 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 49af5f45..49af5f45 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 5c85179f..5c85179f 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 4cbf3ed9..4cbf3ed9 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 7d32699b..7d32699b 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 b6afd6fe..b6afd6fe 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 47379a30..47379a30 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 db565b0a..db565b0a 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 4dce37f2..4dce37f2 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 690bc8be..690bc8be 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 eba363dd..eba363dd 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 f61ac5b4..f61ac5b4 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 438d4a33..438d4a33 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 c2fa67b0..c2fa67b0 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 ed3ab607..ed3ab607 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 b1183bc5..b1183bc5 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 a61e0487..a61e0487 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 73007820..73007820 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 8f4bd928..8f4bd928 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 8a39056a..8a39056a 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 1a4039e1..1a4039e1 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 dbbacb34..dbbacb34 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 5450d574..5450d574 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 ab233c5b..ab233c5b 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 8eb4011f..8eb4011f 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 f3b1d5c7..f3b1d5c7 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 2ee56334..2ee56334 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 d1e883fc..d1e883fc 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 d3f5876c..d3f5876c 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 1d5dcf7b..1d5dcf7b 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 5513d6e6..5513d6e6 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 1ee1c479..1ee1c479 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 835bb1d6..835bb1d6 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 da820cca..da820cca 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 5ee6049e..5ee6049e 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 1971c2e0..1971c2e0 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 0218cc0f..0218cc0f 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 63a6b2b4..63a6b2b4 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 28c051d8..28c051d8 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 d937b417..d937b417 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 f28b5c67..f28b5c67 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 992dd47e..992dd47e 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 97d6a592..97d6a592 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 5813b73c..5813b73c 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 0641bd14..0641bd14 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 86c380b7..86c380b7 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 998ec9f7..998ec9f7 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 3cc2b83c..3cc2b83c 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 4af26c10..4af26c10 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 7a0cde1b..7a0cde1b 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 6d535ef9..6d535ef9 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 5f956304..5f956304 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 7f613f33..7f613f33 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 f5337e2c..f5337e2c 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 950b1073..950b1073 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 8c8e4acc..8c8e4acc 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 b1de5f71..b1de5f71 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 0c253f82..0c253f82 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 35a64ae2..35a64ae2 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 31db1f9e..31db1f9e 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 9f113497..9f113497 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 3df2f531..3df2f531 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 6220a13f..6220a13f 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 ae868a27..ae868a27 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 fc221bd7..fc221bd7 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 91023170..91023170 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 b143d210..b143d210 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 de7f9599..de7f9599 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 4229c706..4229c706 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 a008383a..a008383a 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 425e5f8c..425e5f8c 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 e5a33eee..e5a33eee 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 b78269d0..b78269d0 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 610c1a7c..610c1a7c 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 6703eeba..6703eeba 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 88ced123..88ced123 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 59813835..59813835 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 62a9cf84..62a9cf84 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 62a9cf84..62a9cf84 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 a15e723a..a15e723a 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 4238d52a..4238d52a 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 bbfa9b0c..bbfa9b0c 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 a28da93e..a28da93e 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 8f59eedc..8f59eedc 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 38339dfa..38339dfa 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 e1d74f7a..e1d74f7a 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 7a7ef347..7a7ef347 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 4f1bfbd2..4f1bfbd2 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 6c764ec9..6c764ec9 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 952651dc..952651dc 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 b0ecf23a..b0ecf23a 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 e65447a4..e65447a4 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 d1281346..d1281346 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 db7fe5b0..db7fe5b0 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 ec459457..ec459457 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 15408d3b..15408d3b 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 324a0341..324a0341 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 30400da5..30400da5 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 b90be4e2..3078730c 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 1b65a824..1b65a824 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 8daffed7..8daffed7 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 095657b5..095657b5 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 d7400005..d7400005 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 3e2aa619..3e2aa619 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 59054f77..59054f77 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 93ebe46d..93ebe46d 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 c5032165..c5032165 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 91970f52..91970f52 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 b420e3a5..b420e3a5 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 fea7e6d5..fea7e6d5 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 a4c40c0f..a4c40c0f 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 0b86f1d0..0b86f1d0 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 170e9ccf..170e9ccf 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 d60e4e30..d60e4e30 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 6acb74e5..6acb74e5 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 13fbb0e8..13fbb0e8 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 45a0b9e9..45a0b9e9 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 bcfd405b..bcfd405b 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 798f95da..798f95da 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 71b9b310..71b9b310 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 91689d9f..91689d9f 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 e3355b23..e3355b23 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 e9f1c7dc..e9f1c7dc 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 6878904f..6878904f 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 fd52b46f..fd52b46f 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 70d6104f..70d6104f 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 cc88d00f..cc88d00f 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 c492af50..c492af50 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 aa4c62b8..aa4c62b8 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 f64e48d2..f64e48d2 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 f9e189f1..f9e189f1 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 070576f5..070576f5 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 586433c3..586433c3 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 1283fb43..1283fb43 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 3e766e8a..3e766e8a 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 4b3d641e..4b3d641e 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 7ae22ae8..7ae22ae8 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 fa7fa14a..fa7fa14a 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 cd5d5441..cd5d5441 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 9751f057..9751f057 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 a4951d13..a4951d13 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 5bbbcff5..5bbbcff5 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 ba0d2db9..ba0d2db9 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 8f2221ee..8f2221ee 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 b3912efe..b3912efe 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 855423c4..855423c4 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 a8c8672e..a8c8672e 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 ad5481e3..ad5481e3 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 76ec20cd..76ec20cd 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 d9616157..d9616157 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 b33ce6b6..b33ce6b6 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 ed3dae67..ed3dae67 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 fcddc400..fcddc400 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 201ee244..201ee244 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 bd417955..bd417955 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 0aea2572..0aea2572 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 7ca66615..7ca66615 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 c608dac4..c608dac4 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 719b9393..719b9393 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 b18d391c..b18d391c 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 0d6c4529..0d6c4529 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 1a80d263..1a80d263 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 83861720..83861720 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 f1fbb627..f1fbb627 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 78098eaa..78098eaa 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 c96ae1ed..c96ae1ed 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 c3d7f4b2..c3d7f4b2 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 89f6244f..89f6244f 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 852ee5be..852ee5be 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 c1879d93..c1879d93 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 87722749..87722749 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 570c3acd..570c3acd 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 64cdb3ce..64cdb3ce 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 0e1a0dd4..0e1a0dd4 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 c89b96a4..c89b96a4 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 dc0d58a2..dc0d58a2 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 dcab908e..dcab908e 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 b8cddb31..b8cddb31 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 98b381f1..98b381f1 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 9adccbed..9adccbed 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 bea35f29..bea35f29 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 eba48256..eba48256 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 5f548255..5f548255 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 8e41bbf0..8e41bbf0 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 7a02f375..7a02f375 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 e7240db4..e7240db4 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 e4f1b397..e4f1b397 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 52d9996e..52d9996e 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 8f1aba23..8f1aba23 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 3d92b647..3d92b647 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 f2761988..f2761988 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 c9208c0e..c9208c0e 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 2cb9d0c5..2cb9d0c5 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 2ed5c23f..2ed5c23f 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 8eb27430..8eb27430 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 f630256d..f630256d 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 514b97fa..514b97fa 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 7b40c974..7b40c974 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 6d1ee4c4..6d1ee4c4 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 cea49553..cea49553 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 5f408224..5f408224 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 2e5231dc..2e5231dc 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 792e0e14..792e0e14 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 54ce78af..54ce78af 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 408b7479..408b7479 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 d9edb2cb..d9edb2cb 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 f429359e..f429359e 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 558618e6..558618e6 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 39a292d8..39a292d8 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 b55bf188..b55bf188 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 05005798..05005798 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 0acad02d..0acad02d 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 73710e1e..73710e1e 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 02d92de0..02d92de0 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 b69e9e60..b69e9e60 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 3370b3d8..3370b3d8 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 beef5624..beef5624 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 f6fe5a97..f6fe5a97 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 72c97bb6..72c97bb6 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 5562f6a0..5562f6a0 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 31f5d2db..31f5d2db 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 20c9bdc3..20c9bdc3 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 05aeadb6..05aeadb6 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 985f85d9..985f85d9 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 a7ecbaef..a7ecbaef 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 efc1b84b..efc1b84b 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 ee8d3ce4..ee8d3ce4 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 6a4c5926..6a4c5926 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 8ac2b275..8ac2b275 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 81e24c26..81e24c26 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 293ac6de..293ac6de 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 ba62425f..ba62425f 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 bea87abf..bea87abf 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 a84d0d87..a84d0d87 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 4484acf3..4484acf3 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 2924114f..2924114f 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 4c782de1..4c782de1 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 77bc9883..77bc9883 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 ca67985f..ca67985f 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 09209d21..09209d21 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 83d6db93..83d6db93 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 ea8579dc..ea8579dc 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 15730ba3..aed0f894 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 7b64e776..7b64e776 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 9f9e357b..9f9e357b 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 6bc037e0..6bc037e0 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 382a23a6..382a23a6 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 f08c5ec3..f08c5ec3 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 43db2092..43db2092 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 95928d13..95928d13 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 c26b4c4b..c26b4c4b 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 0251a6f9..0251a6f9 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 481a744e..481a744e 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 12993fbf..12993fbf 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 72267050..72267050 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 8b63703b..8b63703b 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 090d361c..090d361c 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 f46900ea..f46900ea 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 f635fe8b..f635fe8b 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 f2b755c5..dd6f6c34 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 ed49a144..ed49a144 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 93c087e4..93c087e4 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 dfe21f70..dfe21f70 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 239ee6c8..239ee6c8 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 71bab3a7..71bab3a7 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 af7fa492..af7fa492 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 4b62228f..4b62228f 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 85268b50..85268b50 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 1e1916f1..1e1916f1 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 943a2427..943a2427 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 76f42b29..76f42b29 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 12154d2f..12154d2f 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 55db94f9..55db94f9 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 7808850c..7808850c 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 7b6a628d..7b6a628d 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 336fca0c..336fca0c 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 79468f9d..79468f9d 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 b8be640b..b8be640b 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 bf47e231..bf47e231 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 22ceabcc..22ceabcc 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 9cc49917..9cc49917 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 f77ea1d1..f77ea1d1 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 0ad6b483..0ad6b483 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 c7796411..c7796411 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 4c0d936c..4c0d936c 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 418bac77..418bac77 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 31217f71..31217f71 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 b990d955..b990d955 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 bf386f6c..bf386f6c 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 a6bba9de..a6bba9de 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 4e20dcfc..4e20dcfc 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 e71aa428..e71aa428 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 fdf12bed..fdf12bed 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 ac840f64..ac840f64 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 2e31535b..2e31535b 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 0439b0cf..0439b0cf 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 e0933653..e0933653 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 161a7b02..161a7b02 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 dc963186..dc963186 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 1a7ec2b9..1a7ec2b9 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 747a292d..747a292d 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 a364a113..a364a113 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 bfebf205..bfebf205 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 90e0c268..90e0c268 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 0c2841e7..0c2841e7 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 3da51290..3da51290 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 b57ded65..b57ded65 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 97ef0238..97ef0238 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 44383924..44383924 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 9bfc4e6e..9bfc4e6e 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 6fd9c988..6fd9c988 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 f5e1e66a..f5e1e66a 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 deb30419..deb30419 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 f1afdc4f..f1afdc4f 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 f80de0a4..f80de0a4 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 c095eed1..c095eed1 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 e58c7b4d..e58c7b4d 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 a354377c..a354377c 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 a0dfc426..a0dfc426 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 69476bf4..69476bf4 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 00a1c09d..00a1c09d 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 263110d5..263110d5 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 ffe87003..ffe87003 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 00000000..c107ae75
--- /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 3a083653..3a083653 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 d459a2e8..d459a2e8 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 76b7156a..76b7156a 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 00a955b9..00a955b9 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 5a561913..5a561913 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 a9b75d27..a9b75d27 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 5aeea6c4..5aeea6c4 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 eb6f21ad..eb6f21ad 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 c320527a..c320527a 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 27ac54d3..27ac54d3 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 b9b9c377..b9b9c377 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 f2e8f823..f2e8f823 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 c609e9c6..c609e9c6 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 903758bb..903758bb 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 814c1919..814c1919 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 0a9e195a..0a9e195a 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 f0d0e41a..f0d0e41a 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 b54527eb..b54527eb 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 163a64b4..163a64b4 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 f2228ec7..f2228ec7 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 b37bce6a..aba292e0 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 a92837b5..a92837b5 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 08be7085..08be7085 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 58683a84..58683a84 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 e542eb69..e542eb69 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 224bff56..224bff56 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 b788cc3c..b788cc3c 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 1f3ccd0f..1f3ccd0f 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 414516d3..414516d3 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 7ba93dbc..7ba93dbc 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 b0a8645f..b0a8645f 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 e5214593..e5214593 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 25c9a223..25c9a223 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 3654cd7d..3654cd7d 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 346c6490..346c6490 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 963b3bba..963b3bba 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 42d1812f..42d1812f 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 1b77112f..1b77112f 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 ba9bb85c..ba9bb85c 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 4fdfaa18..4fdfaa18 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 bc7e544b..bc7e544b 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 0c2ed8d7..0c2ed8d7 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 e1a81321..e1a81321 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 0344160c..0344160c 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 37f59a3a..37f59a3a 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 5c9580a3..5c9580a3 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 f512a0b7..f512a0b7 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 316b749c..316b749c 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 80427e9d..80427e9d 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 597e222a..597e222a 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 6d1bdaba..6d1bdaba 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 36e1b213..36e1b213 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 a9ddac66..a9ddac66 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 5e13fc6b..5e13fc6b 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 12cafbb8..12cafbb8 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 a2f7a9a7..a2f7a9a7 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 6fde82c1..6fde82c1 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 26c30e92..26c30e92 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 023da2cb..023da2cb 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 a4597593..a4597593 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 15e73aa5..15e73aa5 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 4a343e3c..4a343e3c 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 1ef570e0..1ef570e0 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 962c14c7..962c14c7 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 f5261400..f5261400 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 f380a000..f380a000 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 7c057e01..7c057e01 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 a7f9a459..a7f9a459 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 40807aa3..40807aa3 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 f3535b37..f3535b37 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 2d8d70f2..2d8d70f2 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 18fbaa4c..18fbaa4c 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 241232b1..241232b1 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 8eb1b1ec..8eb1b1ec 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 d4a43d1c..d4a43d1c 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 c9a8f412..c9a8f412 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 4a1084a9..4a1084a9 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 b92e600d..b92e600d 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 b7da23c0..b7da23c0 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 23828d5a..23828d5a 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 d9d53828..d9d53828 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 a76c1a3a..a76c1a3a 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 ebf04c4a..ebf04c4a 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 43805a0b..43805a0b 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 b700b81f..b700b81f 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 bfaa8df9..bfaa8df9 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 e3d14e99..e3d14e99 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 ebc74b4a..ebc74b4a 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 75834723..75834723 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 9b570f4d..9b570f4d 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 e3d14e99..e3d14e99 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 ebc74b4a..ebc74b4a 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 75834723..75834723 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 9b570f4d..9b570f4d 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 d0942509..d0942509 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 c38bcd02..c38bcd02 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 80889bf8..80889bf8 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 05de8377..05de8377 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 59907409..59907409 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 d66acd9c..d66acd9c 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 89b8c353..89b8c353 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 d3a675cf..d3a675cf 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 59907409..59907409 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 d66acd9c..d66acd9c 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 89b8c353..89b8c353 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 d3a675cf..d3a675cf 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 59907409..59907409 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 d66acd9c..d66acd9c 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 89b8c353..89b8c353 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 d3a675cf..d3a675cf 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 42e40e60..42e40e60 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 90dc70bf..90dc70bf 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 2ed2340c..2ed2340c 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 e1428e37..e1428e37 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 7a2a4011..7a2a4011 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 05b2f214..05b2f214 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 8c22e1f3..8c22e1f3 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 c5617f0e..c5617f0e 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 3ea580e0..3ea580e0 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 effcce1f..effcce1f 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 502ac689..502ac689 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 3243231e..3243231e 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 3ea580e0..3ea580e0 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 effcce1f..effcce1f 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 502ac689..502ac689 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 3243231e..3243231e 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 7a2a4011..7a2a4011 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 05b2f214..05b2f214 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 8c22e1f3..8c22e1f3 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 c5617f0e..c5617f0e 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 7761595f..7761595f 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 8bb42c45..8bb42c45 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 8c23c021..8c23c021 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 365cd048..365cd048 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 42e40e60..42e40e60 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 90dc70bf..90dc70bf 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 2ed2340c..2ed2340c 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 e1428e37..e1428e37 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 d0942509..d0942509 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 c38bcd02..c38bcd02 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 80889bf8..80889bf8 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 05de8377..05de8377 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 6f1daed8..6f1daed8 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 4a2507f5..4a2507f5 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 4f13b4ef..4f13b4ef 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 0e1ab452..0e1ab452 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 d55a5204..d55a5204 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 7289f639..7289f639 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 02d6cdf2..02d6cdf2 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 3f074dbf..3f074dbf 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 d55a5204..d55a5204 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 7289f639..7289f639 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 02d6cdf2..02d6cdf2 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 3f074dbf..3f074dbf 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 9c03d096..9c03d096 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 680ba3ef..680ba3ef 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 974205de..974205de 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 2c8b6aab..2c8b6aab 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 598b163a..598b163a 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 06382264..06382264 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 12a32dcd..12a32dcd 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 4bc6701d..4bc6701d 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 0a499f8f..0a499f8f 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 db652c5a..db652c5a 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 482f045d..482f045d 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 a386e272..a386e272 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 c5eb8527..c5eb8527 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 8496fb1a..8496fb1a 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 30849fd0..30849fd0 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 55ce7c0c..55ce7c0c 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 c5eb8527..c5eb8527 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 8496fb1a..8496fb1a 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 30849fd0..30849fd0 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 55ce7c0c..55ce7c0c 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 cd07b1cc..cd07b1cc 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 acae6aff..acae6aff 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 1e8d2c45..1e8d2c45 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 577017c4..577017c4 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 cd07b1cc..cd07b1cc 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 acae6aff..acae6aff 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 1e8d2c45..1e8d2c45 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 577017c4..577017c4 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 928706ab..928706ab 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 3645d78a..3645d78a 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 ade63bd0..ade63bd0 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 cd73617e..cd73617e 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 e404a4e3..e404a4e3 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 2d0f5176..2d0f5176 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 4b9777b7..4b9777b7 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 e0f67e98..e0f67e98 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 a1baaf90..a1baaf90 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 81a7c364..81a7c364 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 9325de38..9325de38 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 c93b8fb8..c93b8fb8 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 2b3e2323..2b3e2323 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 ce8985db..ce8985db 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 2968731d..2968731d 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 ea8da284..ea8da284 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 23570729..23570729 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 c7abb65c..c7abb65c 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 46b84d7d..46b84d7d 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 f4dfd338..f4dfd338 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 6ae574d5..6ae574d5 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 6b61562c..6b61562c 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 e46c0bf1..e46c0bf1 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 010444e8..010444e8 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 e79d8e1d..e79d8e1d 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 ea68d35f..ea68d35f 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 6d610415..6d610415 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 590cca96..590cca96 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 b8749743..b8749743 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 5a136a0c..5a136a0c 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 f47a366b..f47a366b 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 9ecb680f..9ecb680f 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 6ae574d5..6ae574d5 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 6b61562c..6b61562c 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 e46c0bf1..e46c0bf1 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 010444e8..010444e8 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 b8749743..b8749743 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 5a136a0c..5a136a0c 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 f47a366b..f47a366b 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 9ecb680f..9ecb680f 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 d55a5204..d55a5204 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 7289f639..7289f639 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 02d6cdf2..02d6cdf2 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 3f074dbf..3f074dbf 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 d55a5204..d55a5204 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 7289f639..7289f639 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 02d6cdf2..02d6cdf2 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 3f074dbf..3f074dbf 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 9c03d096..9c03d096 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 680ba3ef..680ba3ef 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 974205de..974205de 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 2c8b6aab..2c8b6aab 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 598b163a..598b163a 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 06382264..06382264 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 12a32dcd..12a32dcd 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 4bc6701d..4bc6701d 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 0a499f8f..0a499f8f 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 db652c5a..db652c5a 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 482f045d..482f045d 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 a386e272..a386e272 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 c5eb8527..c5eb8527 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 8496fb1a..8496fb1a 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 30849fd0..30849fd0 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 55ce7c0c..55ce7c0c 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 c5eb8527..c5eb8527 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 8496fb1a..8496fb1a 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 30849fd0..30849fd0 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 55ce7c0c..55ce7c0c 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 cd07b1cc..cd07b1cc 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 acae6aff..acae6aff 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 1e8d2c45..1e8d2c45 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 577017c4..577017c4 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 cd07b1cc..cd07b1cc 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 acae6aff..acae6aff 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 1e8d2c45..1e8d2c45 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 577017c4..577017c4 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 928706ab..928706ab 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 3645d78a..3645d78a 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 ade63bd0..ade63bd0 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 cd73617e..cd73617e 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 e404a4e3..e404a4e3 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 2d0f5176..2d0f5176 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 4b9777b7..4b9777b7 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 e0f67e98..e0f67e98 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 a1baaf90..a1baaf90 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 81a7c364..81a7c364 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 9325de38..9325de38 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 c93b8fb8..c93b8fb8 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 2b3e2323..2b3e2323 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 ce8985db..ce8985db 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 2968731d..2968731d 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 ea8da284..ea8da284 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 a91b4b55..a91b4b55 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 570b990c..570b990c 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 b0f9b9c4..b0f9b9c4 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 6e810f75..6e810f75 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 e192afb8..e192afb8 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 58a0f6e9..58a0f6e9 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 cd6f226b..cd6f226b 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 ff9103b0..ff9103b0 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 a0f079bc..a0f079bc 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 83cb503f..83cb503f 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 4cf96edf..4cf96edf 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 5823de80..5823de80 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 8edac132..8edac132 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 15e465f1..15e465f1 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 910b48d2..910b48d2 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 ff0f6411..ff0f6411 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 a3865fa6..a3865fa6 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 fc49f4b8..fc49f4b8 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 b432b4ec..b432b4ec 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 15862059..15862059 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 a3865fa6..a3865fa6 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 fc49f4b8..fc49f4b8 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 b432b4ec..b432b4ec 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 15862059..15862059 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 1be84403..1be84403 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 95f7cd6d..95f7cd6d 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 2f71271c..2f71271c 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 17f6f2ce..17f6f2ce 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 1be84403..1be84403 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 95f7cd6d..95f7cd6d 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 2f71271c..2f71271c 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 17f6f2ce..17f6f2ce 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 4ed8ddc3..4ed8ddc3 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 1d7a8894..1d7a8894 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 313630f8..313630f8 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 be63d56e..be63d56e 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 761537f9..761537f9 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 322b7b68..322b7b68 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 73feec34..73feec34 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 910c4d3d..910c4d3d 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 4399b6aa..4399b6aa 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 e45a2ad1..e45a2ad1 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 23f74b10..23f74b10 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 db495899..db495899 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 2e954ae9..2e954ae9 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 252a5e37..252a5e37 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 6d939a93..6d939a93 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 00a21ebd..00a21ebd 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 ad529912..ad529912 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 70b995c1..70b995c1 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 9b865377..9b865377 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 b4f7ae25..b4f7ae25 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 e053109f..e053109f 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 b8dfd6fe..b8dfd6fe 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 2cdee7a8..2cdee7a8 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 2569b4ae..2569b4ae 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 cc32f2a2..cc32f2a2 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 57ea3f30..57ea3f30 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 384f8152..384f8152 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 f326c03b..f326c03b 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 7344cdf6..7344cdf6 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 00c88c7d..00c88c7d 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 82d911ed..82d911ed 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 98db30af..98db30af 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 e3d14e99..e3d14e99 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 ebc74b4a..ebc74b4a 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 75834723..75834723 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 9b570f4d..9b570f4d 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 e3d14e99..e3d14e99 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 ebc74b4a..ebc74b4a 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 75834723..75834723 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 9b570f4d..9b570f4d 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 d0942509..d0942509 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 c38bcd02..c38bcd02 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 80889bf8..80889bf8 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 05de8377..05de8377 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 8196289c..8196289c 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 76cd4490..76cd4490 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 8bd6259a..8bd6259a 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 3e081520..3e081520 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 294ff8bd..294ff8bd 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 48e2bbcb..48e2bbcb 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 0981eb2a..0981eb2a 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 4ae48bfa..4ae48bfa 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 42e40e60..42e40e60 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 90dc70bf..90dc70bf 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 2ed2340c..2ed2340c 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 e1428e37..e1428e37 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 d0942509..d0942509 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 c38bcd02..c38bcd02 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 80889bf8..80889bf8 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 05de8377..05de8377 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 6f1daed8..6f1daed8 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 4a2507f5..4a2507f5 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 4f13b4ef..4f13b4ef 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 0e1ab452..0e1ab452 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 76d3967d..76d3967d 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 b8db224c..b8db224c 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 3bff2c15..3bff2c15 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 045c7fac..045c7fac 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 5c209c9c..5c209c9c 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 0ef11a8d..0ef11a8d 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 f3f8e547..f3f8e547 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 b24f50e6..b24f50e6 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 4dd3aec5..4dd3aec5 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 cd422076..cd422076 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 08610300..08610300 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 24cc19ba..24cc19ba 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 d7c4f847..d7c4f847 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 56b085df..56b085df 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 4f1e17e7..4f1e17e7 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 4aacbf82..4aacbf82 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 fc53d5c4..fc53d5c4 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 6b547a17..6b547a17 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 7b8a2582..7b8a2582 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 406f46b5..406f46b5 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 58aa09ed..58aa09ed 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 87cd9a0f..87cd9a0f 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 103fb461..103fb461 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 c290f84a..c290f84a 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 a93fd0f2..a93fd0f2 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 2cd536be..2cd536be 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 56b9fe06..56b9fe06 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 5098d688..5098d688 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 2a143f2a..2a143f2a 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 24dfee82..24dfee82 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 16e128d5..16e128d5 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 b4523acb..b4523acb 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 d43971ff..d43971ff 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 caa2376e..caa2376e 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 c2913883..c2913883 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 50ff1c8b..50ff1c8b 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 d2733474..d2733474 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 c7bc8f74..c7bc8f74 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 c0dcd945..c0dcd945 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 b9d2234c..b9d2234c 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 f5d0ac6f..f5d0ac6f 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 da23baaa..da23baaa 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 7287a419..7287a419 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 9f6982dd..9f6982dd 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 3b98e124..3b98e124 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 454e7364..454e7364 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 794516da..794516da 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 211b1135..211b1135 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 652b82d3..652b82d3 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 3c86a59b..3c86a59b 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 cbfcdbcd..cbfcdbcd 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 2872e006..2872e006 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 c842b5ff..c842b5ff 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 ca23df1f..ca23df1f 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 46cd4065..46cd4065 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 3da74119..3da74119 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 d4a43d1c..d4a43d1c 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 c9a8f412..c9a8f412 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 4a1084a9..4a1084a9 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 b92e600d..b92e600d 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 b7da23c0..b7da23c0 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 23828d5a..23828d5a 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 d9d53828..d9d53828 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 a76c1a3a..a76c1a3a 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 4b080c7f..4b080c7f 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 38306bea..38306bea 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 66afaabe..66afaabe 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 7d0db539..7d0db539 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 023d8bf8..023d8bf8 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 6b229ce9..6b229ce9 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 c61118b6..c61118b6 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 08b2e25f..08b2e25f 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 5145a3a3..5145a3a3 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 95a80ab5..95a80ab5 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 bd330b7f..bd330b7f 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 10f0702a..10f0702a 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 37afb734..37afb734 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 cfbc8f35..cfbc8f35 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 9a49b6d5..9a49b6d5 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 56405776..56405776 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 56da059f..56da059f 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 976671ce..976671ce 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 7c07deba..7c07deba 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 e3b1edf7..e3b1edf7 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 d4a43d1c..d4a43d1c 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 c9a8f412..c9a8f412 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 4a1084a9..4a1084a9 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 b92e600d..b92e600d 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 b7da23c0..b7da23c0 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 23828d5a..23828d5a 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 d9d53828..d9d53828 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 a76c1a3a..a76c1a3a 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 8674059d..8674059d 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 19661496..19661496 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 07d644be..07d644be 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 8bf47d2a..8bf47d2a 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 8674059d..8674059d 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 19661496..19661496 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 07d644be..07d644be 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 8bf47d2a..8bf47d2a 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 e85e0cb1..e85e0cb1 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 d5359d85..d5359d85 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 0e4b5c9f..0e4b5c9f 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 908dfe6b..908dfe6b 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 23570729..23570729 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 c7abb65c..c7abb65c 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 46b84d7d..46b84d7d 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 f4dfd338..f4dfd338 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 6ae574d5..6ae574d5 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 6b61562c..6b61562c 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 e46c0bf1..e46c0bf1 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 010444e8..010444e8 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 e79d8e1d..e79d8e1d 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 ea68d35f..ea68d35f 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 6d610415..6d610415 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 590cca96..590cca96 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 b8749743..b8749743 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 5a136a0c..5a136a0c 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 f47a366b..f47a366b 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 9ecb680f..9ecb680f 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 6ae574d5..6ae574d5 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 6b61562c..6b61562c 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 e46c0bf1..e46c0bf1 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 010444e8..010444e8 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 b8749743..b8749743 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 5a136a0c..5a136a0c 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 f47a366b..f47a366b 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 9ecb680f..9ecb680f 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 3195fbc3..3195fbc3 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 454c347c..454c347c 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 32ed6086..32ed6086 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 948cc3e9..948cc3e9 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 6cad53f6..6cad53f6 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 bad6fe8c..bad6fe8c 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 da420091..da420091 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 2d8e44e2..2d8e44e2 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 44ac2771..44ac2771 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 71a9b88a..71a9b88a 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 1e03f215..1e03f215 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 0f85b409..0f85b409 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 4ac1160b..4ac1160b 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 79b089b6..79b089b6 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 aeb191fd..aeb191fd 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 139fab35..139fab35 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 edf1f6bd..edf1f6bd 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 8e629265..8e629265 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 0cef53ac..0cef53ac 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 dbdc83bc..dbdc83bc 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 7b8fa0f4..7b8fa0f4 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 9edc3079..9edc3079 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 183f6194..183f6194 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 0a1ab863..0a1ab863 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 aab131ed..aab131ed 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 c46938c4..c46938c4 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 bac1a83f..bac1a83f 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 ba77504c..ba77504c 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 d55a5204..d55a5204 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 7289f639..7289f639 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 02d6cdf2..02d6cdf2 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 3f074dbf..3f074dbf 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 d55a5204..d55a5204 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 7289f639..7289f639 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 02d6cdf2..02d6cdf2 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 3f074dbf..3f074dbf 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 9c03d096..9c03d096 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 680ba3ef..680ba3ef 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 974205de..974205de 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 2c8b6aab..2c8b6aab 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 598b163a..598b163a 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 06382264..06382264 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 12a32dcd..12a32dcd 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 4bc6701d..4bc6701d 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 0a499f8f..0a499f8f 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 db652c5a..db652c5a 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 482f045d..482f045d 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 a386e272..a386e272 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 c5eb8527..c5eb8527 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 8496fb1a..8496fb1a 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 30849fd0..30849fd0 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 55ce7c0c..55ce7c0c 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 c5eb8527..c5eb8527 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 8496fb1a..8496fb1a 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 30849fd0..30849fd0 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 55ce7c0c..55ce7c0c 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 a1baaf90..a1baaf90 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 81a7c364..81a7c364 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 9325de38..9325de38 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 c93b8fb8..c93b8fb8 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 2b3e2323..2b3e2323 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 ce8985db..ce8985db 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 2968731d..2968731d 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 ea8da284..ea8da284 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 b8825b99..b8825b99 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 3e5a023d..3e5a023d 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 abe775c7..abe775c7 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 164c8e3e..164c8e3e 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 2d8d70f2..2d8d70f2 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 18fbaa4c..18fbaa4c 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 241232b1..241232b1 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 8eb1b1ec..8eb1b1ec 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 dc96d723..dc96d723 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 3e0d794f..3e0d794f 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 397501a7..397501a7 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 f741a896..f741a896 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 848d4351..848d4351 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 65b5a9d4..65b5a9d4 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 99e3b644..99e3b644 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 f1801fff..f1801fff 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 848d4351..848d4351 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 65b5a9d4..65b5a9d4 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 99e3b644..99e3b644 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 f1801fff..f1801fff 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 dc96d723..dc96d723 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 3e0d794f..3e0d794f 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 397501a7..397501a7 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 f741a896..f741a896 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 84d23cd1..84d23cd1 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 0e706372..0e706372 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 85af5a4e..85af5a4e 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 0aacbab1..0aacbab1 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 658f4863..658f4863 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 a84ac04a..a84ac04a 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 2b1c4da9..2b1c4da9 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 90295db4..90295db4 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 c842b5ff..c842b5ff 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 ca23df1f..ca23df1f 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 46cd4065..46cd4065 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 3da74119..3da74119 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 d4a43d1c..d4a43d1c 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 c9a8f412..c9a8f412 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 4a1084a9..4a1084a9 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 b92e600d..b92e600d 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 b7da23c0..b7da23c0 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 23828d5a..23828d5a 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 d9d53828..d9d53828 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 a76c1a3a..a76c1a3a 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 51c35c88..51c35c88 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 ee120630..ee120630 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 c2f94a74..c2f94a74 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 d49657e9..d49657e9 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 e1760070..e1760070 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 e69922d5..e69922d5 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 b3c43205..b3c43205 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 905bdc32..905bdc32 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 35a47dc8..35a47dc8 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 23ed1a8c..23ed1a8c 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 25bc843e..25bc843e 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 645ff201..645ff201 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 bb31dc9b..bb31dc9b 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 6bb464c9..6bb464c9 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 d514c727..d514c727 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 abc8fa67..abc8fa67 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 2f9e5e18..2f9e5e18 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 47ec5534..47ec5534 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 26cdebf8..26cdebf8 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 708e286e..708e286e 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 2f9e5e18..2f9e5e18 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 47ec5534..47ec5534 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 26cdebf8..26cdebf8 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 708e286e..708e286e 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 1e5ebca4..1e5ebca4 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 6eaae9bf..6eaae9bf 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 e54a1624..e54a1624 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 7a7850ba..7a7850ba 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 83c85623..83c85623 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 4bdeb456..4bdeb456 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 2230a8ce..2230a8ce 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 e3dce04e..e3dce04e 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 05b8bfca..05b8bfca 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 e26fa5de..e26fa5de 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 c47e8c7d..c47e8c7d 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 bc66dde7..bc66dde7 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 3001638d..3001638d 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 b9890714..b9890714 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 b6221277..b6221277 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 49ae2206..49ae2206 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 3001638d..3001638d 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 b9890714..b9890714 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 b6221277..b6221277 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 49ae2206..49ae2206 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 76c7b4ed..76c7b4ed 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 d5d4cac6..d5d4cac6 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 ca2a1ed1..ca2a1ed1 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 1cb753d7..1cb753d7 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 c05d4bfc..c05d4bfc 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 62744d27..62744d27 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 fa5d241e..fa5d241e 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 7db85e94..7db85e94 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 23570729..23570729 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 c7abb65c..c7abb65c 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 46b84d7d..46b84d7d 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 f4dfd338..f4dfd338 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 6ae574d5..6ae574d5 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 6b61562c..6b61562c 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 e46c0bf1..e46c0bf1 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 010444e8..010444e8 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 e79d8e1d..e79d8e1d 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 ea68d35f..ea68d35f 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 6d610415..6d610415 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 590cca96..590cca96 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 b8749743..b8749743 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 5a136a0c..5a136a0c 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 f47a366b..f47a366b 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 9ecb680f..9ecb680f 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 6ae574d5..6ae574d5 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 6b61562c..6b61562c 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 e46c0bf1..e46c0bf1 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 010444e8..010444e8 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 b8749743..b8749743 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 5a136a0c..5a136a0c 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 f47a366b..f47a366b 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 9ecb680f..9ecb680f 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 2f9e5e18..2f9e5e18 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 47ec5534..47ec5534 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 26cdebf8..26cdebf8 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 708e286e..708e286e 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 2f9e5e18..2f9e5e18 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 47ec5534..47ec5534 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 26cdebf8..26cdebf8 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 708e286e..708e286e 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 1e5ebca4..1e5ebca4 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 6eaae9bf..6eaae9bf 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 e54a1624..e54a1624 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 7a7850ba..7a7850ba 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 83c85623..83c85623 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 4bdeb456..4bdeb456 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 2230a8ce..2230a8ce 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 e3dce04e..e3dce04e 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 05b8bfca..05b8bfca 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 e26fa5de..e26fa5de 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 c47e8c7d..c47e8c7d 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 bc66dde7..bc66dde7 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 3001638d..3001638d 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 b9890714..b9890714 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 b6221277..b6221277 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 49ae2206..49ae2206 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 3001638d..3001638d 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 b9890714..b9890714 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 b6221277..b6221277 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 49ae2206..49ae2206 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 76c7b4ed..76c7b4ed 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 d5d4cac6..d5d4cac6 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 ca2a1ed1..ca2a1ed1 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 1cb753d7..1cb753d7 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 c05d4bfc..c05d4bfc 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 62744d27..62744d27 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 fa5d241e..fa5d241e 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 7db85e94..7db85e94 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 c4e957ad..c4e957ad 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 6d839113..6d839113 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 6b2e634c..6b2e634c 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 969c791a..969c791a 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 f76e0b21..f76e0b21 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 fecd0ab2..fecd0ab2 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 77a9c830..77a9c830 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 f1613684..f1613684 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 4934fb77..4934fb77 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 451b719e..451b719e 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 1daffca7..1daffca7 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 64830707..64830707 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 c2958f1b..c2958f1b 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 12a4d1f8..12a4d1f8 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 1696ac95..1696ac95 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 e1d13056..e1d13056 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 c2958f1b..c2958f1b 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 12a4d1f8..12a4d1f8 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 1696ac95..1696ac95 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 e1d13056..e1d13056 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 bdf8239a..bdf8239a 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 9f887c5e..9f887c5e 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 8042d4c2..8042d4c2 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 e7e68c47..e7e68c47 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 4934fb77..4934fb77 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 451b719e..451b719e 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 1daffca7..1daffca7 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 64830707..64830707 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 4934fb77..4934fb77 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 451b719e..451b719e 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 1daffca7..1daffca7 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 64830707..64830707 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 fd72dedf..fd72dedf 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 57eed9f8..57eed9f8 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 e217a644..e217a644 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 c212b59f..c212b59f 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 7f7e6b93..7f7e6b93 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 cbf6fb63..cbf6fb63 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 643776b8..643776b8 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 d64acb90..d64acb90 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 43192f54..43192f54 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 ebbbbf82..ebbbbf82 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 0a029b53..0a029b53 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 a1354169..a1354169 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 a4edafc9..a4edafc9 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 8c38226e..8c38226e 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 a939bffd..a939bffd 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 9f653770..9f653770 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 d3e877fc..d3e877fc 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 7790050e..7790050e 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 039d1987..039d1987 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 b3051d1f..b3051d1f 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 032a7caa..032a7caa 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 a2944b6a..a2944b6a 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 ffd4d210..ffd4d210 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 35a41fc5..35a41fc5 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 032a7caa..032a7caa 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 a2944b6a..a2944b6a 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 ffd4d210..ffd4d210 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 35a41fc5..35a41fc5 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 d57d3894..d57d3894 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 7c374528..7c374528 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 b0e0b9be..b0e0b9be 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 748864ef..748864ef 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 e26fa5de..e26fa5de 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 bc66dde7..bc66dde7 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 a0c5f9ad..a0c5f9ad 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 190210c8..190210c8 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 e26fa5de..e26fa5de 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 bc66dde7..bc66dde7 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 a0c5f9ad..a0c5f9ad 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 190210c8..190210c8 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 832955c4..832955c4 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 bb1ed2ac..bb1ed2ac 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 cbf02913..cbf02913 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 1c765dee..1c765dee 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 269a9d52..269a9d52 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 bd795651..bd795651 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 5ed0f662..5ed0f662 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 5bbb8e7a..5bbb8e7a 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 269a9d52..269a9d52 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 bd795651..bd795651 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 5ed0f662..5ed0f662 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 5bbb8e7a..5bbb8e7a 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 a0fa8df0..a0fa8df0 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 3082a1d9..3082a1d9 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 d32e8af0..d32e8af0 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 f4916e0b..f4916e0b 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 f90e29f9..f90e29f9 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 7dce11b4..7dce11b4 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 436abbdd..436abbdd 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 e728d6fa..e728d6fa 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 832955c4..832955c4 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 bb1ed2ac..bb1ed2ac 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 cbf02913..cbf02913 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 1c765dee..1c765dee 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 d57d3894..d57d3894 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 7c374528..7c374528 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 b0e0b9be..b0e0b9be 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 748864ef..748864ef 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 d5d4cac6..d5d4cac6 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 1cb753d7..1cb753d7 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 6cc304bf..6cc304bf 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 56ea82f6..56ea82f6 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 b0b95bed..b0b95bed 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 8ab854b0..8ab854b0 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 f3c97231..f3c97231 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 325469b8..325469b8 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 236002ff..236002ff 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 abc3d2c0..abc3d2c0 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 e215cf5b..e215cf5b 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 c6ec0520..c6ec0520 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 19b48f1d..19b48f1d 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 8f5abb84..8f5abb84 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 73963d75..73963d75 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 04d6131e..04d6131e 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 f48f514d..f48f514d 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 e31820ad..e31820ad 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 278ba900..278ba900 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 01e4e5c8..01e4e5c8 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 fd7832a6..fd7832a6 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 bd63a1b1..bd63a1b1 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 31452954..31452954 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 6db4d81d..6db4d81d 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 255f6c4d..255f6c4d 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 2b69cef6..2b69cef6 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 6fdfa487..6fdfa487 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 cc3205f1..cc3205f1 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 255f6c4d..255f6c4d 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 2b69cef6..2b69cef6 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 6fdfa487..6fdfa487 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 cc3205f1..cc3205f1 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 c4e957ad..c4e957ad 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 6d839113..6d839113 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 6b2e634c..6b2e634c 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 969c791a..969c791a 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 f76e0b21..f76e0b21 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 fecd0ab2..fecd0ab2 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 77a9c830..77a9c830 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 f1613684..f1613684 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 4934fb77..4934fb77 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 451b719e..451b719e 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 1daffca7..1daffca7 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 64830707..64830707 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 c2958f1b..c2958f1b 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 12a4d1f8..12a4d1f8 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 1696ac95..1696ac95 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 e1d13056..e1d13056 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 c2958f1b..c2958f1b 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 12a4d1f8..12a4d1f8 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 1696ac95..1696ac95 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 e1d13056..e1d13056 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 bdf8239a..bdf8239a 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 9f887c5e..9f887c5e 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 8042d4c2..8042d4c2 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 e7e68c47..e7e68c47 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 4934fb77..4934fb77 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 451b719e..451b719e 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 1daffca7..1daffca7 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 64830707..64830707 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 4934fb77..4934fb77 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 451b719e..451b719e 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 1daffca7..1daffca7 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 64830707..64830707 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 fd72dedf..fd72dedf 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 57eed9f8..57eed9f8 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 e217a644..e217a644 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 c212b59f..c212b59f 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 7f7e6b93..7f7e6b93 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 cbf6fb63..cbf6fb63 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 643776b8..643776b8 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 d64acb90..d64acb90 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 43192f54..43192f54 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 ebbbbf82..ebbbbf82 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 0a029b53..0a029b53 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 a1354169..a1354169 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 a4edafc9..a4edafc9 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 8c38226e..8c38226e 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 a939bffd..a939bffd 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 9f653770..9f653770 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 d3e877fc..d3e877fc 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 7790050e..7790050e 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 039d1987..039d1987 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 b3051d1f..b3051d1f 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 7baaeec5..7baaeec5 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 e0d59070..e0d59070 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 24b3054d..24b3054d 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 8ac4740a..8ac4740a 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 995c8276..995c8276 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 42c9dd6b..42c9dd6b 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 4ee974a1..4ee974a1 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 59b00915..59b00915 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 27751eac..27751eac 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 1692578f..1692578f 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 4c44c1bb..4c44c1bb 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 f8632bf2..f8632bf2 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 ae8b043b..ae8b043b 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 eaae097e..eaae097e 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 d8add811..d8add811 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 d954febf..d954febf 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 b3953398..b3953398 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 18e2ca65..18e2ca65 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 ed6674b4..ed6674b4 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 0da2cf93..0da2cf93 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 46220a8e..46220a8e 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 b8ebb7b7..b8ebb7b7 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 10561d8d..10561d8d 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 ccd09d69..ccd09d69 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 46220a8e..46220a8e 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 b8ebb7b7..b8ebb7b7 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 10561d8d..10561d8d 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 ccd09d69..ccd09d69 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 23842de4..23842de4 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 e5078932..e5078932 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 7edec0c9..7edec0c9 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 f6e5ff82..f6e5ff82 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 23842de4..23842de4 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 e5078932..e5078932 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 7edec0c9..7edec0c9 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 f6e5ff82..f6e5ff82 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 b6917a03..b6917a03 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 8999d3e4..8999d3e4 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 77aa0044..77aa0044 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 4f2fd261..4f2fd261 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 3c3da5b1..3c3da5b1 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 e0760e07..e0760e07 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 c37080f5..c37080f5 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 bdc24823..bdc24823 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 65f2821b..65f2821b 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 010dd9d0..010dd9d0 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 f647f489..f647f489 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 db0486d1..db0486d1 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 c3207f31..c3207f31 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 c8c2630e..c8c2630e 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 d0a6c818..d0a6c818 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 40e89762..40e89762 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 6ad31bb0..6ad31bb0 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 6cc60b4b..6cc60b4b 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 722c7ec7..722c7ec7 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 64fa4ab6..64fa4ab6 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 6ad31bb0..6ad31bb0 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 6cc60b4b..6cc60b4b 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 722c7ec7..722c7ec7 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 64fa4ab6..64fa4ab6 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 ac7da20e..ac7da20e 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 a12f3615..a12f3615 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 de11317b..de11317b 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 8be41f38..8be41f38 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 6b6e5264..6b6e5264 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 e0c36da3..e0c36da3 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 ca2389da..ca2389da 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 7e6c5474..7e6c5474 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 6b6e5264..6b6e5264 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 e0c36da3..e0c36da3 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 ca2389da..ca2389da 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 7e6c5474..7e6c5474 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 d756679f..d756679f 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 e49c7e89..e49c7e89 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 6041ffdc..6041ffdc 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 e23dda15..e23dda15 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 58be2120..58be2120 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 709a1ab6..709a1ab6 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 ee5b5b82..ee5b5b82 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 1e88d44d..1e88d44d 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 9703314b..9703314b 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 173eccfb..173eccfb 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 77737c75..77737c75 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 6a2bb865..6a2bb865 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 a6c9679a..a6c9679a 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 bd14cdbb..bd14cdbb 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 02d18c1d..02d18c1d 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 9ec1bf04..9ec1bf04 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 5fe5ab6a..5fe5ab6a 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 f7a2a5d5..f7a2a5d5 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 3244c93f..3244c93f 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 82482005..82482005 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 d291c50a..d291c50a 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 06e27b1b..06e27b1b 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 34b43735..34b43735 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 4a95cca4..4a95cca4 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 d291c50a..d291c50a 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 06e27b1b..06e27b1b 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 34b43735..34b43735 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 4a95cca4..4a95cca4 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 a98d5a1d..a98d5a1d 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 4b845860..4b845860 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 da241c07..da241c07 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 d1333671..d1333671 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 a98d5a1d..a98d5a1d 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 4b845860..4b845860 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 da241c07..da241c07 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 d1333671..d1333671 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 793e009d..793e009d 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 aca00c57..aca00c57 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 a49b9549..a49b9549 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 e0814f3b..e0814f3b 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 ac4c46d1..ac4c46d1 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 b1c335ee..b1c335ee 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 3f0d9f2f..3f0d9f2f 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 cac6eca8..cac6eca8 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 87a1ae7a..87a1ae7a 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 95c5ea06..95c5ea06 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 3ed6cddf..3ed6cddf 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 8f5e3f02..8f5e3f02 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 b3cc7bea..b3cc7bea 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 51313f59..51313f59 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 8db540f5..8db540f5 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 310400a2..310400a2 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 d88bd00d..d88bd00d 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 77dbb52a..77dbb52a 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 0739b1b1..0739b1b1 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 d53ee543..d53ee543 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 d88bd00d..d88bd00d 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 77dbb52a..77dbb52a 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 0739b1b1..0739b1b1 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 d53ee543..d53ee543 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 53f6d7e5..53f6d7e5 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 7c7bb214..7c7bb214 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 5a69027c..5a69027c 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 fe2171a5..fe2171a5 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 cf31f936..cf31f936 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 48b8861e..48b8861e 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 d6a41720..d6a41720 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 e0c7e374..e0c7e374 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 cf31f936..cf31f936 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 48b8861e..48b8861e 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 d6a41720..d6a41720 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 e0c7e374..e0c7e374 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 4548cddd..4548cddd 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 c5fb9d1b..c5fb9d1b 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 ffbe520a..ffbe520a 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 784f9bee..784f9bee 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 f2679457..f2679457 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 7f07e625..7f07e625 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 0b060816..0b060816 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 df76dfce..df76dfce 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 cbba897f..cbba897f 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 a49e11fa..a49e11fa 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 720e4543..720e4543 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 46333e3d..46333e3d 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 67cbe434..67cbe434 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 8e804b87..8e804b87 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 15baec74..15baec74 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 7112de67..7112de67 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 8ab854b0..8ab854b0 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 325469b8..325469b8 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 5357e847..5357e847 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 e215cf5b..e215cf5b 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 429d5508..429d5508 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 6f17b06e..6f17b06e 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 11dcfa26..11dcfa26 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 73963d75..73963d75 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 6e00db20..6e00db20 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 e1392de6..e1392de6 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 ff6a397f..ff6a397f 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 278ba900..278ba900 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 2b69cef6..2b69cef6 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 cc3205f1..cc3205f1 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 b8be2b4d..b8be2b4d 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 31452954..31452954 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 23570729..23570729 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 c7abb65c..c7abb65c 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 46b84d7d..46b84d7d 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 f4dfd338..f4dfd338 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 6ae574d5..6ae574d5 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 6b61562c..6b61562c 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 e46c0bf1..e46c0bf1 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 010444e8..010444e8 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 e79d8e1d..e79d8e1d 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 ea68d35f..ea68d35f 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 6d610415..6d610415 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 590cca96..590cca96 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 b8749743..b8749743 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 5a136a0c..5a136a0c 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 f47a366b..f47a366b 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 9ecb680f..9ecb680f 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 6ae574d5..6ae574d5 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 6b61562c..6b61562c 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 e46c0bf1..e46c0bf1 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 010444e8..010444e8 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 b8749743..b8749743 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 5a136a0c..5a136a0c 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 f47a366b..f47a366b 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 9ecb680f..9ecb680f 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 595dd546..595dd546 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 5be736aa..5be736aa 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 c8002ca3..c8002ca3 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 00e70c1b..00e70c1b 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 595dd546..595dd546 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 5be736aa..5be736aa 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 c8002ca3..c8002ca3 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 00e70c1b..00e70c1b 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 15649c34..15649c34 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 04f84ed9..04f84ed9 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 e0cfb637..e0cfb637 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 73fa381a..73fa381a 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 7f5ba5df..7f5ba5df 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 a0090df4..a0090df4 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 0c7e5264..0c7e5264 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 3a5e1d36..3a5e1d36 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 7f5ba5df..7f5ba5df 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 a0090df4..a0090df4 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 0c7e5264..0c7e5264 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 3a5e1d36..3a5e1d36 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 ecbc552a..ecbc552a 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 07fe7241..07fe7241 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 8c65c27f..8c65c27f 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 f6a1e476..f6a1e476 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 2b7265cd..2b7265cd 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 6ec88c7f..6ec88c7f 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 48c97985..48c97985 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 e9f81807..e9f81807 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 9cfab791..9cfab791 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 3bbbb8df..3bbbb8df 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 80d9a746..80d9a746 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 9ee7bfab..9ee7bfab 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 4867bcac..4867bcac 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 d833a0cd..d833a0cd 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 a632b6ae..a632b6ae 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 b5affab7..b5affab7 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 4867bcac..4867bcac 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 d833a0cd..d833a0cd 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 a632b6ae..a632b6ae 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 b5affab7..b5affab7 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 4fbbc060..4fbbc060 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 7939f943..7939f943 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 adcbe45b..adcbe45b 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 74c0c77e..74c0c77e 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 b6b4f1cd..b6b4f1cd 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 bfeedeb7..bfeedeb7 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 19e5ba2c..19e5ba2c 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 9345cd4f..9345cd4f 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 23570729..23570729 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 c7abb65c..c7abb65c 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 46b84d7d..46b84d7d 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 f4dfd338..f4dfd338 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 6ae574d5..6ae574d5 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 6b61562c..6b61562c 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 e46c0bf1..e46c0bf1 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 010444e8..010444e8 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 b8749743..b8749743 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 5a136a0c..5a136a0c 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 f47a366b..f47a366b 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 9ecb680f..9ecb680f 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 6ae574d5..6ae574d5 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 6b61562c..6b61562c 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 e46c0bf1..e46c0bf1 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 010444e8..010444e8 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 b8749743..b8749743 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 5a136a0c..5a136a0c 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 f47a366b..f47a366b 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 9ecb680f..9ecb680f 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 595dd546..595dd546 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 5be736aa..5be736aa 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 c8002ca3..c8002ca3 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 00e70c1b..00e70c1b 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 595dd546..595dd546 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 5be736aa..5be736aa 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 c8002ca3..c8002ca3 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 00e70c1b..00e70c1b 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 15649c34..15649c34 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 04f84ed9..04f84ed9 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 e0cfb637..e0cfb637 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 73fa381a..73fa381a 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 7f5ba5df..7f5ba5df 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 a0090df4..a0090df4 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 0c7e5264..0c7e5264 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 3a5e1d36..3a5e1d36 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 7f5ba5df..7f5ba5df 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 a0090df4..a0090df4 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 0c7e5264..0c7e5264 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 3a5e1d36..3a5e1d36 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 ecbc552a..ecbc552a 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 07fe7241..07fe7241 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 8c65c27f..8c65c27f 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 f6a1e476..f6a1e476 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 2b7265cd..2b7265cd 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 6ec88c7f..6ec88c7f 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 48c97985..48c97985 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 e9f81807..e9f81807 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 9cfab791..9cfab791 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 3bbbb8df..3bbbb8df 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 80d9a746..80d9a746 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 9ee7bfab..9ee7bfab 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 4867bcac..4867bcac 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 d833a0cd..d833a0cd 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 a632b6ae..a632b6ae 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 b5affab7..b5affab7 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 4867bcac..4867bcac 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 d833a0cd..d833a0cd 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 a632b6ae..a632b6ae 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 b5affab7..b5affab7 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 4fbbc060..4fbbc060 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 7939f943..7939f943 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 adcbe45b..adcbe45b 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 74c0c77e..74c0c77e 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 b6b4f1cd..b6b4f1cd 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 bfeedeb7..bfeedeb7 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 19e5ba2c..19e5ba2c 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 9345cd4f..9345cd4f 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 002efded..002efded 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 aaa1cbaf..aaa1cbaf 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 c4eb9e1f..c4eb9e1f 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 4a4e234a..4a4e234a 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 d2f0fa76..d2f0fa76 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 bee13292..bee13292 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 70afb7d3..70afb7d3 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 3a2015c4..3a2015c4 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 a6d3011b..a6d3011b 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 8ebfa026..8ebfa026 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 1d5a1d51..1d5a1d51 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 f06dc55f..f06dc55f 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 a6d3011b..a6d3011b 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 8ebfa026..8ebfa026 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 1d5a1d51..1d5a1d51 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 f06dc55f..f06dc55f 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 3f945184..3f945184 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 8a19720a..8a19720a 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 eadcf457..eadcf457 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 8bf8e992..8bf8e992 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 d48733ed..d48733ed 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 fbbaad7b..fbbaad7b 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 3a0ba70e..3a0ba70e 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 c04f124e..c04f124e 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 2266c722..2266c722 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 b7adb7ad..b7adb7ad 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 d8f4eae5..d8f4eae5 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 066d35b3..066d35b3 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 97d48f8c..97d48f8c 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 f9ea1d49..f9ea1d49 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 04e7ef6f..04e7ef6f 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 feaaa3bc..feaaa3bc 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 1d73acfa..1d73acfa 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 5be4cd6f..5be4cd6f 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 6ba3e246..6ba3e246 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 366aa511..366aa511 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 0b9ca9f3..0b9ca9f3 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 a806ed1b..a806ed1b 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 547ef33c..547ef33c 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 b759b1e8..b759b1e8 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 312a1294..312a1294 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 2c6c7e91..2c6c7e91 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 1d1aca71..1d1aca71 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 ed93182a..ed93182a 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 1251f4e4..1251f4e4 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 d535e8bc..d535e8bc 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 9fca3bb2..9fca3bb2 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 a275a52e..a275a52e 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 7ea60968..7ea60968 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 0a4c3f2a..0a4c3f2a 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 e8552741..e8552741 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 29ef5bb9..29ef5bb9 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 9c67cf27..9c67cf27 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 b0602519..b0602519 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 7f227ca3..7f227ca3 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 4788ecc7..4788ecc7 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 287a2872..287a2872 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 aa844165..aa844165 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 8c682255..8c682255 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 89bdd096..89bdd096 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 287a2872..287a2872 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 aa844165..aa844165 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 8c682255..8c682255 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 89bdd096..89bdd096 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 287a2872..287a2872 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 aa844165..aa844165 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 8c682255..8c682255 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 89bdd096..89bdd096 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 287a2872..287a2872 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 aa844165..aa844165 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 8c682255..8c682255 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 89bdd096..89bdd096 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 287a2872..287a2872 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 aa844165..aa844165 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 8c682255..8c682255 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 89bdd096..89bdd096 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 287a2872..287a2872 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 aa844165..aa844165 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 8c682255..8c682255 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 89bdd096..89bdd096 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 287a2872..287a2872 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 aa844165..aa844165 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 8c682255..8c682255 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 89bdd096..89bdd096 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 5a72a621..5a72a621 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 688a071a..688a071a 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 64375a7e..64375a7e 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 96004a10..96004a10 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 75e3e662..75e3e662 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 3662dec9..3662dec9 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 27714701..27714701 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 deeda9f5..deeda9f5 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 5b607aaf..5b607aaf 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 f5a11e04..f5a11e04 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 c957280f..c957280f 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 c888689d..c888689d 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 2e0dc67c..2e0dc67c 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 dd560998..dd560998 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 fed46542..fed46542 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 9bc96490..9bc96490 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 134aa2c3..134aa2c3 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 61d53907..f69bc5a5 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 26663a1b..26663a1b 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 dcb7738c..dcb7738c 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 351caefb..351caefb 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 66404ba4..66404ba4 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 78cc3068..78cc3068 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 529e2696..529e2696 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 331b30b8..331b30b8 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 84f9bc3e..84f9bc3e 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 9ae32499..9ae32499 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 8f16d7ac..8f16d7ac 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 37e55b61..37e55b61 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 212096b9..212096b9 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 7bae036a..7bae036a 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 d3d43074..d3d43074 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 bc885cfd..bc885cfd 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 58658c52..58658c52 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 00000000..05640ac5
--- /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 23ad4426..23ad4426 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 53baabf8..53baabf8 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 2076a54a..2076a54a 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 f16a0835..f16a0835 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 142ddd15..142ddd15 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 59a1689d..59a1689d 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 c9cdf985..c9cdf985 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 4a9f764b..4a9f764b 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 954c5d8a..954c5d8a 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 77543577..77543577 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 5928d37e..5928d37e 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 f6b88303..f6b88303 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 f3a748f6..f3a748f6 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 d059151e..d059151e 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 9a4fd0ce..9a4fd0ce 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 82a0da8b..82a0da8b 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 621b2b43..621b2b43 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 352eebec..352eebec 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 286f25b8..2962385e 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 a3f717be..a3f717be 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 ea42d666..ea42d666 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 15f4c1ad..15f4c1ad 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 d35df35c..d35df35c 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 2731436f..2731436f 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 1cb7f8c1..1cb7f8c1 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 e32fa812..e32fa812 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 93c4bf56..93c4bf56 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 8626f766..8626f766 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 4a27b832..4a27b832 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 d2608c76..d2608c76 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 7d06b05b..7d06b05b 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 c1f2a826..c1f2a826 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 77e85f42..77e85f42 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 b7e80c92..b7e80c92 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 a0c3bd3f..a0c3bd3f 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 f1d4e87d..f1d4e87d 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 fab2de26..fab2de26 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 08a33ffe..08a33ffe 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 711fac2d..711fac2d 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 8ccd7de3..8ccd7de3 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 055a8d23..055a8d23 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 cb5b62ec..cb5b62ec 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 dd4fae0e..dd4fae0e 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 664cb19e..664cb19e 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 334e570b..334e570b 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 d1d22115..d1d22115 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 f93f2425..f93f2425 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 55de0d13..55de0d13 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 bc81c630..bc81c630 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 a6bba9de..a6bba9de 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 2a366734..2a366734 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 4f69dd25..4f69dd25 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 95556cd0..95556cd0 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 4c3e6749..4c3e6749 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 c7aff94a..c7aff94a 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 cd4da229..cd4da229 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 a43e8730..a43e8730 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 fd7b7ab0..fd7b7ab0 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 9e9585f3..9e9585f3 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 bae0cdb8..bae0cdb8 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 a213bd7a..a213bd7a 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 8623ddf5..8623ddf5 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 a1aa82bd..a1aa82bd 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 be7ae332..be7ae332 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 4bce553d..4bce553d 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 033e48a3..033e48a3 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 2c1e5d66..2c1e5d66 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 9769627e..9769627e 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 5a978001..5a978001 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 1e7217c8..1e7217c8 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 37ce3a95..37ce3a95 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 57abd972..57abd972 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 26d3d7c1..26d3d7c1 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 756a43a5..756a43a5 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 9d1d6a32..9d1d6a32 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 32ed72f0..32ed72f0 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 1767cee6..1767cee6 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 93560f50..93560f50 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 94b5ca15..94b5ca15 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 d32f8160..d32f8160 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 34c3e7d1..34c3e7d1 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 0613f6dd..0613f6dd 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 ea09570e..ea09570e 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 00000000..315081d0
--- /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 b6593fab..b6593fab 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 a913ab84..a913ab84 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 8a4e98e3..8a4e98e3 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 68681c44..68681c44 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 b2337afc..b2337afc 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 60fd7aed..60fd7aed 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 ae1709b6..ae1709b6 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 10bcc035..10bcc035 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 72aeaf66..72aeaf66 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 8b3dde23..8b3dde23 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 bf93812d..bf93812d 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 a39a115b..a39a115b 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 51728389..51728389 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 9eb14233..9eb14233 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 d70728a0..d70728a0 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 56cf141c..56cf141c 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 aec9e232..aec9e232 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 9a1362b8..9a1362b8 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 85fdadf9..85fdadf9 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 c8e7ebbc..c8e7ebbc 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 981960c4..981960c4 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 432d86b5..432d86b5 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 69d9f852..69d9f852 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 5cfa2db6..5cfa2db6 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 40bab580..40bab580 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 3e7d2dfe..3e7d2dfe 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 e87efa7a..e87efa7a 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 fcd025e0..fcd025e0 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 2ec9c565..2ec9c565 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 0bd3ca03..0bd3ca03 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 18a82e17..18a82e17 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 af7cde66..dddcc63a 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 ff35d372..ff35d372 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 8e455a56..8e455a56 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 b3179849..b3179849 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 5840fa86..5840fa86 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 cd9e615e..cd9e615e 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 3cebf7f0..3cebf7f0 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 811c12f7..811c12f7 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 19f78f1e..19f78f1e 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 780ba734..780ba734 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 5104b710..5104b710 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 0bf88ebc..0bf88ebc 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 50fa0af9..50fa0af9 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 9460c997..9460c997 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 c4723f32..c4723f32 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 2ab58919..2ab58919 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 786be132..786be132 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 8287b0a8..8287b0a8 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 be6fad45..be6fad45 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 8946e7ad..8946e7ad 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 2adb85c6..2adb85c6 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 257f9caf..257f9caf 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 5e972ea9..5e972ea9 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 4f8cc874..4f8cc874 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 8d02d18b..8d02d18b 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 abd386ce..abd386ce 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 fda2560d..fda2560d 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 5bdc4d8f..5bdc4d8f 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 156a472c..156a472c 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 d101658c..d101658c 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 f66a9658..f66a9658 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 a6bba9de..a6bba9de 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 37c77a35..37c77a35 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 10c12589..10c12589 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 78362cea..78362cea 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 41611dd3..41611dd3 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 e36f8ee0..e36f8ee0 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 33ee4abb..33ee4abb 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 41ea2ce0..41ea2ce0 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 9b98c10e..9b98c10e 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 3709bdda..3709bdda 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 6fa0066b..6fa0066b 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 903f6728..903f6728 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 0266056f..0266056f 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 c305342d..c305342d 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 cd9be32d..cd9be32d 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 bf931a4c..bf931a4c 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 5b9f5725..5b9f5725 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 7dc1efd3..7dc1efd3 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 e2aae6fe..e2aae6fe 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 0df4159a..0df4159a 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 43466cbc..43466cbc 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 7a47bd21..7a47bd21 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 b66e2efc..b66e2efc 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 a704376c..a704376c 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 3b6d55ab..3b6d55ab 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 818c6b24..818c6b24 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 0153ccd4..0153ccd4 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 fa692d5b..fa692d5b 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 06b0207a..06b0207a 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 1049f616..1049f616 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 b24d117d..b24d117d 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 80aca7c1..80aca7c1 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 ba017240..ba017240 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 21f7ed4d..21f7ed4d 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 1c1f5984..b2bdffd2 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 e4cd5409..e4cd5409 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 3cf1bf37..3cf1bf37 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 aa455419..aa455419 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 2f0ada49..2f0ada49 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 6d3ebb84..6d3ebb84 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 51508c6f..51508c6f 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 f309b512..f309b512 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 8f907b75..8f907b75 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 31cb4a32..31cb4a32 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 605cfce2..605cfce2 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 50b07071..50b07071 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 46f7c52e..46f7c52e 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 f762d0e3..f762d0e3 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 e3bbc00a..e3bbc00a 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 bfcb0974..bfcb0974 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 b946a8f3..b946a8f3 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 5480d7f7..5480d7f7 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 00000000..3a90560e
--- /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 03778c4f..03778c4f 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 237d90b5..237d90b5 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 f16a0835..f16a0835 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 4ffbaae6..4ffbaae6 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 59a1689d..59a1689d 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 82b85698..82b85698 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 0ccbb155..0ccbb155 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 0e5ffff4..0e5ffff4 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 ab72fcaa..ab72fcaa 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 72309c60..72309c60 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 f6b88303..f6b88303 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 bc0e2cb7..bc0e2cb7 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 c893d93e..c893d93e 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 7f13eab0..7f13eab0 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 86e3b84a..048938a8 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 560460d6..e01cd692 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 9360d747..9360d747 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 0c6217bd..0c6217bd 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 575c84d0..e53a5c22 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 f3a4a180..f3a4a180 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 277be0a3..20d090c8 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 83e75278..e34ccf7c 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 7e55aaa2..7e55aaa2 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 09166820..09166820 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 7b286a1e..7b286a1e 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 b628ed09..b628ed09 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 77ca6125..77ca6125 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 a7f3f9d0..a7f3f9d0 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 037bdbae..037bdbae 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 29746ba7..29746ba7 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 b7b78732..b7b78732 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 ebc1c265..ebc1c265 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 869ff411..869ff411 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 5a72b91a..5a72b91a 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 d8bee337..d8bee337 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 8675989e..8675989e 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 5b6d9251..5b6d9251 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 23f290d3..23f290d3 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 3b87faf6..3b87faf6 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 5dfe060f..5dfe060f 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 41ca0cf1..41ca0cf1 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 6c4ac8ea..6c4ac8ea 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 03bf34b9..03bf34b9 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 0ac3756e..0ac3756e 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 79f1995e..79f1995e 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 bf5784e1..bf5784e1 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 569820fe..569820fe 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 cf060492..cf060492 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 8e8da68b..8e8da68b 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 a828160d..a828160d 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 2b07287f..2b07287f 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 480e8981..480e8981 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 53692dbe..53692dbe 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 655bb0b6..655bb0b6 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 56073d8f..56073d8f 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 d6d41d96..d6d41d96 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 f89d8d3e..f89d8d3e 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 3a992f2d..3a992f2d 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 637a8ea8..637a8ea8 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 67161ad3..67161ad3 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 9a514207..9a514207 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 2a232b8a..2a232b8a 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 d4b9f9fa..d4b9f9fa 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 cd7d35aa..cd7d35aa 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 35aaf753..35aaf753 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 2f7ee7d4..2f7ee7d4 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 5d061667..5d061667 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 b9e1c5f3..b9e1c5f3 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 a0c67bfb..a0c67bfb 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 4a23039a..4a23039a 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 894194a0..894194a0 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 ba2b8689..ba2b8689 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 59f1afac..59f1afac 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 d5290a7b..d5290a7b 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 4f7a6c2e..4f7a6c2e 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 7a2030e0..7a2030e0 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 13c313f0..13c313f0 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 2278fb65..2278fb65 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 38a0dcf5..38a0dcf5 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 46f53740..46f53740 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 ebc82864..ebc82864 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 757d647d..757d647d 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 c34dddd7..c34dddd7 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 05c9ce57..05c9ce57 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 4d025498..4d025498 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 242b770d..242b770d 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 92926b71..92926b71 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 64b95a40..64b95a40 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 512f8291..512f8291 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 07cd2b8a..07cd2b8a 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 a5383175..a5383175 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 a3e8ef20..a3e8ef20 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 5d8d5e20..5d8d5e20 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 a449ecdd..a449ecdd 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 beb50a5b..beb50a5b 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 7b638704..7b638704 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 b3f3a80e..b3f3a80e 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 425b2a68..425b2a68 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 14b5de60..75ef911b 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 96786eac..96786eac 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 4f4bf552..b326e467 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 c7e25548..c7e25548 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 396dbdc5..396dbdc5 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 da89601d..da89601d 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/quicktemplates2/qtquicktemplates2plugin.cpp