Remove "2" from Qt Quick Controls directories

Qt Quick Controls 2 was named that way because it was a follow-up to
Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer
supported, we don't need to have "2" in the name. Work on this was
already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.

By doing this renaming a few weeks before feature freeze, it won't
affect the release but still results in as little time possible spent
manually fixing conflicts in cherry-picks from non-LTS releases as a
result of the renaming.

This patch does the following:

- Renames directories.
- Adapts CMakeLists.txt and other files to account for the new paths.

A follow-up patch will handle documentation.

It does not touch library names or other user-facing stuff, as that
will have to be done in Qt 7.

Task-number: QTBUG-95413
Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

4870 files changed, 7405 insertions, 7405 deletions

diff --git a/.gitignore b/.gitignore
index 39f4cbaca5..e6ff521c67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,32 +85,32 @@ bin/qml*
 bin/qttracereplay*
 configure.cache
 config.status
-examples/quickcontrols2/chattutorial/chapter1-settingup/chapter1-settingup
-examples/quickcontrols2/chattutorial/chapter2-lists/chapter2-lists
-examples/quickcontrols2/chattutorial/chapter3-navigation/chapter3-navigation
-examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models
-examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling
-examples/quickcontrols2/contactlist/contactlist
-examples/quickcontrols2/flatstyle/flatstyle
-examples/quickcontrols2/gallery/gallery
-examples/quickcontrols2/imagine/automotive/automotive
-examples/quickcontrols2/imagine/musicplayer/musicplayer
-examples/quickcontrols2/sidepanel/sidepanel
-examples/quickcontrols2/swipetoremove/swipetoremove
-examples/quickcontrols2/texteditor/texteditor
-examples/quickcontrols2/wearable/wearable
+examples/quickcontrols/chattutorial/chapter1-settingup/chapter1-settingup
+examples/quickcontrols/chattutorial/chapter2-lists/chapter2-lists
+examples/quickcontrols/chattutorial/chapter3-navigation/chapter3-navigation
+examples/quickcontrols/chattutorial/chapter4-models/chapter4-models
+examples/quickcontrols/chattutorial/chapter5-styling/chapter5-styling
+examples/quickcontrols/contactlist/contactlist
+examples/quickcontrols/flatstyle/flatstyle
+examples/quickcontrols/gallery/gallery
+examples/quickcontrols/imagine/automotive/automotive
+examples/quickcontrols/imagine/musicplayer/musicplayer
+examples/quickcontrols/sidepanel/sidepanel
+examples/quickcontrols/swipetoremove/swipetoremove
+examples/quickcontrols/texteditor/texteditor
+examples/quickcontrols/wearable/wearable
 moc_*.cpp
 qmake/qmake.exe
 qmake/Makefile.bak
 src/corelib/global/qconfig.cpp
 src/corelib/global/qconfig.h
 src/corelib/global/qconfig.h.qmake
-src/quickcontrols2/qtquickcontrols2-config.h
-src/quickcontrols2/qtquickcontrols2-config.pri
-src/quickcontrols2/qtquickcontrols2-config_p.h
-src/quicktemplates2/qtquicktemplates2-config.h
-src/quicktemplates2/qtquicktemplates2-config.pri
-src/quicktemplates2/qtquicktemplates2-config_p.h
+src/quickcontrols/qtquickcontrols2-config.h
+src/quickcontrols/qtquickcontrols2-config.pri
+src/quickcontrols/qtquickcontrols2-config_p.h
+src/quicktemplates/qtquicktemplates2-config.h
+src/quicktemplates/qtquicktemplates2-config.pri
+src/quicktemplates/qtquicktemplates2-config_p.h
 ui_*.h
 tests/auto/cmake/build
 tests/auto/installed_cmake/build
@@ -127,50 +127,50 @@ tests/auto/qprocess/fileWriterProcess.txt
 .com.apple.timemachine.supported
 tests/auto/qlibrary/libmylib.so*
 tests/auto/qresourceengine/runtime_resource.rcc
-tests/auto/quickcontrols2/accessibility/tst_accessibility
-tests/auto/quickcontrols2/calendar/tst_calendar
-tests/auto/quickcontrols2/controls/basic/tst_basic
-tests/auto/quickcontrols2/controls/fusion/tst_fusion
-tests/auto/quickcontrols2/controls/imagine/tst_imagine
-tests/auto/quickcontrols2/controls/material/tst_material
-tests/auto/quickcontrols2/controls/universal/tst_universal
-tests/auto/quickcontrols2/cursor/tst_cursor
-tests/auto/quickcontrols2/customization/tst_customization
-tests/auto/quickcontrols2/focus/tst_focus
-tests/auto/quickcontrols2/font/tst_font
-tests/auto/quickcontrols2/palette/tst_palette
-tests/auto/quickcontrols2/platform/tst_platform
-tests/auto/quickcontrols2/pressandhold/tst_pressandhold
-tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow
-tests/auto/quickcontrols2/qquickcolor/tst_qquickcolor
-tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer
-tests/auto/quickcontrols2/qquickiconimage/tst_qquickiconimage
-tests/auto/quickcontrols2/qquickiconlabel/tst_qquickiconlabel
-tests/auto/quickcontrols2/qquickimaginestyle/tst_qquickimaginestyle
-tests/auto/quickcontrols2/qquickmaterialstyle/tst_qquickmaterialstyle
-tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf
-tests/auto/quickcontrols2/qquickmenu/tst_qquickmenu
-tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar
-tests/auto/quickcontrols2/qquickninepatchimage/tst_qquickninepatchimage
-tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup
-tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle
-tests/auto/quickcontrols2/qquickstyleselector/tst_qquickstyleselector
-tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle
-tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf
-tests/auto/quickcontrols2/revisions/tst_revisions
-tests/auto/quickcontrols2/sanity/tst_sanity
-tests/auto/quickcontrols2/snippets/tst_snippets
-tests/auto/quickcontrols2/styles/tst_styles
-tests/auto/quickcontrols2/snippets/screenshots/*.png
+tests/auto/quickcontrols/accessibility/tst_accessibility
+tests/auto/quickcontrols/calendar/tst_calendar
+tests/auto/quickcontrols/controls/basic/tst_basic
+tests/auto/quickcontrols/controls/fusion/tst_fusion
+tests/auto/quickcontrols/controls/imagine/tst_imagine
+tests/auto/quickcontrols/controls/material/tst_material
+tests/auto/quickcontrols/controls/universal/tst_universal
+tests/auto/quickcontrols/cursor/tst_cursor
+tests/auto/quickcontrols/customization/tst_customization
+tests/auto/quickcontrols/focus/tst_focus
+tests/auto/quickcontrols/font/tst_font
+tests/auto/quickcontrols/palette/tst_palette
+tests/auto/quickcontrols/platform/tst_platform
+tests/auto/quickcontrols/pressandhold/tst_pressandhold
+tests/auto/quickcontrols/qquickapplicationwindow/tst_qquickapplicationwindow
+tests/auto/quickcontrols/qquickcolor/tst_qquickcolor
+tests/auto/quickcontrols/qquickdrawer/tst_qquickdrawer
+tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage
+tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel
+tests/auto/quickcontrols/qquickimaginestyle/tst_qquickimaginestyle
+tests/auto/quickcontrols/qquickmaterialstyle/tst_qquickmaterialstyle
+tests/auto/quickcontrols/qquickmaterialstyleconf/tst_qquickmaterialstyleconf
+tests/auto/quickcontrols/qquickmenu/tst_qquickmenu
+tests/auto/quickcontrols/qquickmenubar/tst_qquickmenubar
+tests/auto/quickcontrols/qquickninepatchimage/tst_qquickninepatchimage
+tests/auto/quickcontrols/qquickpopup/tst_qquickpopup
+tests/auto/quickcontrols/qquickstyle/tst_qquickstyle
+tests/auto/quickcontrols/qquickstyleselector/tst_qquickstyleselector
+tests/auto/quickcontrols/qquickuniversalstyle/tst_qquickuniversalstyle
+tests/auto/quickcontrols/qquickuniversalstyleconf/tst_qquickuniversalstyleconf
+tests/auto/quickcontrols/revisions/tst_revisions
+tests/auto/quickcontrols/sanity/tst_sanity
+tests/auto/quickcontrols/snippets/tst_snippets
+tests/auto/quickcontrols/styles/tst_styles
+tests/auto/quickcontrols/snippets/screenshots/*.png
 tests/benchmarks/creationtime/tst_creationtime
 tests/benchmarks/objectcount/tst_objectcount
-tests/manual/quickcontrols2/buttons/buttons
-tests/manual/quickcontrols2/fonts/fonts
-tests/manual/quickcontrols2/gifs/tst_gifs
-tests/manual/quickcontrols2/styles/styles
-tests/manual/quickcontrols2/testbench/testbench
-tests/manual/quickcontrols2/screenshots/screenshots
-tests/manual/quickcontrols2/gifs/gifs/*.gif
+tests/manual/quickcontrols/buttons/buttons
+tests/manual/quickcontrols/fonts/fonts
+tests/manual/quickcontrols/gifs/tst_gifs
+tests/manual/quickcontrols/styles/styles
+tests/manual/quickcontrols/testbench/testbench
+tests/manual/quickcontrols/screenshots/screenshots
+tests/manual/quickcontrols/gifs/gifs/*.gif
 tools/qtestlib/chart/chart*
 tools/qtestlib/updater/updater*
 tools/qmleasing/qmleasing
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 9040007f62..57d9fa87d2 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -11,7 +11,7 @@ if(TARGET Qt::Quick)
     add_subdirectory(quick)
 endif()
 if(TARGET Qt::QuickTemplates2)
-    add_subdirectory(quickcontrols2)
+    add_subdirectory(quickcontrols)
 endif()
 
 qt_examples_build_end()
diff --git a/examples/quickcontrols2/CMakeLists.txt b/examples/quickcontrols/CMakeLists.txt
index e4021bf430..e4021bf430 100644
--- a/examples/quickcontrols2/CMakeLists.txt
+++ b/examples/quickcontrols/CMakeLists.txt
diff --git a/examples/quickcontrols2/attachedstyleproperties/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt
index 229129f5c6..229129f5c6 100644
--- a/examples/quickcontrols2/attachedstyleproperties/CMakeLists.txt
+++ b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt
diff --git a/examples/quickcontrols2/attachedstyleproperties/MyStyle/ApplicationWindow.qml b/examples/quickcontrols/attachedstyleproperties/MyStyle/ApplicationWindow.qml
index 8a7bbc7ed2..8a7bbc7ed2 100644
--- a/examples/quickcontrols2/attachedstyleproperties/MyStyle/ApplicationWindow.qml
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/ApplicationWindow.qml
diff --git a/examples/quickcontrols2/attachedstyleproperties/MyStyle/Button.qml b/examples/quickcontrols/attachedstyleproperties/MyStyle/Button.qml
index 7eabcb0b35..7eabcb0b35 100644
--- a/examples/quickcontrols2/attachedstyleproperties/MyStyle/Button.qml
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/Button.qml
diff --git a/examples/quickcontrols2/attachedstyleproperties/MyStyle/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt
index 81b15f128f..81b15f128f 100644
--- a/examples/quickcontrols2/attachedstyleproperties/MyStyle/CMakeLists.txt
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt
diff --git a/examples/quickcontrols2/attachedstyleproperties/MyStyle/Label.qml b/examples/quickcontrols/attachedstyleproperties/MyStyle/Label.qml
index 3d045aa70e..3d045aa70e 100644
--- a/examples/quickcontrols2/attachedstyleproperties/MyStyle/Label.qml
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/Label.qml
diff --git a/examples/quickcontrols2/attachedstyleproperties/MyStyle/Popup.qml b/examples/quickcontrols/attachedstyleproperties/MyStyle/Popup.qml
index 0f5e753f60..0f5e753f60 100644
--- a/examples/quickcontrols2/attachedstyleproperties/MyStyle/Popup.qml
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/Popup.qml
diff --git a/examples/quickcontrols2/attachedstyleproperties/MyStyle/Switch.qml b/examples/quickcontrols/attachedstyleproperties/MyStyle/Switch.qml
index 59bda147b7..59bda147b7 100644
--- a/examples/quickcontrols2/attachedstyleproperties/MyStyle/Switch.qml
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/Switch.qml
diff --git a/examples/quickcontrols2/attachedstyleproperties/MyStyle/ToolBar.qml b/examples/quickcontrols/attachedstyleproperties/MyStyle/ToolBar.qml
index b0cd597c87..b0cd597c87 100644
--- a/examples/quickcontrols2/attachedstyleproperties/MyStyle/ToolBar.qml
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/ToolBar.qml
diff --git a/examples/quickcontrols2/attachedstyleproperties/MyStyle/mystyle.cpp b/examples/quickcontrols/attachedstyleproperties/MyStyle/mystyle.cpp
index 40f7af702e..40f7af702e 100644
--- a/examples/quickcontrols2/attachedstyleproperties/MyStyle/mystyle.cpp
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/mystyle.cpp
diff --git a/examples/quickcontrols2/attachedstyleproperties/MyStyle/mystyle.h b/examples/quickcontrols/attachedstyleproperties/MyStyle/mystyle.h
index da87ab4718..da87ab4718 100644
--- a/examples/quickcontrols2/attachedstyleproperties/MyStyle/mystyle.h
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/mystyle.h
diff --git a/examples/quickcontrols2/attachedstyleproperties/attachedstyleproperties.cpp b/examples/quickcontrols/attachedstyleproperties/attachedstyleproperties.cpp
index 376e53c055..376e53c055 100644
--- a/examples/quickcontrols2/attachedstyleproperties/attachedstyleproperties.cpp
+++ b/examples/quickcontrols/attachedstyleproperties/attachedstyleproperties.cpp
diff --git a/examples/quickcontrols2/attachedstyleproperties/attachedstyleproperties.qml b/examples/quickcontrols/attachedstyleproperties/attachedstyleproperties.qml
index e08e19801f..e08e19801f 100644
--- a/examples/quickcontrols2/attachedstyleproperties/attachedstyleproperties.qml
+++ b/examples/quickcontrols/attachedstyleproperties/attachedstyleproperties.qml
diff --git a/examples/quickcontrols2/attachedstyleproperties/doc/images/qtquickcontrols2-attachedstyleproperties.png b/examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols2-attachedstyleproperties.png
index 2cd5f214f7..2cd5f214f7 100644
--- a/examples/quickcontrols2/attachedstyleproperties/doc/images/qtquickcontrols2-attachedstyleproperties.png
+++ b/examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols2-attachedstyleproperties.png
diff --git a/examples/quickcontrols2/attachedstyleproperties/doc/src/qtquickcontrols2-attachedstyleproperties.qdoc b/examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols2-attachedstyleproperties.qdoc
index de43fc80bd..de43fc80bd 100644
--- a/examples/quickcontrols2/attachedstyleproperties/doc/src/qtquickcontrols2-attachedstyleproperties.qdoc
+++ b/examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols2-attachedstyleproperties.qdoc
diff --git a/examples/quickcontrols2/chattutorial/CMakeLists.txt b/examples/quickcontrols/chattutorial/CMakeLists.txt
index 4da558f2f5..4da558f2f5 100644
--- a/examples/quickcontrols2/chattutorial/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/CMakeLists.txt
diff --git a/examples/quickcontrols2/chattutorial/chapter1/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
index 3320012cb4..3320012cb4 100644
--- a/examples/quickcontrols2/chattutorial/chapter1/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
diff --git a/examples/quickcontrols2/chattutorial/chapter1/chapter1.pro b/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
index 6b50809f20..6b50809f20 100644
--- a/examples/quickcontrols2/chattutorial/chapter1/chapter1.pro
+++ b/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
diff --git a/examples/quickcontrols2/chattutorial/chapter1/main.cpp b/examples/quickcontrols/chattutorial/chapter1/main.cpp
index 3752f91d90..3752f91d90 100644
--- a/examples/quickcontrols2/chattutorial/chapter1/main.cpp
+++ b/examples/quickcontrols/chattutorial/chapter1/main.cpp
diff --git a/examples/quickcontrols2/chattutorial/chapter1/main.qml b/examples/quickcontrols/chattutorial/chapter1/main.qml
index d0651b5816..d0651b5816 100644
--- a/examples/quickcontrols2/chattutorial/chapter1/main.qml
+++ b/examples/quickcontrols/chattutorial/chapter1/main.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter1/qtquickcontrols2.conf b/examples/quickcontrols/chattutorial/chapter1/qtquickcontrols2.conf
index db9486764e..db9486764e 100644
--- a/examples/quickcontrols2/chattutorial/chapter1/qtquickcontrols2.conf
+++ b/examples/quickcontrols/chattutorial/chapter1/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/chattutorial/chapter2/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
index c011336802..c011336802 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
diff --git a/examples/quickcontrols2/chattutorial/chapter2/chapter2.pro b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
index 15429b7c89..15429b7c89 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/chapter2.pro
+++ b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Albert_Einstein.png b/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein.png
index 7c44b90b8d..7c44b90b8d 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Albert_Einstein.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Albert_Einstein@2x.png b/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein@2x.png
index 6ce9c39b6c..6ce9c39b6c 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Albert_Einstein@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Albert_Einstein@3x.png b/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein@3x.png
index aab6a6a162..aab6a6a162 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Albert_Einstein@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Albert_Einstein@4x.png b/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein@4x.png
index 3611284df4..3611284df4 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Albert_Einstein@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Ernest_Hemingway.png b/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway.png
index 3ac8992fd9..3ac8992fd9 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Ernest_Hemingway.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Ernest_Hemingway@2x.png b/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway@2x.png
index 122d9f1e53..122d9f1e53 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Ernest_Hemingway@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Ernest_Hemingway@3x.png b/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway@3x.png
index 2fe9c2cc1c..2fe9c2cc1c 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Ernest_Hemingway@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Ernest_Hemingway@4x.png b/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway@4x.png
index 96fb6788b5..96fb6788b5 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Ernest_Hemingway@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Hans_Gude.png b/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude.png
index 907e38bc61..907e38bc61 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Hans_Gude.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Hans_Gude@2x.png b/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude@2x.png
index 6837796a83..6837796a83 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Hans_Gude@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Hans_Gude@3x.png b/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude@3x.png
index 29af422ad3..29af422ad3 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Hans_Gude@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/Hans_Gude@4x.png b/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude@4x.png
index bc35eeaa79..bc35eeaa79 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/Hans_Gude@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter2/images/images.qrc b/examples/quickcontrols/chattutorial/chapter2/images/images.qrc
index 9eda6aa29c..9eda6aa29c 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/images/images.qrc
+++ b/examples/quickcontrols/chattutorial/chapter2/images/images.qrc
diff --git a/examples/quickcontrols2/chattutorial/chapter2/main.cpp b/examples/quickcontrols/chattutorial/chapter2/main.cpp
index eeb87becca..eeb87becca 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/main.cpp
+++ b/examples/quickcontrols/chattutorial/chapter2/main.cpp
diff --git a/examples/quickcontrols2/chattutorial/chapter2/main.qml b/examples/quickcontrols/chattutorial/chapter2/main.qml
index 851b482b01..851b482b01 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/main.qml
+++ b/examples/quickcontrols/chattutorial/chapter2/main.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter2/qtquickcontrols2.conf b/examples/quickcontrols/chattutorial/chapter2/qtquickcontrols2.conf
index db9486764e..db9486764e 100644
--- a/examples/quickcontrols2/chattutorial/chapter2/qtquickcontrols2.conf
+++ b/examples/quickcontrols/chattutorial/chapter2/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/chattutorial/chapter3/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
index 92545ec1d0..92545ec1d0 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
diff --git a/examples/quickcontrols2/chattutorial/chapter3/ContactPage.qml b/examples/quickcontrols/chattutorial/chapter3/ContactPage.qml
index 88979a40b2..88979a40b2 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/ContactPage.qml
+++ b/examples/quickcontrols/chattutorial/chapter3/ContactPage.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter3/ConversationPage.qml b/examples/quickcontrols/chattutorial/chapter3/ConversationPage.qml
index e61d014e6e..e61d014e6e 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/ConversationPage.qml
+++ b/examples/quickcontrols/chattutorial/chapter3/ConversationPage.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter3/chapter3.pro b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
index 42adc69fe9..42adc69fe9 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/chapter3.pro
+++ b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Albert_Einstein.png b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein.png
index 7c44b90b8d..7c44b90b8d 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Albert_Einstein.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Albert_Einstein@2x.png b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@2x.png
index 6ce9c39b6c..6ce9c39b6c 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Albert_Einstein@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Albert_Einstein@3x.png b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@3x.png
index aab6a6a162..aab6a6a162 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Albert_Einstein@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Albert_Einstein@4x.png b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@4x.png
index 3611284df4..3611284df4 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Albert_Einstein@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Ernest_Hemingway.png b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway.png
index 3ac8992fd9..3ac8992fd9 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Ernest_Hemingway.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Ernest_Hemingway@2x.png b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@2x.png
index 122d9f1e53..122d9f1e53 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Ernest_Hemingway@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Ernest_Hemingway@3x.png b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@3x.png
index 2fe9c2cc1c..2fe9c2cc1c 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Ernest_Hemingway@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Ernest_Hemingway@4x.png b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@4x.png
index 96fb6788b5..96fb6788b5 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Ernest_Hemingway@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Hans_Gude.png b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude.png
index 907e38bc61..907e38bc61 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Hans_Gude.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Hans_Gude@2x.png b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@2x.png
index 6837796a83..6837796a83 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Hans_Gude@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Hans_Gude@3x.png b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@3x.png
index 29af422ad3..29af422ad3 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Hans_Gude@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/Hans_Gude@4x.png b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@4x.png
index bc35eeaa79..bc35eeaa79 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/Hans_Gude@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter3/images/images.qrc b/examples/quickcontrols/chattutorial/chapter3/images/images.qrc
index 9eda6aa29c..9eda6aa29c 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/images/images.qrc
+++ b/examples/quickcontrols/chattutorial/chapter3/images/images.qrc
diff --git a/examples/quickcontrols2/chattutorial/chapter3/main.cpp b/examples/quickcontrols/chattutorial/chapter3/main.cpp
index 4347d3ff6c..4347d3ff6c 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/main.cpp
+++ b/examples/quickcontrols/chattutorial/chapter3/main.cpp
diff --git a/examples/quickcontrols2/chattutorial/chapter3/main.qml b/examples/quickcontrols/chattutorial/chapter3/main.qml
index da080e3a45..da080e3a45 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/main.qml
+++ b/examples/quickcontrols/chattutorial/chapter3/main.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter3/qtquickcontrols2.conf b/examples/quickcontrols/chattutorial/chapter3/qtquickcontrols2.conf
index db9486764e..db9486764e 100644
--- a/examples/quickcontrols2/chattutorial/chapter3/qtquickcontrols2.conf
+++ b/examples/quickcontrols/chattutorial/chapter3/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/chattutorial/chapter4/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
index 024430a495..024430a495 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
diff --git a/examples/quickcontrols2/chattutorial/chapter4/ContactPage.qml b/examples/quickcontrols/chattutorial/chapter4/ContactPage.qml
index 739d0b5402..739d0b5402 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/ContactPage.qml
+++ b/examples/quickcontrols/chattutorial/chapter4/ContactPage.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter4/ConversationPage.qml b/examples/quickcontrols/chattutorial/chapter4/ConversationPage.qml
index ef5b959aec..ef5b959aec 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/ConversationPage.qml
+++ b/examples/quickcontrols/chattutorial/chapter4/ConversationPage.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter4/chapter4.pro b/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
index ae8141f7f1..ae8141f7f1 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/chapter4.pro
+++ b/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Albert_Einstein.png b/examples/quickcontrols/chattutorial/chapter4/images/Albert_Einstein.png
index 7c44b90b8d..7c44b90b8d 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Albert_Einstein.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Albert_Einstein.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Albert_Einstein@2x.png b/examples/quickcontrols/chattutorial/chapter4/images/Albert_Einstein@2x.png
index 6ce9c39b6c..6ce9c39b6c 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Albert_Einstein@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Albert_Einstein@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Albert_Einstein@3x.png b/examples/quickcontrols/chattutorial/chapter4/images/Albert_Einstein@3x.png
index aab6a6a162..aab6a6a162 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Albert_Einstein@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Albert_Einstein@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Albert_Einstein@4x.png b/examples/quickcontrols/chattutorial/chapter4/images/Albert_Einstein@4x.png
index 3611284df4..3611284df4 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Albert_Einstein@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Albert_Einstein@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Ernest_Hemingway.png b/examples/quickcontrols/chattutorial/chapter4/images/Ernest_Hemingway.png
index 3ac8992fd9..3ac8992fd9 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Ernest_Hemingway.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Ernest_Hemingway.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Ernest_Hemingway@2x.png b/examples/quickcontrols/chattutorial/chapter4/images/Ernest_Hemingway@2x.png
index 122d9f1e53..122d9f1e53 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Ernest_Hemingway@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Ernest_Hemingway@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Ernest_Hemingway@3x.png b/examples/quickcontrols/chattutorial/chapter4/images/Ernest_Hemingway@3x.png
index 2fe9c2cc1c..2fe9c2cc1c 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Ernest_Hemingway@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Ernest_Hemingway@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Ernest_Hemingway@4x.png b/examples/quickcontrols/chattutorial/chapter4/images/Ernest_Hemingway@4x.png
index 96fb6788b5..96fb6788b5 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Ernest_Hemingway@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Ernest_Hemingway@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Hans_Gude.png b/examples/quickcontrols/chattutorial/chapter4/images/Hans_Gude.png
index 907e38bc61..907e38bc61 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Hans_Gude.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Hans_Gude.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Hans_Gude@2x.png b/examples/quickcontrols/chattutorial/chapter4/images/Hans_Gude@2x.png
index 6837796a83..6837796a83 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Hans_Gude@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Hans_Gude@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Hans_Gude@3x.png b/examples/quickcontrols/chattutorial/chapter4/images/Hans_Gude@3x.png
index 29af422ad3..29af422ad3 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Hans_Gude@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Hans_Gude@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/Hans_Gude@4x.png b/examples/quickcontrols/chattutorial/chapter4/images/Hans_Gude@4x.png
index bc35eeaa79..bc35eeaa79 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/Hans_Gude@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter4/images/Hans_Gude@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter4/images/images.qrc b/examples/quickcontrols/chattutorial/chapter4/images/images.qrc
index 9eda6aa29c..9eda6aa29c 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/images/images.qrc
+++ b/examples/quickcontrols/chattutorial/chapter4/images/images.qrc
diff --git a/examples/quickcontrols2/chattutorial/chapter4/main.cpp b/examples/quickcontrols/chattutorial/chapter4/main.cpp
index 0ca281c7d9..0ca281c7d9 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/main.cpp
+++ b/examples/quickcontrols/chattutorial/chapter4/main.cpp
diff --git a/examples/quickcontrols2/chattutorial/chapter4/main.qml b/examples/quickcontrols/chattutorial/chapter4/main.qml
index da080e3a45..da080e3a45 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/main.qml
+++ b/examples/quickcontrols/chattutorial/chapter4/main.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter4/qtquickcontrols2.conf b/examples/quickcontrols/chattutorial/chapter4/qtquickcontrols2.conf
index db9486764e..db9486764e 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/qtquickcontrols2.conf
+++ b/examples/quickcontrols/chattutorial/chapter4/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/chattutorial/chapter4/sqlcontactmodel.cpp b/examples/quickcontrols/chattutorial/chapter4/sqlcontactmodel.cpp
index 0bccc0d7af..0bccc0d7af 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/sqlcontactmodel.cpp
+++ b/examples/quickcontrols/chattutorial/chapter4/sqlcontactmodel.cpp
diff --git a/examples/quickcontrols2/chattutorial/chapter4/sqlcontactmodel.h b/examples/quickcontrols/chattutorial/chapter4/sqlcontactmodel.h
index a6d24a4774..a6d24a4774 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/sqlcontactmodel.h
+++ b/examples/quickcontrols/chattutorial/chapter4/sqlcontactmodel.h
diff --git a/examples/quickcontrols2/chattutorial/chapter4/sqlconversationmodel.cpp b/examples/quickcontrols/chattutorial/chapter4/sqlconversationmodel.cpp
index 1a1594b094..1a1594b094 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/sqlconversationmodel.cpp
+++ b/examples/quickcontrols/chattutorial/chapter4/sqlconversationmodel.cpp
diff --git a/examples/quickcontrols2/chattutorial/chapter4/sqlconversationmodel.h b/examples/quickcontrols/chattutorial/chapter4/sqlconversationmodel.h
index 8a3cdd4c43..8a3cdd4c43 100644
--- a/examples/quickcontrols2/chattutorial/chapter4/sqlconversationmodel.h
+++ b/examples/quickcontrols/chattutorial/chapter4/sqlconversationmodel.h
diff --git a/examples/quickcontrols2/chattutorial/chapter5/+Material/ChatToolBar.qml b/examples/quickcontrols/chattutorial/chapter5/+Material/ChatToolBar.qml
index 3fa10c7f13..3fa10c7f13 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/+Material/ChatToolBar.qml
+++ b/examples/quickcontrols/chattutorial/chapter5/+Material/ChatToolBar.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter5/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
index 657684fc34..657684fc34 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
diff --git a/examples/quickcontrols2/chattutorial/chapter5/ChatToolBar.qml b/examples/quickcontrols/chattutorial/chapter5/ChatToolBar.qml
index 73f2c655a9..73f2c655a9 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/ChatToolBar.qml
+++ b/examples/quickcontrols/chattutorial/chapter5/ChatToolBar.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter5/ContactPage.qml b/examples/quickcontrols/chattutorial/chapter5/ContactPage.qml
index 920c824090..920c824090 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/ContactPage.qml
+++ b/examples/quickcontrols/chattutorial/chapter5/ContactPage.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter5/ConversationPage.qml b/examples/quickcontrols/chattutorial/chapter5/ConversationPage.qml
index 6e209b7a85..6e209b7a85 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/ConversationPage.qml
+++ b/examples/quickcontrols/chattutorial/chapter5/ConversationPage.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter5/chapter5.pro b/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
index 625642d7b5..625642d7b5 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/chapter5.pro
+++ b/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Albert_Einstein.png b/examples/quickcontrols/chattutorial/chapter5/images/Albert_Einstein.png
index 7c44b90b8d..7c44b90b8d 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Albert_Einstein.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Albert_Einstein.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Albert_Einstein@2x.png b/examples/quickcontrols/chattutorial/chapter5/images/Albert_Einstein@2x.png
index 6ce9c39b6c..6ce9c39b6c 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Albert_Einstein@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Albert_Einstein@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Albert_Einstein@3x.png b/examples/quickcontrols/chattutorial/chapter5/images/Albert_Einstein@3x.png
index aab6a6a162..aab6a6a162 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Albert_Einstein@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Albert_Einstein@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Albert_Einstein@4x.png b/examples/quickcontrols/chattutorial/chapter5/images/Albert_Einstein@4x.png
index 3611284df4..3611284df4 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Albert_Einstein@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Albert_Einstein@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Ernest_Hemingway.png b/examples/quickcontrols/chattutorial/chapter5/images/Ernest_Hemingway.png
index 3ac8992fd9..3ac8992fd9 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Ernest_Hemingway.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Ernest_Hemingway.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Ernest_Hemingway@2x.png b/examples/quickcontrols/chattutorial/chapter5/images/Ernest_Hemingway@2x.png
index 122d9f1e53..122d9f1e53 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Ernest_Hemingway@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Ernest_Hemingway@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Ernest_Hemingway@3x.png b/examples/quickcontrols/chattutorial/chapter5/images/Ernest_Hemingway@3x.png
index 2fe9c2cc1c..2fe9c2cc1c 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Ernest_Hemingway@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Ernest_Hemingway@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Ernest_Hemingway@4x.png b/examples/quickcontrols/chattutorial/chapter5/images/Ernest_Hemingway@4x.png
index 96fb6788b5..96fb6788b5 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Ernest_Hemingway@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Ernest_Hemingway@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Hans_Gude.png b/examples/quickcontrols/chattutorial/chapter5/images/Hans_Gude.png
index 907e38bc61..907e38bc61 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Hans_Gude.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Hans_Gude.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Hans_Gude@2x.png b/examples/quickcontrols/chattutorial/chapter5/images/Hans_Gude@2x.png
index 6837796a83..6837796a83 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Hans_Gude@2x.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Hans_Gude@2x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Hans_Gude@3x.png b/examples/quickcontrols/chattutorial/chapter5/images/Hans_Gude@3x.png
index 29af422ad3..29af422ad3 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Hans_Gude@3x.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Hans_Gude@3x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/Hans_Gude@4x.png b/examples/quickcontrols/chattutorial/chapter5/images/Hans_Gude@4x.png
index bc35eeaa79..bc35eeaa79 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/Hans_Gude@4x.png
+++ b/examples/quickcontrols/chattutorial/chapter5/images/Hans_Gude@4x.png
diff --git a/examples/quickcontrols2/chattutorial/chapter5/images/images.qrc b/examples/quickcontrols/chattutorial/chapter5/images/images.qrc
index 9eda6aa29c..9eda6aa29c 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/images/images.qrc
+++ b/examples/quickcontrols/chattutorial/chapter5/images/images.qrc
diff --git a/examples/quickcontrols2/chattutorial/chapter5/main.cpp b/examples/quickcontrols/chattutorial/chapter5/main.cpp
index cfa5aa6f57..cfa5aa6f57 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/main.cpp
+++ b/examples/quickcontrols/chattutorial/chapter5/main.cpp
diff --git a/examples/quickcontrols2/chattutorial/chapter5/main.qml b/examples/quickcontrols/chattutorial/chapter5/main.qml
index da080e3a45..da080e3a45 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/main.qml
+++ b/examples/quickcontrols/chattutorial/chapter5/main.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter5/qtquickcontrols2.conf b/examples/quickcontrols/chattutorial/chapter5/qtquickcontrols2.conf
index c8a8eeeb05..c8a8eeeb05 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/qtquickcontrols2.conf
+++ b/examples/quickcontrols/chattutorial/chapter5/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/chattutorial/chapter5/sqlcontactmodel.cpp b/examples/quickcontrols/chattutorial/chapter5/sqlcontactmodel.cpp
index 0bccc0d7af..0bccc0d7af 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/sqlcontactmodel.cpp
+++ b/examples/quickcontrols/chattutorial/chapter5/sqlcontactmodel.cpp
diff --git a/examples/quickcontrols2/chattutorial/chapter5/sqlcontactmodel.h b/examples/quickcontrols/chattutorial/chapter5/sqlcontactmodel.h
index a6d24a4774..a6d24a4774 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/sqlcontactmodel.h
+++ b/examples/quickcontrols/chattutorial/chapter5/sqlcontactmodel.h
diff --git a/examples/quickcontrols2/chattutorial/chapter5/sqlconversationmodel.cpp b/examples/quickcontrols/chattutorial/chapter5/sqlconversationmodel.cpp
index 1a1594b094..1a1594b094 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/sqlconversationmodel.cpp
+++ b/examples/quickcontrols/chattutorial/chapter5/sqlconversationmodel.cpp
diff --git a/examples/quickcontrols2/chattutorial/chapter5/sqlconversationmodel.h b/examples/quickcontrols/chattutorial/chapter5/sqlconversationmodel.h
index 8a3cdd4c43..8a3cdd4c43 100644
--- a/examples/quickcontrols2/chattutorial/chapter5/sqlconversationmodel.h
+++ b/examples/quickcontrols/chattutorial/chapter5/sqlconversationmodel.h
diff --git a/examples/quickcontrols2/chattutorial/chattutorial.pro b/examples/quickcontrols/chattutorial/chattutorial.pro
index 1c70b2653e..1c70b2653e 100644
--- a/examples/quickcontrols2/chattutorial/chattutorial.pro
+++ b/examples/quickcontrols/chattutorial/chattutorial.pro
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png
index aa3c4bb5be..aa3c4bb5be 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif
index 17096519b0..17096519b0 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png
index af25cff94e..af25cff94e 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif
index 07eb93b191..07eb93b191 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png
index 1c8ffbf46e..1c8ffbf46e 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif
index 1763b1f3a5..1763b1f3a5 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png
index b2f4c2adf8..b2f4c2adf8 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
index ea75b1dce5..ea75b1dce5 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif
index dd47c4cbf8..dd47c4cbf8 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
index 8b8f05faa1..8b8f05faa1 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
index 29e149df9f..29e149df9f 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png
index 23d744e7be..23d744e7be 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
index 2aef535c39..2aef535c39 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
index c18a341b42..c18a341b42 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
index f15c7d7d76..f15c7d7d76 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
index b33fc74ea6..b33fc74ea6 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png
index 31833164d8..31833164d8 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
index b4bd7e9f4f..b4bd7e9f4f 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
index 09ed5ceb94..09ed5ceb94 100644
--- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index 52228b900d..52228b900d 100644
--- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
diff --git a/examples/quickcontrols2/contactlist/CMakeLists.txt b/examples/quickcontrols/contactlist/CMakeLists.txt
index ac7eccd9a7..ac7eccd9a7 100644
--- a/examples/quickcontrols2/contactlist/CMakeLists.txt
+++ b/examples/quickcontrols/contactlist/CMakeLists.txt
diff --git a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml b/examples/quickcontrols/contactlist/ContactDelegate.ui.qml
index 3591b2f3fd..3591b2f3fd 100644
--- a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml
+++ b/examples/quickcontrols/contactlist/ContactDelegate.ui.qml
diff --git a/examples/quickcontrols2/contactlist/ContactDialog.qml b/examples/quickcontrols/contactlist/ContactDialog.qml
index 9bb990f2ad..9bb990f2ad 100644
--- a/examples/quickcontrols2/contactlist/ContactDialog.qml
+++ b/examples/quickcontrols/contactlist/ContactDialog.qml
diff --git a/examples/quickcontrols2/contactlist/ContactForm.ui.qml b/examples/quickcontrols/contactlist/ContactForm.ui.qml
index 918da57f30..918da57f30 100644
--- a/examples/quickcontrols2/contactlist/ContactForm.ui.qml
+++ b/examples/quickcontrols/contactlist/ContactForm.ui.qml
diff --git a/examples/quickcontrols2/contactlist/ContactView.ui.qml b/examples/quickcontrols/contactlist/ContactView.ui.qml
index 6e80d05bac..6e80d05bac 100644
--- a/examples/quickcontrols2/contactlist/ContactView.ui.qml
+++ b/examples/quickcontrols/contactlist/ContactView.ui.qml
diff --git a/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml b/examples/quickcontrols/contactlist/SectionDelegate.ui.qml
index 05b2147288..05b2147288 100644
--- a/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml
+++ b/examples/quickcontrols/contactlist/SectionDelegate.ui.qml
diff --git a/examples/quickcontrols2/contactlist/contactlist.pro b/examples/quickcontrols/contactlist/contactlist.pro
index 101db15a3d..101db15a3d 100644
--- a/examples/quickcontrols2/contactlist/contactlist.pro
+++ b/examples/quickcontrols/contactlist/contactlist.pro
diff --git a/examples/quickcontrols2/contactlist/contactlist.qml b/examples/quickcontrols/contactlist/contactlist.qml
index 28f887f2db..28f887f2db 100644
--- a/examples/quickcontrols2/contactlist/contactlist.qml
+++ b/examples/quickcontrols/contactlist/contactlist.qml
diff --git a/examples/quickcontrols2/contactlist/contactmodel.cpp b/examples/quickcontrols/contactlist/contactmodel.cpp
index 1add2e7776..1add2e7776 100644
--- a/examples/quickcontrols2/contactlist/contactmodel.cpp
+++ b/examples/quickcontrols/contactlist/contactmodel.cpp
diff --git a/examples/quickcontrols2/contactlist/contactmodel.h b/examples/quickcontrols/contactlist/contactmodel.h
index 564ec0fab3..564ec0fab3 100644
--- a/examples/quickcontrols2/contactlist/contactmodel.h
+++ b/examples/quickcontrols/contactlist/contactmodel.h
diff --git a/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml b/examples/quickcontrols/contactlist/designer/Backend/ContactModel.qml
index c7a3f4817b..c7a3f4817b 100644
--- a/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml
+++ b/examples/quickcontrols/contactlist/designer/Backend/ContactModel.qml
diff --git a/examples/quickcontrols2/contactlist/designer/Backend/qmldir b/examples/quickcontrols/contactlist/designer/Backend/qmldir
index 8e2037d4d7..8e2037d4d7 100644
--- a/examples/quickcontrols2/contactlist/designer/Backend/qmldir
+++ b/examples/quickcontrols/contactlist/designer/Backend/qmldir
diff --git a/examples/quickcontrols2/contactlist/doc/images/qtquickcontrols2-contactlist.png b/examples/quickcontrols/contactlist/doc/images/qtquickcontrols2-contactlist.png
index 9f1c306544..9f1c306544 100644
--- a/examples/quickcontrols2/contactlist/doc/images/qtquickcontrols2-contactlist.png
+++ b/examples/quickcontrols/contactlist/doc/images/qtquickcontrols2-contactlist.png
diff --git a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc b/examples/quickcontrols/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
index 3f88d9dc74..3f88d9dc74 100644
--- a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
+++ b/examples/quickcontrols/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
diff --git a/examples/quickcontrols2/contactlist/main.cpp b/examples/quickcontrols/contactlist/main.cpp
index 32a88def4c..32a88def4c 100644
--- a/examples/quickcontrols2/contactlist/main.cpp
+++ b/examples/quickcontrols/contactlist/main.cpp
diff --git a/examples/quickcontrols2/eventcalendar/CMakeLists.txt b/examples/quickcontrols/eventcalendar/CMakeLists.txt
index 6c44eb82ec..6c44eb82ec 100644
--- a/examples/quickcontrols2/eventcalendar/CMakeLists.txt
+++ b/examples/quickcontrols/eventcalendar/CMakeLists.txt
diff --git a/examples/quickcontrols2/eventcalendar/MonthGridDelegate.qml b/examples/quickcontrols/eventcalendar/MonthGridDelegate.qml
index c49dfda1ae..c49dfda1ae 100644
--- a/examples/quickcontrols2/eventcalendar/MonthGridDelegate.qml
+++ b/examples/quickcontrols/eventcalendar/MonthGridDelegate.qml
diff --git a/examples/quickcontrols2/eventcalendar/doc/images/qtquickcalendar-eventcalendar.png b/examples/quickcontrols/eventcalendar/doc/images/qtquickcalendar-eventcalendar.png
index 35d905be6d..35d905be6d 100644
--- a/examples/quickcontrols2/eventcalendar/doc/images/qtquickcalendar-eventcalendar.png
+++ b/examples/quickcontrols/eventcalendar/doc/images/qtquickcalendar-eventcalendar.png
diff --git a/examples/quickcontrols2/eventcalendar/doc/src/qtquickcontrols2-eventcalendar.qdoc b/examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols2-eventcalendar.qdoc
index cc0b031b51..cc0b031b51 100644
--- a/examples/quickcontrols2/eventcalendar/doc/src/qtquickcontrols2-eventcalendar.qdoc
+++ b/examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols2-eventcalendar.qdoc
diff --git a/examples/quickcontrols2/eventcalendar/event.h b/examples/quickcontrols/eventcalendar/event.h
index b2cc6b45cf..b2cc6b45cf 100644
--- a/examples/quickcontrols2/eventcalendar/event.h
+++ b/examples/quickcontrols/eventcalendar/event.h
diff --git a/examples/quickcontrols2/eventcalendar/eventcalendar.cpp b/examples/quickcontrols/eventcalendar/eventcalendar.cpp
index bc952a3f9a..bc952a3f9a 100644
--- a/examples/quickcontrols2/eventcalendar/eventcalendar.cpp
+++ b/examples/quickcontrols/eventcalendar/eventcalendar.cpp
diff --git a/examples/quickcontrols2/eventcalendar/eventcalendar.pro b/examples/quickcontrols/eventcalendar/eventcalendar.pro
index 742c5d09e8..742c5d09e8 100644
--- a/examples/quickcontrols2/eventcalendar/eventcalendar.pro
+++ b/examples/quickcontrols/eventcalendar/eventcalendar.pro
diff --git a/examples/quickcontrols2/eventcalendar/eventcalendar.qml b/examples/quickcontrols/eventcalendar/eventcalendar.qml
index 65d85d8d4e..65d85d8d4e 100644
--- a/examples/quickcontrols2/eventcalendar/eventcalendar.qml
+++ b/examples/quickcontrols/eventcalendar/eventcalendar.qml
diff --git a/examples/quickcontrols2/eventcalendar/eventmodel.cpp b/examples/quickcontrols/eventcalendar/eventmodel.cpp
index a380e00d11..a380e00d11 100644
--- a/examples/quickcontrols2/eventcalendar/eventmodel.cpp
+++ b/examples/quickcontrols/eventcalendar/eventmodel.cpp
diff --git a/examples/quickcontrols2/eventcalendar/eventmodel.h b/examples/quickcontrols/eventcalendar/eventmodel.h
index 3dc391fdd7..3dc391fdd7 100644
--- a/examples/quickcontrols2/eventcalendar/eventmodel.h
+++ b/examples/quickcontrols/eventcalendar/eventmodel.h
diff --git a/examples/quickcontrols2/eventcalendar/qmldir b/examples/quickcontrols/eventcalendar/qmldir
index 6b7f86bfac..6b7f86bfac 100644
--- a/examples/quickcontrols2/eventcalendar/qmldir
+++ b/examples/quickcontrols/eventcalendar/qmldir
diff --git a/examples/quickcontrols2/eventcalendar/qtquickcontrols2.conf b/examples/quickcontrols/eventcalendar/qtquickcontrols2.conf
index b6c7c87ea1..b6c7c87ea1 100644
--- a/examples/quickcontrols2/eventcalendar/qtquickcontrols2.conf
+++ b/examples/quickcontrols/eventcalendar/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/eventcalendar/sqleventdatabase.cpp b/examples/quickcontrols/eventcalendar/sqleventdatabase.cpp
index e958448695..e958448695 100644
--- a/examples/quickcontrols2/eventcalendar/sqleventdatabase.cpp
+++ b/examples/quickcontrols/eventcalendar/sqleventdatabase.cpp
diff --git a/examples/quickcontrols2/eventcalendar/sqleventdatabase.h b/examples/quickcontrols/eventcalendar/sqleventdatabase.h
index aa59bfb6b1..aa59bfb6b1 100644
--- a/examples/quickcontrols2/eventcalendar/sqleventdatabase.h
+++ b/examples/quickcontrols/eventcalendar/sqleventdatabase.h
diff --git a/examples/quickcontrols2/flatstyle/CMakeLists.txt b/examples/quickcontrols/flatstyle/CMakeLists.txt
index 7ddb17c99b..7ddb17c99b 100644
--- a/examples/quickcontrols2/flatstyle/CMakeLists.txt
+++ b/examples/quickcontrols/flatstyle/CMakeLists.txt
diff --git a/examples/quickcontrols2/flatstyle/MainForm.ui.qml b/examples/quickcontrols/flatstyle/MainForm.ui.qml
index 389ee893c3..389ee893c3 100644
--- a/examples/quickcontrols2/flatstyle/MainForm.ui.qml
+++ b/examples/quickcontrols/flatstyle/MainForm.ui.qml
diff --git a/examples/quickcontrols2/flatstyle/doc/images/qtquickcontrols2-flatstyle-creator.png b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle-creator.png
index d77a7ffc4b..d77a7ffc4b 100644
--- a/examples/quickcontrols2/flatstyle/doc/images/qtquickcontrols2-flatstyle-creator.png
+++ b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle-creator.png
diff --git a/examples/quickcontrols2/flatstyle/doc/images/qtquickcontrols2-flatstyle.png b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle.png
index a43b4c39fa..a43b4c39fa 100644
--- a/examples/quickcontrols2/flatstyle/doc/images/qtquickcontrols2-flatstyle.png
+++ b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle.png
diff --git a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
index b077ef71c6..b077ef71c6 100644
--- a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
+++ b/examples/quickcontrols/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
diff --git a/examples/quickcontrols2/flatstyle/flatstyle.pro b/examples/quickcontrols/flatstyle/flatstyle.pro
index c430a30af4..c430a30af4 100644
--- a/examples/quickcontrols2/flatstyle/flatstyle.pro
+++ b/examples/quickcontrols/flatstyle/flatstyle.pro
diff --git a/examples/quickcontrols2/flatstyle/flatstyle.qml b/examples/quickcontrols/flatstyle/flatstyle.qml
index 17b868ba5e..17b868ba5e 100644
--- a/examples/quickcontrols2/flatstyle/flatstyle.qml
+++ b/examples/quickcontrols/flatstyle/flatstyle.qml
diff --git a/examples/quickcontrols2/flatstyle/flatstyle.qmlproject b/examples/quickcontrols/flatstyle/flatstyle.qmlproject
index 80b42820ad..80b42820ad 100644
--- a/examples/quickcontrols2/flatstyle/flatstyle.qmlproject
+++ b/examples/quickcontrols/flatstyle/flatstyle.qmlproject
diff --git a/examples/quickcontrols2/flatstyle/imports/Flat/Button.qml b/examples/quickcontrols/flatstyle/imports/Flat/Button.qml
index ec8b904a4c..ec8b904a4c 100644
--- a/examples/quickcontrols2/flatstyle/imports/Flat/Button.qml
+++ b/examples/quickcontrols/flatstyle/imports/Flat/Button.qml
diff --git a/examples/quickcontrols2/flatstyle/imports/Flat/CheckBox.qml b/examples/quickcontrols/flatstyle/imports/Flat/CheckBox.qml
index ef6a4307a4..ef6a4307a4 100644
--- a/examples/quickcontrols2/flatstyle/imports/Flat/CheckBox.qml
+++ b/examples/quickcontrols/flatstyle/imports/Flat/CheckBox.qml
diff --git a/examples/quickcontrols2/flatstyle/imports/Flat/Switch.qml b/examples/quickcontrols/flatstyle/imports/Flat/Switch.qml
index 25f1a7d49b..25f1a7d49b 100644
--- a/examples/quickcontrols2/flatstyle/imports/Flat/Switch.qml
+++ b/examples/quickcontrols/flatstyle/imports/Flat/Switch.qml
diff --git a/examples/quickcontrols2/flatstyle/imports/Flat/qmldir b/examples/quickcontrols/flatstyle/imports/Flat/qmldir
index 451a865969..451a865969 100644
--- a/examples/quickcontrols2/flatstyle/imports/Flat/qmldir
+++ b/examples/quickcontrols/flatstyle/imports/Flat/qmldir
diff --git a/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml b/examples/quickcontrols/flatstyle/imports/Theme/Theme.qml
index f4d5156989..f4d5156989 100644
--- a/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml
+++ b/examples/quickcontrols/flatstyle/imports/Theme/Theme.qml
diff --git a/examples/quickcontrols2/flatstyle/imports/Theme/qmldir b/examples/quickcontrols/flatstyle/imports/Theme/qmldir
index 4a58c13a90..4a58c13a90 100644
--- a/examples/quickcontrols2/flatstyle/imports/Theme/qmldir
+++ b/examples/quickcontrols/flatstyle/imports/Theme/qmldir
diff --git a/examples/quickcontrols2/flatstyle/main.cpp b/examples/quickcontrols/flatstyle/main.cpp
index 4aadd92015..4aadd92015 100644
--- a/examples/quickcontrols2/flatstyle/main.cpp
+++ b/examples/quickcontrols/flatstyle/main.cpp
diff --git a/examples/quickcontrols2/flatstyle/qtquickcontrols2.conf b/examples/quickcontrols/flatstyle/qtquickcontrols2.conf
index 9cd59e5aa0..9cd59e5aa0 100644
--- a/examples/quickcontrols2/flatstyle/qtquickcontrols2.conf
+++ b/examples/quickcontrols/flatstyle/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/gallery/+Material/ToolBar.qml b/examples/quickcontrols/gallery/+Material/ToolBar.qml
index f7ecbf116e..f7ecbf116e 100644
--- a/examples/quickcontrols2/gallery/+Material/ToolBar.qml
+++ b/examples/quickcontrols/gallery/+Material/ToolBar.qml
diff --git a/examples/quickcontrols2/gallery/CMakeLists.txt b/examples/quickcontrols/gallery/CMakeLists.txt
index d2858c8c59..d2858c8c59 100644
--- a/examples/quickcontrols2/gallery/CMakeLists.txt
+++ b/examples/quickcontrols/gallery/CMakeLists.txt
diff --git a/examples/quickcontrols2/gallery/ToolBar.qml b/examples/quickcontrols/gallery/ToolBar.qml
index ffbf422a76..ffbf422a76 100644
--- a/examples/quickcontrols2/gallery/ToolBar.qml
+++ b/examples/quickcontrols/gallery/ToolBar.qml
diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png b/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
index 0df43fbc4b..0df43fbc4b 100644
--- a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
+++ b/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png b/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-menu.png
index 3bdaae942a..3bdaae942a 100644
--- a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png
+++ b/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-menu.png
diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png b/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
index ded30381d2..ded30381d2 100644
--- a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
+++ b/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
diff --git a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc b/examples/quickcontrols/gallery/doc/src/qtquickcontrols2-gallery.qdoc
index 814768fe61..814768fe61 100644
--- a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
+++ b/examples/quickcontrols/gallery/doc/src/qtquickcontrols2-gallery.qdoc
diff --git a/examples/quickcontrols2/gallery/gallery.cpp b/examples/quickcontrols/gallery/gallery.cpp
index 0242f93b9f..0242f93b9f 100644
--- a/examples/quickcontrols2/gallery/gallery.cpp
+++ b/examples/quickcontrols/gallery/gallery.cpp
diff --git a/examples/quickcontrols2/gallery/gallery.pro b/examples/quickcontrols/gallery/gallery.pro
index e1ac462a7c..e1ac462a7c 100644
--- a/examples/quickcontrols2/gallery/gallery.pro
+++ b/examples/quickcontrols/gallery/gallery.pro
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols/gallery/gallery.qml
index 35eaed9f11..35eaed9f11 100644
--- a/examples/quickcontrols2/gallery/gallery.qml
+++ b/examples/quickcontrols/gallery/gallery.qml
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20/back.png b/examples/quickcontrols/gallery/icons/gallery/20x20/back.png
index 1f89ee058c..1f89ee058c 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20/back.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20/back.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20/drawer.png b/examples/quickcontrols/gallery/icons/gallery/20x20/drawer.png
index 1e974efae8..1e974efae8 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20/drawer.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20/drawer.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20/menu.png b/examples/quickcontrols/gallery/icons/gallery/20x20/menu.png
index a10473d9e1..a10473d9e1 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20/menu.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20/menu.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20@2/back.png b/examples/quickcontrols/gallery/icons/gallery/20x20@2/back.png
index 88e290b132..88e290b132 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20@2/back.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20@2/back.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20@2/drawer.png b/examples/quickcontrols/gallery/icons/gallery/20x20@2/drawer.png
index eba3b6cccf..eba3b6cccf 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20@2/drawer.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20@2/drawer.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20@2/menu.png b/examples/quickcontrols/gallery/icons/gallery/20x20@2/menu.png
index 649c2a08c6..649c2a08c6 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20@2/menu.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20@2/menu.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20@3/back.png b/examples/quickcontrols/gallery/icons/gallery/20x20@3/back.png
index 4402c7d30b..4402c7d30b 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20@3/back.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20@3/back.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20@3/drawer.png b/examples/quickcontrols/gallery/icons/gallery/20x20@3/drawer.png
index 3584ed6d8b..3584ed6d8b 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20@3/drawer.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20@3/drawer.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20@3/menu.png b/examples/quickcontrols/gallery/icons/gallery/20x20@3/menu.png
index 9554b6952b..9554b6952b 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20@3/menu.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20@3/menu.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20@4/back.png b/examples/quickcontrols/gallery/icons/gallery/20x20@4/back.png
index 9982478c18..9982478c18 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20@4/back.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20@4/back.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20@4/drawer.png b/examples/quickcontrols/gallery/icons/gallery/20x20@4/drawer.png
index 60d93aff7b..60d93aff7b 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20@4/drawer.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20@4/drawer.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/20x20@4/menu.png b/examples/quickcontrols/gallery/icons/gallery/20x20@4/menu.png
index 187c171cde..187c171cde 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/20x20@4/menu.png
+++ b/examples/quickcontrols/gallery/icons/gallery/20x20@4/menu.png
diff --git a/examples/quickcontrols2/gallery/icons/gallery/index.theme b/examples/quickcontrols/gallery/icons/gallery/index.theme
index a1bcd5e03c..a1bcd5e03c 100644
--- a/examples/quickcontrols2/gallery/icons/gallery/index.theme
+++ b/examples/quickcontrols/gallery/icons/gallery/index.theme
diff --git a/examples/quickcontrols2/gallery/images/arrow.png b/examples/quickcontrols/gallery/images/arrow.png
index 9835108eb9..9835108eb9 100644
--- a/examples/quickcontrols2/gallery/images/arrow.png
+++ b/examples/quickcontrols/gallery/images/arrow.png
diff --git a/examples/quickcontrols2/gallery/images/arrow@2x.png b/examples/quickcontrols/gallery/images/arrow@2x.png
index a5187d48cf..a5187d48cf 100644
--- a/examples/quickcontrols2/gallery/images/arrow@2x.png
+++ b/examples/quickcontrols/gallery/images/arrow@2x.png
diff --git a/examples/quickcontrols2/gallery/images/arrow@3x.png b/examples/quickcontrols/gallery/images/arrow@3x.png
index a512f648c8..a512f648c8 100644
--- a/examples/quickcontrols2/gallery/images/arrow@3x.png
+++ b/examples/quickcontrols/gallery/images/arrow@3x.png
diff --git a/examples/quickcontrols2/gallery/images/arrow@4x.png b/examples/quickcontrols/gallery/images/arrow@4x.png
index fd893ebb0d..fd893ebb0d 100644
--- a/examples/quickcontrols2/gallery/images/arrow@4x.png
+++ b/examples/quickcontrols/gallery/images/arrow@4x.png
diff --git a/examples/quickcontrols2/gallery/images/arrows.png b/examples/quickcontrols/gallery/images/arrows.png
index 3a4cc9b95f..3a4cc9b95f 100644
--- a/examples/quickcontrols2/gallery/images/arrows.png
+++ b/examples/quickcontrols/gallery/images/arrows.png
diff --git a/examples/quickcontrols2/gallery/images/arrows@2x.png b/examples/quickcontrols/gallery/images/arrows@2x.png
index 8c80a2b45b..8c80a2b45b 100644
--- a/examples/quickcontrols2/gallery/images/arrows@2x.png
+++ b/examples/quickcontrols/gallery/images/arrows@2x.png
diff --git a/examples/quickcontrols2/gallery/images/arrows@3x.png b/examples/quickcontrols/gallery/images/arrows@3x.png
index 22f23cefb9..22f23cefb9 100644
--- a/examples/quickcontrols2/gallery/images/arrows@3x.png
+++ b/examples/quickcontrols/gallery/images/arrows@3x.png
diff --git a/examples/quickcontrols2/gallery/images/arrows@4x.png b/examples/quickcontrols/gallery/images/arrows@4x.png
index 6d1afeef5c..6d1afeef5c 100644
--- a/examples/quickcontrols2/gallery/images/arrows@4x.png
+++ b/examples/quickcontrols/gallery/images/arrows@4x.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo.png b/examples/quickcontrols/gallery/images/qt-logo.png
index dff7729515..dff7729515 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo.png
+++ b/examples/quickcontrols/gallery/images/qt-logo.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo@2x.png b/examples/quickcontrols/gallery/images/qt-logo@2x.png
index dbd73aab77..dbd73aab77 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo@2x.png
+++ b/examples/quickcontrols/gallery/images/qt-logo@2x.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo@3x.png b/examples/quickcontrols/gallery/images/qt-logo@3x.png
index 68e763b597..68e763b597 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo@3x.png
+++ b/examples/quickcontrols/gallery/images/qt-logo@3x.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo@4x.png b/examples/quickcontrols/gallery/images/qt-logo@4x.png
index 08fd882572..08fd882572 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo@4x.png
+++ b/examples/quickcontrols/gallery/images/qt-logo@4x.png
diff --git a/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml b/examples/quickcontrols/gallery/pages/BusyIndicatorPage.qml
index 616e645688..616e645688 100644
--- a/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
+++ b/examples/quickcontrols/gallery/pages/BusyIndicatorPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/ButtonPage.qml b/examples/quickcontrols/gallery/pages/ButtonPage.qml
index 06051767e9..06051767e9 100644
--- a/examples/quickcontrols2/gallery/pages/ButtonPage.qml
+++ b/examples/quickcontrols/gallery/pages/ButtonPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml b/examples/quickcontrols/gallery/pages/CheckBoxPage.qml
index 003e44c82c..003e44c82c 100644
--- a/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
+++ b/examples/quickcontrols/gallery/pages/CheckBoxPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml b/examples/quickcontrols/gallery/pages/ComboBoxPage.qml
index 35c3d60d16..35c3d60d16 100644
--- a/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
+++ b/examples/quickcontrols/gallery/pages/ComboBoxPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml b/examples/quickcontrols/gallery/pages/DelayButtonPage.qml
index 4c0e8725b9..4c0e8725b9 100644
--- a/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml
+++ b/examples/quickcontrols/gallery/pages/DelayButtonPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/DelegatePage.qml b/examples/quickcontrols/gallery/pages/DelegatePage.qml
index c57388cc6a..c57388cc6a 100644
--- a/examples/quickcontrols2/gallery/pages/DelegatePage.qml
+++ b/examples/quickcontrols/gallery/pages/DelegatePage.qml
diff --git a/examples/quickcontrols2/gallery/pages/DialPage.qml b/examples/quickcontrols/gallery/pages/DialPage.qml
index 17c9e090ba..17c9e090ba 100644
--- a/examples/quickcontrols2/gallery/pages/DialPage.qml
+++ b/examples/quickcontrols/gallery/pages/DialPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/DialogPage.qml b/examples/quickcontrols/gallery/pages/DialogPage.qml
index 982a7f38d4..982a7f38d4 100644
--- a/examples/quickcontrols2/gallery/pages/DialogPage.qml
+++ b/examples/quickcontrols/gallery/pages/DialogPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/FramePage.qml b/examples/quickcontrols/gallery/pages/FramePage.qml
index 8526442537..8526442537 100644
--- a/examples/quickcontrols2/gallery/pages/FramePage.qml
+++ b/examples/quickcontrols/gallery/pages/FramePage.qml
diff --git a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml b/examples/quickcontrols/gallery/pages/GroupBoxPage.qml
index 9e24d8e6ca..9e24d8e6ca 100644
--- a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
+++ b/examples/quickcontrols/gallery/pages/GroupBoxPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml b/examples/quickcontrols/gallery/pages/PageIndicatorPage.qml
index e83c86563e..e83c86563e 100644
--- a/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
+++ b/examples/quickcontrols/gallery/pages/PageIndicatorPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml b/examples/quickcontrols/gallery/pages/ProgressBarPage.qml
index d712aae10c..d712aae10c 100644
--- a/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
+++ b/examples/quickcontrols/gallery/pages/ProgressBarPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml b/examples/quickcontrols/gallery/pages/RadioButtonPage.qml
index 644543c007..644543c007 100644
--- a/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
+++ b/examples/quickcontrols/gallery/pages/RadioButtonPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml b/examples/quickcontrols/gallery/pages/RangeSliderPage.qml
index 0ca235822f..0ca235822f 100644
--- a/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
+++ b/examples/quickcontrols/gallery/pages/RangeSliderPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml b/examples/quickcontrols/gallery/pages/ScrollBarPage.qml
index 248e74ca7f..248e74ca7f 100644
--- a/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
+++ b/examples/quickcontrols/gallery/pages/ScrollBarPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml b/examples/quickcontrols/gallery/pages/ScrollIndicatorPage.qml
index 04ce97483a..04ce97483a 100644
--- a/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
+++ b/examples/quickcontrols/gallery/pages/ScrollIndicatorPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/ScrollablePage.qml b/examples/quickcontrols/gallery/pages/ScrollablePage.qml
index 69bc0cd973..69bc0cd973 100644
--- a/examples/quickcontrols2/gallery/pages/ScrollablePage.qml
+++ b/examples/quickcontrols/gallery/pages/ScrollablePage.qml
diff --git a/examples/quickcontrols2/gallery/pages/SliderPage.qml b/examples/quickcontrols/gallery/pages/SliderPage.qml
index fd03680a0e..fd03680a0e 100644
--- a/examples/quickcontrols2/gallery/pages/SliderPage.qml
+++ b/examples/quickcontrols/gallery/pages/SliderPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml b/examples/quickcontrols/gallery/pages/SpinBoxPage.qml
index 18c9b06c1f..18c9b06c1f 100644
--- a/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
+++ b/examples/quickcontrols/gallery/pages/SpinBoxPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/StackViewPage.qml b/examples/quickcontrols/gallery/pages/StackViewPage.qml
index 4472150e56..4472150e56 100644
--- a/examples/quickcontrols2/gallery/pages/StackViewPage.qml
+++ b/examples/quickcontrols/gallery/pages/StackViewPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml b/examples/quickcontrols/gallery/pages/SwipeViewPage.qml
index f982f4cf26..f982f4cf26 100644
--- a/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
+++ b/examples/quickcontrols/gallery/pages/SwipeViewPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/SwitchPage.qml b/examples/quickcontrols/gallery/pages/SwitchPage.qml
index cca200582e..cca200582e 100644
--- a/examples/quickcontrols2/gallery/pages/SwitchPage.qml
+++ b/examples/quickcontrols/gallery/pages/SwitchPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/TabBarPage.qml b/examples/quickcontrols/gallery/pages/TabBarPage.qml
index c03e4a014c..c03e4a014c 100644
--- a/examples/quickcontrols2/gallery/pages/TabBarPage.qml
+++ b/examples/quickcontrols/gallery/pages/TabBarPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/TextAreaPage.qml b/examples/quickcontrols/gallery/pages/TextAreaPage.qml
index 6a09846973..6a09846973 100644
--- a/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
+++ b/examples/quickcontrols/gallery/pages/TextAreaPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/TextFieldPage.qml b/examples/quickcontrols/gallery/pages/TextFieldPage.qml
index 2b06894c8f..2b06894c8f 100644
--- a/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
+++ b/examples/quickcontrols/gallery/pages/TextFieldPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/ToolTipPage.qml b/examples/quickcontrols/gallery/pages/ToolTipPage.qml
index dd92c89b4f..dd92c89b4f 100644
--- a/examples/quickcontrols2/gallery/pages/ToolTipPage.qml
+++ b/examples/quickcontrols/gallery/pages/ToolTipPage.qml
diff --git a/examples/quickcontrols2/gallery/pages/TumblerPage.qml b/examples/quickcontrols/gallery/pages/TumblerPage.qml
index 4d01f02e89..4d01f02e89 100644
--- a/examples/quickcontrols2/gallery/pages/TumblerPage.qml
+++ b/examples/quickcontrols/gallery/pages/TumblerPage.qml
diff --git a/examples/quickcontrols2/gallery/qmldir b/examples/quickcontrols/gallery/qmldir
index 6b7f86bfac..6b7f86bfac 100644
--- a/examples/quickcontrols2/gallery/qmldir
+++ b/examples/quickcontrols/gallery/qmldir
diff --git a/examples/quickcontrols2/gallery/qtquickcontrols2.conf b/examples/quickcontrols/gallery/qtquickcontrols2.conf
index da1a8f41d2..da1a8f41d2 100644
--- a/examples/quickcontrols2/gallery/qtquickcontrols2.conf
+++ b/examples/quickcontrols/gallery/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/imagine/automotive/CMakeLists.txt b/examples/quickcontrols/imagine/automotive/CMakeLists.txt
index 2f213f8e79..2f213f8e79 100644
--- a/examples/quickcontrols2/imagine/automotive/CMakeLists.txt
+++ b/examples/quickcontrols/imagine/automotive/CMakeLists.txt
diff --git a/examples/quickcontrols2/imagine/automotive/automotive.cpp b/examples/quickcontrols/imagine/automotive/automotive.cpp
index e64780f2b1..e64780f2b1 100644
--- a/examples/quickcontrols2/imagine/automotive/automotive.cpp
+++ b/examples/quickcontrols/imagine/automotive/automotive.cpp
diff --git a/examples/quickcontrols2/imagine/automotive/automotive.pro b/examples/quickcontrols/imagine/automotive/automotive.pro
index 890e63d84b..890e63d84b 100644
--- a/examples/quickcontrols2/imagine/automotive/automotive.pro
+++ b/examples/quickcontrols/imagine/automotive/automotive.pro
diff --git a/examples/quickcontrols2/imagine/automotive/doc/images/qtquickcontrols2-automotive.png b/examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols2-automotive.png
index 93ea28545b..93ea28545b 100644
--- a/examples/quickcontrols2/imagine/automotive/doc/images/qtquickcontrols2-automotive.png
+++ b/examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols2-automotive.png
diff --git a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc b/examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc
index 6e228efd8e..6e228efd8e 100644
--- a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc
+++ b/examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/air-con.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/air-con.png
index 70175f6f05..70175f6f05 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/air-con.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/air-con.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/command.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/command.png
index 8f712c7881..8f712c7881 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/command.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/command.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/message.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/message.png
index 7773ca63ba..7773ca63ba 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/message.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/message.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/music.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/music.png
index dc73322bfe..dc73322bfe 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/music.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/music.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/seats.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/seats.png
index 2f9eaa6227..2f9eaa6227 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/seats.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/seats.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/settings.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/settings.png
index b65598b58c..b65598b58c 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/settings.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/settings.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/statistics.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/statistics.png
index 979702989b..979702989b 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/statistics.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/statistics.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/windows.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/windows.png
index 8ed8cec4bf..8ed8cec4bf 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/windows.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44/windows.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/air-con.png
index 8822979e6a..8822979e6a 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/air-con.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/command.png
index 918e2b69eb..918e2b69eb 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/command.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/message.png
index 1debfdfb26..1debfdfb26 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/message.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/music.png
index 01a3ece417..01a3ece417 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/music.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/navigation.png
index 3a18fb5f4e..3a18fb5f4e 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/navigation.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/seats.png
index 7d67f1be3f..7d67f1be3f 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/seats.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/settings.png
index 3ce2a1f1b4..3ce2a1f1b4 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/settings.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/statistics.png
index afc2cc0906..afc2cc0906 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/statistics.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/windows.png
index 59bac584ed..59bac584ed 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/44x44@2/windows.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/icons.svg b/examples/quickcontrols/imagine/automotive/icons/automotive/icons.svg
index daf4633c25..daf4633c25 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/icons.svg
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/icons.svg
diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/index.theme b/examples/quickcontrols/imagine/automotive/icons/automotive/index.theme
index cd84146e95..cd84146e95 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/automotive/index.theme
+++ b/examples/quickcontrols/imagine/automotive/icons/automotive/index.theme
diff --git a/examples/quickcontrols2/imagine/automotive/icons/car.png b/examples/quickcontrols/imagine/automotive/icons/car.png
index 4bfc9a474a..4bfc9a474a 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/car.png
+++ b/examples/quickcontrols/imagine/automotive/icons/car.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/car@2x.png b/examples/quickcontrols/imagine/automotive/icons/car@2x.png
index 966bc47bc7..966bc47bc7 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/car@2x.png
+++ b/examples/quickcontrols/imagine/automotive/icons/car@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/icons.qrc b/examples/quickcontrols/imagine/automotive/icons/icons.qrc
index 5cb797817b..5cb797817b 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/icons.qrc
+++ b/examples/quickcontrols/imagine/automotive/icons/icons.qrc
diff --git a/examples/quickcontrols2/imagine/automotive/icons/warning.png b/examples/quickcontrols/imagine/automotive/icons/warning.png
index 590a61eb80..590a61eb80 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/warning.png
+++ b/examples/quickcontrols/imagine/automotive/icons/warning.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/warning@2x.png b/examples/quickcontrols/imagine/automotive/icons/warning@2x.png
index 487fbafcfd..487fbafcfd 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/warning@2x.png
+++ b/examples/quickcontrols/imagine/automotive/icons/warning@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/weather.png b/examples/quickcontrols/imagine/automotive/icons/weather.png
index b1479de27a..b1479de27a 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/weather.png
+++ b/examples/quickcontrols/imagine/automotive/icons/weather.png
diff --git a/examples/quickcontrols2/imagine/automotive/icons/weather@2x.png b/examples/quickcontrols/imagine/automotive/icons/weather@2x.png
index 8b4333ab15..8b4333ab15 100644
--- a/examples/quickcontrols2/imagine/automotive/icons/weather@2x.png
+++ b/examples/quickcontrols/imagine/automotive/icons/weather@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background.png b/examples/quickcontrols/imagine/automotive/imagine-assets/applicationwindow-background.png
index aac403dbb1..aac403dbb1 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/applicationwindow-background.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/applicationwindow-background@2x.png
index a8ef3dd456..a8ef3dd456 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/applicationwindow-background@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-checked-hovered.9.png
index f92dd66afe..f92dd66afe 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-checked-hovered.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-checked-hovered@2x.9.png
index b64640e2b1..b64640e2b1 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-checked-hovered@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-checked.9.png
index 5a70d1d302..5a70d1d302 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-checked.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-checked@2x.9.png
index 9d080dc823..9d080dc823 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-checked@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-hovered.9.png
index 94e37b8334..94e37b8334 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-hovered.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-hovered@2x.9.png
index 905d9e4705..905d9e4705 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-hovered@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-pressed.9.png
index bc4c3b3880..bc4c3b3880 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-pressed.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-pressed@2x.9.png
index 778fe53752..778fe53752 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background-pressed@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background.9.png
index 85ed1a03ba..85ed1a03ba 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background@2x.9.png
index 1eb7ebed20..1eb7ebed20 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/button-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered.png b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background-hovered.png
index 26add20cfc..26add20cfc 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background-hovered.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background-hovered@2x.png
index 01d8136d51..01d8136d51 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed.png b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background-pressed.png
index 435acd1466..435acd1466 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background-pressed.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background-pressed@2x.png
index 9bab57904d..9bab57904d 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background.png b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background.png
index 8aab4d3280..8aab4d3280 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background@2x.png
index a856971185..a856971185 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-background@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed.png b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-handle-pressed.png
index 93992626ce..93992626ce 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-handle-pressed.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-handle-pressed@2x.png
index 5c563abba5..5c563abba5 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-handle-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle.png b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-handle.png
index a997dd58f8..a997dd58f8 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-handle.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-handle@2x.png
index afd1330704..afd1330704 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/dial-handle@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/frame-background.9.png
index fd7d5453ff..fd7d5453ff 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/frame-background.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/frame-background@2x.9.png
index 83284457e4..83284457e4 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/frame-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/imagine-assets.qrc b/examples/quickcontrols/imagine/automotive/imagine-assets/imagine-assets.qrc
index 81eadda617..81eadda617 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/imagine-assets.qrc
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/imagine-assets.qrc
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-checked.9.png
index 4c6b475441..4c6b475441 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-checked.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-checked@2x.9.png
index 9f4f70575f..9f4f70575f 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-checked@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-hovered.9.png
index a5c189c9e3..a5c189c9e3 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-hovered.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-hovered@2x.9.png
index 2b3c9c6743..2b3c9c6743 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-hovered@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-pressed.9.png
index 56b5534ea6..56b5534ea6 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-pressed.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-pressed@2x.9.png
index bbbbb8b1d8..bbbbb8b1d8 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background-pressed@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background.9.png
index 1fbb562689..1fbb562689 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background@2x.9.png
index 18880980f0..18880980f0 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/itemdelegate-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered.png
index f64c9665b2..f64c9665b2 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered@2x.png
index ace1717a97..ace1717a97 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed.png
index c77ad470c0..c77ad470c0 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed@2x.png
index 2798f77f0f..2798f77f0f 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked.png
index ea714eaaf9..ea714eaaf9 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked@2x.png
index 4f29b80b31..4f29b80b31 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-checked@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-hovered.png
index a7d07ed17c..a7d07ed17c 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-hovered.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-hovered@2x.png
index b0fff06e51..b0fff06e51 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-pressed.png
index 7d657ac9c2..7d657ac9c2 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-pressed.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-pressed@2x.png
index 9a8b9cd829..9a8b9cd829 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator.png
index b59ba0cef8..b59ba0cef8 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator@2x.png
index e4a2b9a2b9..e4a2b9a2b9 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/radiobutton-indicator@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle.png b/examples/quickcontrols/imagine/automotive/imagine-assets/scrollindicator-handle.png
index 99206d7e26..99206d7e26 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/scrollindicator-handle.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/scrollindicator-handle@2x.png
index 85a9ebccf7..85a9ebccf7 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/scrollindicator-handle@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-background-horizontal.9.png
index 3d2406cf06..3d2406cf06 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-background-horizontal.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-background-horizontal@2x.9.png
index 6c8104ff97..6c8104ff97 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-background-horizontal@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle-hovered.png
index bd26d82451..bd26d82451 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle-hovered.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle-hovered@2x.png
index 000db40444..000db40444 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle-pressed.png
index 4a4d0be7f8..4a4d0be7f8 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle-pressed.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle-pressed@2x.png
index 903c102440..903c102440 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle.png
index 8f812dae34..8f812dae34 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle@2x.png
index b30a4f38f0..b30a4f38f0 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-handle@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed.9.png
index 7789f09f2c..7789f09f2c 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed@2x.9.png
index e64c13dc39..e64c13dc39 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-progress-horizontal.9.png
index 8e65ca35c5..8e65ca35c5 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-progress-horizontal.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-progress-horizontal@2x.9.png
index d512e40708..d512e40708 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/slider-progress-horizontal@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-background.9.png
index 1fbb562689..1fbb562689 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-background.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-background@2x.9.png
index 18880980f0..18880980f0 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered.png
index e66ef7137c..e66ef7137c 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered@2x.png
index 05d6f82e7a..05d6f82e7a 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-checked.png
index bcfa06aec6..bcfa06aec6 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-checked.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-checked@2x.png
index b9985f0fe3..b9985f0fe3 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-checked@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-hovered.png
index 3de8aa1512..3de8aa1512 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-hovered.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-hovered@2x.png
index b955159055..b955159055 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-pressed.png
index 547b2c1758..547b2c1758 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-pressed.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-pressed@2x.png
index b4bb748aa4..b4bb748aa4 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle.png
index fd81422a88..fd81422a88 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle@2x.png
index 9a7456aa41..9a7456aa41 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-handle@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed.png
index 6833d624ae..6833d624ae 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed@2x.png
index 3d5498a090..3d5498a090 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-indicator.png
index 3db5fe2042..3db5fe2042 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-indicator.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator@2x.png b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-indicator@2x.png
index b5c10f7497..b5c10f7497 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator@2x.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/switchdelegate-indicator@2x.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/toolseparator-separator-vertical.9.png
index 02c7a564be..02c7a564be 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/toolseparator-separator-vertical.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical@2x.9.png b/examples/quickcontrols/imagine/automotive/imagine-assets/toolseparator-separator-vertical@2x.9.png
index e0390d36f5..e0390d36f5 100644
--- a/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical@2x.9.png
+++ b/examples/quickcontrols/imagine/automotive/imagine-assets/toolseparator-separator-vertical@2x.9.png
diff --git a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml b/examples/quickcontrols/imagine/automotive/qml/FeatureButton.qml
index a9dee571fb..a9dee571fb 100644
--- a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml
+++ b/examples/quickcontrols/imagine/automotive/qml/FeatureButton.qml
diff --git a/examples/quickcontrols2/imagine/automotive/qml/LargeLabel.qml b/examples/quickcontrols/imagine/automotive/qml/LargeLabel.qml
index af03c782ff..af03c782ff 100644
--- a/examples/quickcontrols2/imagine/automotive/qml/LargeLabel.qml
+++ b/examples/quickcontrols/imagine/automotive/qml/LargeLabel.qml
diff --git a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml b/examples/quickcontrols/imagine/automotive/qml/automotive.qml
index 5f7868e760..5f7868e760 100644
--- a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml
+++ b/examples/quickcontrols/imagine/automotive/qml/automotive.qml
diff --git a/examples/quickcontrols2/imagine/automotive/qml/qml.qrc b/examples/quickcontrols/imagine/automotive/qml/qml.qrc
index b0e4e558a8..b0e4e558a8 100644
--- a/examples/quickcontrols2/imagine/automotive/qml/qml.qrc
+++ b/examples/quickcontrols/imagine/automotive/qml/qml.qrc
diff --git a/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf b/examples/quickcontrols/imagine/automotive/qtquickcontrols2.conf
index c7fc7a6169..c7fc7a6169 100644
--- a/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf
+++ b/examples/quickcontrols/imagine/automotive/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt b/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt
index a3f0bf5683..a3f0bf5683 100644
--- a/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt
+++ b/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt
diff --git a/examples/quickcontrols2/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png b/examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png
index 25b6344f3e..25b6344f3e 100644
--- a/examples/quickcontrols2/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png
+++ b/examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc b/examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc
index 742b412c96..742b412c96 100644
--- a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc
+++ b/examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/icons.qrc b/examples/quickcontrols/imagine/musicplayer/icons/icons.qrc
index 870b4445e5..870b4445e5 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/icons.qrc
+++ b/examples/quickcontrols/imagine/musicplayer/icons/icons.qrc
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/bluetooth.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/bluetooth.png
index 925f564c9e..925f564c9e 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/bluetooth.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/bluetooth.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cart.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/cart.png
index 4d5ad09955..4d5ad09955 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cart.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/cart.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cloud.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/cloud.png
index 62ef511833..62ef511833 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cloud.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/cloud.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/favorite.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/favorite.png
index 16ea84deb6..16ea84deb6 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/favorite.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/favorite.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/filter.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/filter.png
index 4472cead58..4472cead58 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/filter.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/filter.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/folder.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/folder.png
index 5dd05778fd..5dd05778fd 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/folder.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/folder.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/message.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/message.png
index 1d93b3c660..1d93b3c660 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/message.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/message.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/music.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/music.png
index 4448921389..4448921389 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/music.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/music.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/next.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/next.png
index ab9164e877..ab9164e877 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/next.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/next.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/pause.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/pause.png
index 9c9ef8fa60..9c9ef8fa60 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/pause.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/pause.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/power.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/power.png
index 8f7d0c778c..8f7d0c778c 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/power.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/power.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/previous.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/previous.png
index 3a0880fdbc..3a0880fdbc 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/previous.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/previous.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/repeat.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/repeat.png
index 7c8e8c1c2d..7c8e8c1c2d 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/repeat.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/repeat.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/save.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/save.png
index c0b2748327..c0b2748327 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/save.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/save.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/settings.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/settings.png
index 7992146a6e..7992146a6e 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/settings.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/settings.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/shuffle.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/shuffle.png
index 885782a219..885782a219 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/shuffle.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/shuffle.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/stop.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/stop.png
index 3e9c332732..3e9c332732 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/stop.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32/stop.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/bluetooth.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/bluetooth.png
index 2e70afc396..2e70afc396 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/bluetooth.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/bluetooth.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cart.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/cart.png
index 5717dd6582..5717dd6582 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cart.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/cart.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cloud.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/cloud.png
index ce5ab9f991..ce5ab9f991 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cloud.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/cloud.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/favorite.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/favorite.png
index ddc9aa45c8..ddc9aa45c8 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/favorite.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/favorite.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/filter.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/filter.png
index 3632c556fe..3632c556fe 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/filter.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/filter.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/folder.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/folder.png
index 49d41e202e..49d41e202e 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/folder.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/folder.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/grid.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/grid.png
index 8a1624e70b..8a1624e70b 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/grid.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/grid.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/message.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/message.png
index 6650f26b6a..6650f26b6a 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/message.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/message.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/music.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/music.png
index 2cb8d49a67..2cb8d49a67 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/music.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/music.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/next.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/next.png
index d7bb4b278e..d7bb4b278e 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/next.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/next.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/pause.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/pause.png
index 8a081d02f3..8a081d02f3 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/pause.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/pause.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/power.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/power.png
index 1201e55b4f..1201e55b4f 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/power.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/power.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/previous.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/previous.png
index 4236afdbbd..4236afdbbd 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/previous.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/previous.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/repeat.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/repeat.png
index c8cb06d84d..c8cb06d84d 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/repeat.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/repeat.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/save.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/save.png
index 448b25e4be..448b25e4be 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/save.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/save.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/settings.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/settings.png
index 12a0cf6b76..12a0cf6b76 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/settings.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/settings.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/shuffle.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/shuffle.png
index 22b901cce9..22b901cce9 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/shuffle.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/shuffle.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/stop.png b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/stop.png
index 0521a943d4..0521a943d4 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/stop.png
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/32x32@2/stop.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/icons.svg b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/icons.svg
index 4cede992c3..4cede992c3 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/icons.svg
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/icons.svg
diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/index.theme b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/index.theme
index 2523293552..2523293552 100644
--- a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/index.theme
+++ b/examples/quickcontrols/imagine/musicplayer/icons/musicplayer/index.theme
diff --git a/examples/quickcontrols2/imagine/musicplayer/images/album-cover.jpg b/examples/quickcontrols/imagine/musicplayer/images/album-cover.jpg
index 48bd6231ba..48bd6231ba 100644
--- a/examples/quickcontrols2/imagine/musicplayer/images/album-cover.jpg
+++ b/examples/quickcontrols/imagine/musicplayer/images/album-cover.jpg
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/applicationwindow-background.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/applicationwindow-background.png
index 036bf74692..036bf74692 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/applicationwindow-background.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/applicationwindow-background.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-checked-hovered.9.png
index c275d3242d..c275d3242d 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-checked-hovered.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-checked-hovered@2x.9.png
index eec285f305..eec285f305 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-checked-hovered@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-checked.9.png
index 2d284a5bc8..2d284a5bc8 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-checked.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-checked@2x.9.png
index fec385f539..fec385f539 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-checked@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-disabled.9.png
index bcad147094..bcad147094 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-disabled.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-disabled@2x.9.png
index 03aba1535c..03aba1535c 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-disabled@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-hovered.9.png
index 962cf6778e..962cf6778e 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-hovered.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-hovered@2x.9.png
index 841c0064e7..841c0064e7 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-hovered@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-pressed.9.png
index f97f42b809..f97f42b809 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-pressed.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-pressed@2x.9.png
index 970583495c..970583495c 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background-pressed@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background.9.png
index 74a8574fd3..74a8574fd3 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background@2x.9.png
index 251633853e..251633853e 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/button-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-hovered.9.png
index f9f90df4f4..f9f90df4f4 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-hovered.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-hovered@2x.9.png
index a4be50e154..a4be50e154 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-hovered@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-open.9.png
index 147231ecb7..147231ecb7 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-open.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-open@2x.9.png
index 0a978572e7..0a978572e7 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-open@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-pressed.9.png
index 7726198ab1..7726198ab1 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-pressed.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-pressed@2x.9.png
index d64d405239..d64d405239 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background-pressed@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background.9.png
index e919d50aa0..e919d50aa0 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background@2x.9.png
index 5effba7e8b..5effba7e8b 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-hovered.png
index 78b0650555..78b0650555 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-hovered.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-hovered@2x.png
index ec3c8734c8..ec3c8734c8 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-open.png
index 7a831632fe..7a831632fe 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-open.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-open@2x.png
index 47c664a2c8..47c664a2c8 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-open@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-pressed.png
index 3340294f05..3340294f05 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-pressed.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-pressed@2x.png
index aa35b88200..aa35b88200 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator.png
index 2c7f557819..2c7f557819 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator@2x.png
index 20b9c44c34..20b9c44c34 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-indicator@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-popup.9.png
index cae75cd78e..cae75cd78e 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-popup.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-popup@2x.9.png
index 392607bcdf..392607bcdf 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/combobox-popup@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background-hovered.png
index ac614678b3..ac614678b3 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background-hovered.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background-hovered@2x.png
index b13783c23a..b13783c23a 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background-pressed.png
index 1bd74acac6..1bd74acac6 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background-pressed.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background-pressed@2x.png
index ffd7d009eb..ffd7d009eb 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background.png
index c81fcb700b..c81fcb700b 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background@2x.png
index be3e15476b..be3e15476b 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-background@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-handle-pressed.png
index d27f9355d5..d27f9355d5 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-handle-pressed.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-handle-pressed@2x.png
index a44e141066..a44e141066 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-handle-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-handle.png
index 9992a83990..9992a83990 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-handle.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-handle@2x.png
index 8816482a08..8816482a08 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/dial-handle@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/frame-background.9.png
index 1e436f2b36..1e436f2b36 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/frame-background.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/frame-background@2x.9.png
index abdf3ab8e3..abdf3ab8e3 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/frame-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/imagine-assets.qrc b/examples/quickcontrols/imagine/musicplayer/imagine-assets/imagine-assets.qrc
index 7bda4995d4..7bda4995d4 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/imagine-assets.qrc
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/imagine-assets.qrc
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-checked.9.png
index 6c7915aab9..6c7915aab9 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-checked.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-checked@2x.9.png
index 24ddbce09a..24ddbce09a 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-checked@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled.9.png
index 65a670ebb5..65a670ebb5 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled@2x.9.png
index df81dd0a98..df81dd0a98 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered.9.png
index a8eb9e7a13..a8eb9e7a13 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered@2x.9.png
index 23559a28b4..23559a28b4 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed.9.png
index 7d7a2bb960..7d7a2bb960 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed@2x.9.png
index 911563fc0e..911563fc0e 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background.9.png
index 65a670ebb5..65a670ebb5 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background@2x.9.png
index df81dd0a98..df81dd0a98 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/itemdelegate-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered.png
index fae98b91b7..fae98b91b7 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered@2x.png
index 1b575b0354..1b575b0354 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-checked.png
index 859232e2e5..859232e2e5 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-checked.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-checked@2x.png
index ef147a334a..ef147a334a 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-checked@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-disabled.png
index 862f4a26d8..862f4a26d8 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-disabled.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-disabled@2x.png
index f99e11fd08..f99e11fd08 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-disabled@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-hovered.png
index 6239eb3214..6239eb3214 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-hovered.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-hovered@2x.png
index aa2e8f46d8..aa2e8f46d8 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-pressed.png
index 81d2cd7442..81d2cd7442 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-pressed.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-pressed@2x.png
index fd82c0c38c..fd82c0c38c 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background.png
index ab2e9ceea8..ab2e9ceea8 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background@2x.png
index 33e81bf619..33e81bf619 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/roundbutton-background@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered.png
index 2657743a81..2657743a81 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered@2x.png
index 60ade78071..60ade78071 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed.png
index 626ab8b6bb..626ab8b6bb 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed@2x.png
index 92789571d1..92789571d1 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive.png
index a7a7347120..a7a7347120 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive@2x.png
index 837e179553..837e179553 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled.9.png
index f45f588838..f45f588838 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled@2x.9.png
index 40e6d50567..40e6d50567 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-horizontal.9.png
index a465f300cc..a465f300cc 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-horizontal.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-horizontal@2x.9.png
index 7a3170f529..7a3170f529 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-horizontal@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled.9.png
index 0bee2685a0..0bee2685a0 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled@2x.9.png
index 7fed90c816..7fed90c816 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-vertical.9.png
index a5074864b0..a5074864b0 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-vertical.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-vertical@2x.9.png
index a3974ebe3c..a3974ebe3c 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-background-vertical@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle-disabled.png
index 02a9df388d..02a9df388d 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle-disabled.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle-disabled@2x.png
index b37cef3272..b37cef3272 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle-disabled@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle-hovered.png
index 2048aa6b07..2048aa6b07 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle-hovered.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle-hovered@2x.png
index 0515be8e11..0515be8e11 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle-hovered@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle.png
index 2a80f27f27..2a80f27f27 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle@2x.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle@2x.png
index 2944704118..2944704118 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle@2x.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-handle@2x.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-horizontal.9.png
index 1224522f9d..1224522f9d 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-horizontal.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-horizontal@2x.9.png
index c304bfe5ad..c304bfe5ad 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-horizontal@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled.9.png
index 0e7b08bd0e..0e7b08bd0e 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled@2x.9.png
index d9654ceec4..d9654ceec4 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-vertical.9.png
index 928ff864f0..928ff864f0 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-vertical.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-vertical@2x.9.png
index 3d640b277a..3d640b277a 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/slider-progress-vertical@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/textfield-background-disabled.9.png
index de557cbc5f..de557cbc5f 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/textfield-background-disabled.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/textfield-background-disabled@2x.9.png
index 23984d715d..23984d715d 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/textfield-background-disabled@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/textfield-background.9.png
index 0dc163a4a3..0dc163a4a3 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/textfield-background.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/textfield-background@2x.9.png
index 41aae23d7f..41aae23d7f 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/textfield-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbar-background.9.png
index ab2f47e243..ab2f47e243 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbar-background.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbar-background@2x.9.png
index 7e389fe0f0..7e389fe0f0 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbar-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered.9.png
index 3acf92e12a..3acf92e12a 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered@2x.9.png
index 0f43f93337..0f43f93337 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-checked.9.png
index ff0faa567b..ff0faa567b 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-checked.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-checked@2x.9.png
index 694f5eab88..694f5eab88 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-checked@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-hovered.9.png
index c60e64d10c..c60e64d10c 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-hovered.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-hovered@2x.9.png
index d0103202bd..d0103202bd 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-hovered@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-pressed.9.png
index f2ec9c6e4b..f2ec9c6e4b 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-pressed.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-pressed@2x.9.png
index e3a86911ee..e3a86911ee 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background-pressed@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background.9.png
index a292ac0959..a292ac0959 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png
index 6f8880c393..6f8880c393 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/tooltip-background.9.png
index a74441c92a..a74441c92a 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/tooltip-background.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background@2x.9.png b/examples/quickcontrols/imagine/musicplayer/imagine-assets/tooltip-background@2x.9.png
index d4b20b74b3..d4b20b74b3 100644
--- a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background@2x.9.png
+++ b/examples/quickcontrols/imagine/musicplayer/imagine-assets/tooltip-background@2x.9.png
diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp b/examples/quickcontrols/imagine/musicplayer/musicplayer.cpp
index 54727af696..54727af696 100644
--- a/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp
+++ b/examples/quickcontrols/imagine/musicplayer/musicplayer.cpp
diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.pro b/examples/quickcontrols/imagine/musicplayer/musicplayer.pro
index b1970ee905..b1970ee905 100644
--- a/examples/quickcontrols2/imagine/musicplayer/musicplayer.pro
+++ b/examples/quickcontrols/imagine/musicplayer/musicplayer.pro
diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml b/examples/quickcontrols/imagine/musicplayer/musicplayer.qml
index 7d321534a7..7d321534a7 100644
--- a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml
+++ b/examples/quickcontrols/imagine/musicplayer/musicplayer.qml
diff --git a/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf b/examples/quickcontrols/imagine/musicplayer/qtquickcontrols2.conf
index 33eab6a563..33eab6a563 100644
--- a/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf
+++ b/examples/quickcontrols/imagine/musicplayer/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/ios/todolist/AppSettings.qml b/examples/quickcontrols/ios/todolist/AppSettings.qml
index 764ba8b8fc..764ba8b8fc 100644
--- a/examples/quickcontrols2/ios/todolist/AppSettings.qml
+++ b/examples/quickcontrols/ios/todolist/AppSettings.qml
diff --git a/examples/quickcontrols2/ios/todolist/CMakeLists.txt b/examples/quickcontrols/ios/todolist/CMakeLists.txt
index 413ea6ad97..413ea6ad97 100644
--- a/examples/quickcontrols2/ios/todolist/CMakeLists.txt
+++ b/examples/quickcontrols/ios/todolist/CMakeLists.txt
diff --git a/examples/quickcontrols2/ios/todolist/Database.qml b/examples/quickcontrols/ios/todolist/Database.qml
index 31bbd8c1e7..31bbd8c1e7 100644
--- a/examples/quickcontrols2/ios/todolist/Database.qml
+++ b/examples/quickcontrols/ios/todolist/Database.qml
diff --git a/examples/quickcontrols2/ios/todolist/FontSizePage.qml b/examples/quickcontrols/ios/todolist/FontSizePage.qml
index 2b0e5b16db..2b0e5b16db 100644
--- a/examples/quickcontrols2/ios/todolist/FontSizePage.qml
+++ b/examples/quickcontrols/ios/todolist/FontSizePage.qml
diff --git a/examples/quickcontrols2/ios/todolist/HomePage.qml b/examples/quickcontrols/ios/todolist/HomePage.qml
index 94221146e2..94221146e2 100644
--- a/examples/quickcontrols2/ios/todolist/HomePage.qml
+++ b/examples/quickcontrols/ios/todolist/HomePage.qml
diff --git a/examples/quickcontrols2/ios/todolist/MaxTasksPage.qml b/examples/quickcontrols/ios/todolist/MaxTasksPage.qml
index 509a460357..509a460357 100644
--- a/examples/quickcontrols2/ios/todolist/MaxTasksPage.qml
+++ b/examples/quickcontrols/ios/todolist/MaxTasksPage.qml
diff --git a/examples/quickcontrols2/ios/todolist/NavBar.qml b/examples/quickcontrols/ios/todolist/NavBar.qml
index 4f57353dca..4f57353dca 100644
--- a/examples/quickcontrols2/ios/todolist/NavBar.qml
+++ b/examples/quickcontrols/ios/todolist/NavBar.qml
diff --git a/examples/quickcontrols2/ios/todolist/ProjectPage.qml b/examples/quickcontrols/ios/todolist/ProjectPage.qml
index a38ad04554..a38ad04554 100644
--- a/examples/quickcontrols2/ios/todolist/ProjectPage.qml
+++ b/examples/quickcontrols/ios/todolist/ProjectPage.qml
diff --git a/examples/quickcontrols2/ios/todolist/SettingsPage.qml b/examples/quickcontrols/ios/todolist/SettingsPage.qml
index 4d2d7bef9f..4d2d7bef9f 100644
--- a/examples/quickcontrols2/ios/todolist/SettingsPage.qml
+++ b/examples/quickcontrols/ios/todolist/SettingsPage.qml
diff --git a/examples/quickcontrols2/ios/todolist/ToggleCompletedTasksPage.qml b/examples/quickcontrols/ios/todolist/ToggleCompletedTasksPage.qml
index df2145866a..df2145866a 100644
--- a/examples/quickcontrols2/ios/todolist/ToggleCompletedTasksPage.qml
+++ b/examples/quickcontrols/ios/todolist/ToggleCompletedTasksPage.qml
diff --git a/examples/quickcontrols2/ios/todolist/doc/images/qtquickcontrols2-todolist.png b/examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols2-todolist.png
index 5be7190a43..5be7190a43 100644
--- a/examples/quickcontrols2/ios/todolist/doc/images/qtquickcontrols2-todolist.png
+++ b/examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols2-todolist.png
diff --git a/examples/quickcontrols2/ios/todolist/doc/src/qtquickcontrols2-todolist.qdoc b/examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols2-todolist.qdoc
index 12e2d4fca5..12e2d4fca5 100644
--- a/examples/quickcontrols2/ios/todolist/doc/src/qtquickcontrols2-todolist.qdoc
+++ b/examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols2-todolist.qdoc
diff --git a/examples/quickcontrols2/ios/todolist/images/add-new.png b/examples/quickcontrols/ios/todolist/images/add-new.png
index 2e60e48a2d..2e60e48a2d 100644
--- a/examples/quickcontrols2/ios/todolist/images/add-new.png
+++ b/examples/quickcontrols/ios/todolist/images/add-new.png
diff --git a/examples/quickcontrols2/ios/todolist/images/add-new@2x.png b/examples/quickcontrols/ios/todolist/images/add-new@2x.png
index edb8b62847..edb8b62847 100644
--- a/examples/quickcontrols2/ios/todolist/images/add-new@2x.png
+++ b/examples/quickcontrols/ios/todolist/images/add-new@2x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/add-new@3x.png b/examples/quickcontrols/ios/todolist/images/add-new@3x.png
index b5b9b6a5d6..b5b9b6a5d6 100644
--- a/examples/quickcontrols2/ios/todolist/images/add-new@3x.png
+++ b/examples/quickcontrols/ios/todolist/images/add-new@3x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/back-white.png b/examples/quickcontrols/ios/todolist/images/back-white.png
index 503bdf4d48..503bdf4d48 100644
--- a/examples/quickcontrols2/ios/todolist/images/back-white.png
+++ b/examples/quickcontrols/ios/todolist/images/back-white.png
diff --git a/examples/quickcontrols2/ios/todolist/images/back-white@2x.png b/examples/quickcontrols/ios/todolist/images/back-white@2x.png
index e201ec6d5b..e201ec6d5b 100644
--- a/examples/quickcontrols2/ios/todolist/images/back-white@2x.png
+++ b/examples/quickcontrols/ios/todolist/images/back-white@2x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/back-white@3x.png b/examples/quickcontrols/ios/todolist/images/back-white@3x.png
index eb8b7ffc68..eb8b7ffc68 100644
--- a/examples/quickcontrols2/ios/todolist/images/back-white@3x.png
+++ b/examples/quickcontrols/ios/todolist/images/back-white@3x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/back.png b/examples/quickcontrols/ios/todolist/images/back.png
index 94580efd7f..94580efd7f 100644
--- a/examples/quickcontrols2/ios/todolist/images/back.png
+++ b/examples/quickcontrols/ios/todolist/images/back.png
diff --git a/examples/quickcontrols2/ios/todolist/images/back@2x.png b/examples/quickcontrols/ios/todolist/images/back@2x.png
index b5cf424e91..b5cf424e91 100644
--- a/examples/quickcontrols2/ios/todolist/images/back@2x.png
+++ b/examples/quickcontrols/ios/todolist/images/back@2x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/back@3x.png b/examples/quickcontrols/ios/todolist/images/back@3x.png
index 50d5102f4e..50d5102f4e 100644
--- a/examples/quickcontrols2/ios/todolist/images/back@3x.png
+++ b/examples/quickcontrols/ios/todolist/images/back@3x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/close-white.png b/examples/quickcontrols/ios/todolist/images/close-white.png
index 72163067a6..72163067a6 100644
--- a/examples/quickcontrols2/ios/todolist/images/close-white.png
+++ b/examples/quickcontrols/ios/todolist/images/close-white.png
diff --git a/examples/quickcontrols2/ios/todolist/images/close-white@2x.png b/examples/quickcontrols/ios/todolist/images/close-white@2x.png
index 54828e84d1..54828e84d1 100644
--- a/examples/quickcontrols2/ios/todolist/images/close-white@2x.png
+++ b/examples/quickcontrols/ios/todolist/images/close-white@2x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/close-white@3x.png b/examples/quickcontrols/ios/todolist/images/close-white@3x.png
index dd67cf1b69..dd67cf1b69 100644
--- a/examples/quickcontrols2/ios/todolist/images/close-white@3x.png
+++ b/examples/quickcontrols/ios/todolist/images/close-white@3x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/close.png b/examples/quickcontrols/ios/todolist/images/close.png
index eba32b637d..eba32b637d 100644
--- a/examples/quickcontrols2/ios/todolist/images/close.png
+++ b/examples/quickcontrols/ios/todolist/images/close.png
diff --git a/examples/quickcontrols2/ios/todolist/images/close@2x.png b/examples/quickcontrols/ios/todolist/images/close@2x.png
index 72cf76317a..72cf76317a 100644
--- a/examples/quickcontrols2/ios/todolist/images/close@2x.png
+++ b/examples/quickcontrols/ios/todolist/images/close@2x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/close@3x.png b/examples/quickcontrols/ios/todolist/images/close@3x.png
index 6cb2ea58d9..6cb2ea58d9 100644
--- a/examples/quickcontrols2/ios/todolist/images/close@3x.png
+++ b/examples/quickcontrols/ios/todolist/images/close@3x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/plus-math.png b/examples/quickcontrols/ios/todolist/images/plus-math.png
index b0d182d23e..b0d182d23e 100644
--- a/examples/quickcontrols2/ios/todolist/images/plus-math.png
+++ b/examples/quickcontrols/ios/todolist/images/plus-math.png
diff --git a/examples/quickcontrols2/ios/todolist/images/plus-math@2x.png b/examples/quickcontrols/ios/todolist/images/plus-math@2x.png
index 112a132084..112a132084 100644
--- a/examples/quickcontrols2/ios/todolist/images/plus-math@2x.png
+++ b/examples/quickcontrols/ios/todolist/images/plus-math@2x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/plus-math@3x.png b/examples/quickcontrols/ios/todolist/images/plus-math@3x.png
index ca513d200b..ca513d200b 100644
--- a/examples/quickcontrols2/ios/todolist/images/plus-math@3x.png
+++ b/examples/quickcontrols/ios/todolist/images/plus-math@3x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/settings.png b/examples/quickcontrols/ios/todolist/images/settings.png
index 600981fb35..600981fb35 100644
--- a/examples/quickcontrols2/ios/todolist/images/settings.png
+++ b/examples/quickcontrols/ios/todolist/images/settings.png
diff --git a/examples/quickcontrols2/ios/todolist/images/settings@2x.png b/examples/quickcontrols/ios/todolist/images/settings@2x.png
index 80541aa028..80541aa028 100644
--- a/examples/quickcontrols2/ios/todolist/images/settings@2x.png
+++ b/examples/quickcontrols/ios/todolist/images/settings@2x.png
diff --git a/examples/quickcontrols2/ios/todolist/images/settings@3x.png b/examples/quickcontrols/ios/todolist/images/settings@3x.png
index 48c2b2a8c0..48c2b2a8c0 100644
--- a/examples/quickcontrols2/ios/todolist/images/settings@3x.png
+++ b/examples/quickcontrols/ios/todolist/images/settings@3x.png
diff --git a/examples/quickcontrols2/ios/todolist/main.qml b/examples/quickcontrols/ios/todolist/main.qml
index a0067643f1..a0067643f1 100644
--- a/examples/quickcontrols2/ios/todolist/main.qml
+++ b/examples/quickcontrols/ios/todolist/main.qml
diff --git a/examples/quickcontrols2/ios/todolist/qmldir b/examples/quickcontrols/ios/todolist/qmldir
index e0c443110e..e0c443110e 100644
--- a/examples/quickcontrols2/ios/todolist/qmldir
+++ b/examples/quickcontrols/ios/todolist/qmldir
diff --git a/examples/quickcontrols2/ios/todolist/src/main.cpp b/examples/quickcontrols/ios/todolist/src/main.cpp
index 4f158402a2..4f158402a2 100644
--- a/examples/quickcontrols2/ios/todolist/src/main.cpp
+++ b/examples/quickcontrols/ios/todolist/src/main.cpp
diff --git a/examples/quickcontrols2/ios/todolist/todolist.pro b/examples/quickcontrols/ios/todolist/todolist.pro
index d77d718a62..d77d718a62 100644
--- a/examples/quickcontrols2/ios/todolist/todolist.pro
+++ b/examples/quickcontrols/ios/todolist/todolist.pro
diff --git a/examples/quickcontrols2/quickcontrols2.pro b/examples/quickcontrols/quickcontrols2.pro
index b7fc57bca6..b7fc57bca6 100644
--- a/examples/quickcontrols2/quickcontrols2.pro
+++ b/examples/quickcontrols/quickcontrols2.pro
diff --git a/examples/quickcontrols2/sidepanel/CMakeLists.txt b/examples/quickcontrols/sidepanel/CMakeLists.txt
index 7a832eda13..7a832eda13 100644
--- a/examples/quickcontrols2/sidepanel/CMakeLists.txt
+++ b/examples/quickcontrols/sidepanel/CMakeLists.txt
diff --git a/examples/quickcontrols2/sidepanel/doc/images/qtquickcontrols2-sidepanel-landscape.png b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-landscape.png
index 86907591b2..86907591b2 100644
--- a/examples/quickcontrols2/sidepanel/doc/images/qtquickcontrols2-sidepanel-landscape.png
+++ b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-landscape.png
diff --git a/examples/quickcontrols2/sidepanel/doc/images/qtquickcontrols2-sidepanel-portrait.png b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-portrait.png
index cf1ed2efd0..cf1ed2efd0 100644
--- a/examples/quickcontrols2/sidepanel/doc/images/qtquickcontrols2-sidepanel-portrait.png
+++ b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-portrait.png
diff --git a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc b/examples/quickcontrols/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc
index d5baa46eef..d5baa46eef 100644
--- a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc
+++ b/examples/quickcontrols/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc
diff --git a/examples/quickcontrols2/sidepanel/images/qt-logo.png b/examples/quickcontrols/sidepanel/images/qt-logo.png
index dff7729515..dff7729515 100644
--- a/examples/quickcontrols2/sidepanel/images/qt-logo.png
+++ b/examples/quickcontrols/sidepanel/images/qt-logo.png
diff --git a/examples/quickcontrols2/sidepanel/images/qt-logo@2x.png b/examples/quickcontrols/sidepanel/images/qt-logo@2x.png
index dbd73aab77..dbd73aab77 100644
--- a/examples/quickcontrols2/sidepanel/images/qt-logo@2x.png
+++ b/examples/quickcontrols/sidepanel/images/qt-logo@2x.png
diff --git a/examples/quickcontrols2/sidepanel/images/qt-logo@3x.png b/examples/quickcontrols/sidepanel/images/qt-logo@3x.png
index 68e763b597..68e763b597 100644
--- a/examples/quickcontrols2/sidepanel/images/qt-logo@3x.png
+++ b/examples/quickcontrols/sidepanel/images/qt-logo@3x.png
diff --git a/examples/quickcontrols2/sidepanel/images/qt-logo@4x.png b/examples/quickcontrols/sidepanel/images/qt-logo@4x.png
index 08fd882572..08fd882572 100644
--- a/examples/quickcontrols2/sidepanel/images/qt-logo@4x.png
+++ b/examples/quickcontrols/sidepanel/images/qt-logo@4x.png
diff --git a/examples/quickcontrols2/sidepanel/qtquickcontrols2.conf b/examples/quickcontrols/sidepanel/qtquickcontrols2.conf
index b6c7c87ea1..b6c7c87ea1 100644
--- a/examples/quickcontrols2/sidepanel/qtquickcontrols2.conf
+++ b/examples/quickcontrols/sidepanel/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/sidepanel/sidepanel.cpp b/examples/quickcontrols/sidepanel/sidepanel.cpp
index c78329d9de..c78329d9de 100644
--- a/examples/quickcontrols2/sidepanel/sidepanel.cpp
+++ b/examples/quickcontrols/sidepanel/sidepanel.cpp
diff --git a/examples/quickcontrols2/sidepanel/sidepanel.pro b/examples/quickcontrols/sidepanel/sidepanel.pro
index 3ae9cd8d6b..3ae9cd8d6b 100644
--- a/examples/quickcontrols2/sidepanel/sidepanel.pro
+++ b/examples/quickcontrols/sidepanel/sidepanel.pro
diff --git a/examples/quickcontrols2/sidepanel/sidepanel.qml b/examples/quickcontrols/sidepanel/sidepanel.qml
index de767a9bb6..de767a9bb6 100644
--- a/examples/quickcontrols2/sidepanel/sidepanel.qml
+++ b/examples/quickcontrols/sidepanel/sidepanel.qml
diff --git a/examples/quickcontrols2/swipetoremove/CMakeLists.txt b/examples/quickcontrols/swipetoremove/CMakeLists.txt
index 813f9f1e1f..813f9f1e1f 100644
--- a/examples/quickcontrols2/swipetoremove/CMakeLists.txt
+++ b/examples/quickcontrols/swipetoremove/CMakeLists.txt
diff --git a/examples/quickcontrols2/swipetoremove/doc/images/qtquickcontrols2-swipetoremove.png b/examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols2-swipetoremove.png
index 07a200fe92..07a200fe92 100644
--- a/examples/quickcontrols2/swipetoremove/doc/images/qtquickcontrols2-swipetoremove.png
+++ b/examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols2-swipetoremove.png
diff --git a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc b/examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc
index a8f36912b2..a8f36912b2 100644
--- a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc
+++ b/examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc
diff --git a/examples/quickcontrols2/swipetoremove/fonts/LICENSE.txt b/examples/quickcontrols/swipetoremove/fonts/LICENSE.txt
index 7394a58ddf..7394a58ddf 100644
--- a/examples/quickcontrols2/swipetoremove/fonts/LICENSE.txt
+++ b/examples/quickcontrols/swipetoremove/fonts/LICENSE.txt
diff --git a/examples/quickcontrols2/swipetoremove/fonts/fontello.ttf b/examples/quickcontrols/swipetoremove/fonts/fontello.ttf
index 553fd2efca..553fd2efca 100644
--- a/examples/quickcontrols2/swipetoremove/fonts/fontello.ttf
+++ b/examples/quickcontrols/swipetoremove/fonts/fontello.ttf
diff --git a/examples/quickcontrols2/swipetoremove/swipetoremove.cpp b/examples/quickcontrols/swipetoremove/swipetoremove.cpp
index 0bd8e24521..0bd8e24521 100644
--- a/examples/quickcontrols2/swipetoremove/swipetoremove.cpp
+++ b/examples/quickcontrols/swipetoremove/swipetoremove.cpp
diff --git a/examples/quickcontrols2/swipetoremove/swipetoremove.pro b/examples/quickcontrols/swipetoremove/swipetoremove.pro
index bcdb45cd45..bcdb45cd45 100644
--- a/examples/quickcontrols2/swipetoremove/swipetoremove.pro
+++ b/examples/quickcontrols/swipetoremove/swipetoremove.pro
diff --git a/examples/quickcontrols2/swipetoremove/swipetoremove.qml b/examples/quickcontrols/swipetoremove/swipetoremove.qml
index a7820eb024..a7820eb024 100644
--- a/examples/quickcontrols2/swipetoremove/swipetoremove.qml
+++ b/examples/quickcontrols/swipetoremove/swipetoremove.qml
diff --git a/examples/quickcontrols2/texteditor/+touch/texteditor.html b/examples/quickcontrols/texteditor/+touch/texteditor.html
index b5f03f258e..b5f03f258e 100644
--- a/examples/quickcontrols2/texteditor/+touch/texteditor.html
+++ b/examples/quickcontrols/texteditor/+touch/texteditor.html
diff --git a/examples/quickcontrols2/texteditor/CMakeLists.txt b/examples/quickcontrols/texteditor/CMakeLists.txt
index d978d82fce..d978d82fce 100644
--- a/examples/quickcontrols2/texteditor/CMakeLists.txt
+++ b/examples/quickcontrols/texteditor/CMakeLists.txt
diff --git a/examples/quickcontrols2/texteditor/creatorKateHighlighter.png b/examples/quickcontrols/texteditor/creatorKateHighlighter.png
index 7dd819507f..7dd819507f 100644
--- a/examples/quickcontrols2/texteditor/creatorKateHighlighter.png
+++ b/examples/quickcontrols/texteditor/creatorKateHighlighter.png
diff --git a/examples/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg
index 259e0e8b07..259e0e8b07 100644
--- a/examples/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg
+++ b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg
diff --git a/examples/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg
index 6a924cdf52..6a924cdf52 100644
--- a/examples/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg
+++ b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg
diff --git a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc b/examples/quickcontrols/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
index d626a6a04e..d626a6a04e 100644
--- a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
+++ b/examples/quickcontrols/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
diff --git a/examples/quickcontrols2/texteditor/documenthandler.cpp b/examples/quickcontrols/texteditor/documenthandler.cpp
index 9571aa03ba..9571aa03ba 100644
--- a/examples/quickcontrols2/texteditor/documenthandler.cpp
+++ b/examples/quickcontrols/texteditor/documenthandler.cpp
diff --git a/examples/quickcontrols2/texteditor/documenthandler.h b/examples/quickcontrols/texteditor/documenthandler.h
index b750997885..b750997885 100644
--- a/examples/quickcontrols2/texteditor/documenthandler.h
+++ b/examples/quickcontrols/texteditor/documenthandler.h
diff --git a/examples/quickcontrols2/texteditor/einstein.png b/examples/quickcontrols/texteditor/einstein.png
index 3611284df4..3611284df4 100644
--- a/examples/quickcontrols2/texteditor/einstein.png
+++ b/examples/quickcontrols/texteditor/einstein.png
diff --git a/examples/quickcontrols2/texteditor/example.md b/examples/quickcontrols/texteditor/example.md
index e385227e3b..e385227e3b 100644
--- a/examples/quickcontrols2/texteditor/example.md
+++ b/examples/quickcontrols/texteditor/example.md
diff --git a/examples/quickcontrols2/texteditor/fonts/fontello.ttf b/examples/quickcontrols/texteditor/fonts/fontello.ttf
index f02b44ec12..f02b44ec12 100644
--- a/examples/quickcontrols2/texteditor/fonts/fontello.ttf
+++ b/examples/quickcontrols/texteditor/fonts/fontello.ttf
diff --git a/examples/quickcontrols2/texteditor/images/qt-logo.png b/examples/quickcontrols/texteditor/images/qt-logo.png
index 2ebc01aafa..2ebc01aafa 100644
--- a/examples/quickcontrols2/texteditor/images/qt-logo.png
+++ b/examples/quickcontrols/texteditor/images/qt-logo.png
diff --git a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml b/examples/quickcontrols/texteditor/qml/+touch/texteditor.qml
index 2a0d9f117f..2a0d9f117f 100644
--- a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml
+++ b/examples/quickcontrols/texteditor/qml/+touch/texteditor.qml
diff --git a/examples/quickcontrols2/texteditor/qml/texteditor.qml b/examples/quickcontrols/texteditor/qml/texteditor.qml
index decf0801e4..decf0801e4 100644
--- a/examples/quickcontrols2/texteditor/qml/texteditor.qml
+++ b/examples/quickcontrols/texteditor/qml/texteditor.qml
diff --git a/examples/quickcontrols2/texteditor/red.png b/examples/quickcontrols/texteditor/red.png
index 9038fef784..9038fef784 100644
--- a/examples/quickcontrols2/texteditor/red.png
+++ b/examples/quickcontrols/texteditor/red.png
diff --git a/examples/quickcontrols2/texteditor/texteditor.cpp b/examples/quickcontrols/texteditor/texteditor.cpp
index 79cd6d8071..79cd6d8071 100644
--- a/examples/quickcontrols2/texteditor/texteditor.cpp
+++ b/examples/quickcontrols/texteditor/texteditor.cpp
diff --git a/examples/quickcontrols2/texteditor/texteditor.html b/examples/quickcontrols/texteditor/texteditor.html
index 3c59a053c5..3c59a053c5 100644
--- a/examples/quickcontrols2/texteditor/texteditor.html
+++ b/examples/quickcontrols/texteditor/texteditor.html
diff --git a/examples/quickcontrols2/texteditor/texteditor.pro b/examples/quickcontrols/texteditor/texteditor.pro
index deb2457615..deb2457615 100644
--- a/examples/quickcontrols2/texteditor/texteditor.pro
+++ b/examples/quickcontrols/texteditor/texteditor.pro
diff --git a/examples/quickcontrols2/texteditor/texteditor.qrc b/examples/quickcontrols/texteditor/texteditor.qrc
index cdb7225a39..cdb7225a39 100644
--- a/examples/quickcontrols2/texteditor/texteditor.qrc
+++ b/examples/quickcontrols/texteditor/texteditor.qrc
diff --git a/examples/quickcontrols2/wearable/CMakeLists.txt b/examples/quickcontrols/wearable/CMakeLists.txt
index b61064d5d9..b61064d5d9 100644
--- a/examples/quickcontrols2/wearable/CMakeLists.txt
+++ b/examples/quickcontrols/wearable/CMakeLists.txt
diff --git a/examples/quickcontrols2/wearable/doc/images/qtquickcontrols2-wearable.png b/examples/quickcontrols/wearable/doc/images/qtquickcontrols2-wearable.png
index c61055340c..c61055340c 100644
--- a/examples/quickcontrols2/wearable/doc/images/qtquickcontrols2-wearable.png
+++ b/examples/quickcontrols/wearable/doc/images/qtquickcontrols2-wearable.png
diff --git a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols/wearable/doc/src/qtquickcontrols2-wearable.qdoc
index 8a1e021663..8a1e021663 100644
--- a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
+++ b/examples/quickcontrols/wearable/doc/src/qtquickcontrols2-wearable.qdoc
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/alarms.png b/examples/quickcontrols/wearable/icons/wearable/36x36/alarms.png
index 252dcf938f..252dcf938f 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36/alarms.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36/alarms.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/fitness.png b/examples/quickcontrols/wearable/icons/wearable/36x36/fitness.png
index 4b0679e271..4b0679e271 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36/fitness.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36/fitness.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png b/examples/quickcontrols/wearable/icons/wearable/36x36/navigation.png
index 08e73005fd..08e73005fd 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36/navigation.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/notifications.png b/examples/quickcontrols/wearable/icons/wearable/36x36/notifications.png
index 6309312122..6309312122 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36/notifications.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36/notifications.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/settings.png b/examples/quickcontrols/wearable/icons/wearable/36x36/settings.png
index c1552fb360..c1552fb360 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36/settings.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36/settings.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/weather.png b/examples/quickcontrols/wearable/icons/wearable/36x36/weather.png
index 61be79a24f..61be79a24f 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36/weather.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36/weather.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/worldclock.png b/examples/quickcontrols/wearable/icons/wearable/36x36/worldclock.png
index d23e32e512..d23e32e512 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36/worldclock.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36/worldclock.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/alarms.png b/examples/quickcontrols/wearable/icons/wearable/36x36@2/alarms.png
index 6047e231fc..6047e231fc 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/alarms.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36@2/alarms.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/fitness.png b/examples/quickcontrols/wearable/icons/wearable/36x36@2/fitness.png
index 1d2caa3385..1d2caa3385 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/fitness.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36@2/fitness.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png b/examples/quickcontrols/wearable/icons/wearable/36x36@2/navigation.png
index 7d4a62b9e1..7d4a62b9e1 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36@2/navigation.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/notifications.png b/examples/quickcontrols/wearable/icons/wearable/36x36@2/notifications.png
index 8d3b333350..8d3b333350 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/notifications.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36@2/notifications.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/settings.png b/examples/quickcontrols/wearable/icons/wearable/36x36@2/settings.png
index e89188743d..e89188743d 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/settings.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36@2/settings.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/weather.png b/examples/quickcontrols/wearable/icons/wearable/36x36@2/weather.png
index 0a2ae7d54e..0a2ae7d54e 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/weather.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36@2/weather.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/worldclock.png b/examples/quickcontrols/wearable/icons/wearable/36x36@2/worldclock.png
index ca6eb879e1..ca6eb879e1 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/worldclock.png
+++ b/examples/quickcontrols/wearable/icons/wearable/36x36@2/worldclock.png
diff --git a/examples/quickcontrols2/wearable/icons/wearable/index.theme b/examples/quickcontrols/wearable/icons/wearable/index.theme
index da702d4a92..da702d4a92 100644
--- a/examples/quickcontrols2/wearable/icons/wearable/index.theme
+++ b/examples/quickcontrols/wearable/icons/wearable/index.theme
diff --git a/examples/quickcontrols2/wearable/images/back.png b/examples/quickcontrols/wearable/images/back.png
index cf80aa65f5..cf80aa65f5 100644
--- a/examples/quickcontrols2/wearable/images/back.png
+++ b/examples/quickcontrols/wearable/images/back.png
diff --git a/examples/quickcontrols2/wearable/images/back@2x.png b/examples/quickcontrols/wearable/images/back@2x.png
index 02f27981e0..02f27981e0 100644
--- a/examples/quickcontrols2/wearable/images/back@2x.png
+++ b/examples/quickcontrols/wearable/images/back@2x.png
diff --git a/examples/quickcontrols2/wearable/images/back@3x.png b/examples/quickcontrols/wearable/images/back@3x.png
index 6d2d6cf120..6d2d6cf120 100644
--- a/examples/quickcontrols2/wearable/images/back@3x.png
+++ b/examples/quickcontrols/wearable/images/back@3x.png
diff --git a/examples/quickcontrols2/wearable/images/back@4x.png b/examples/quickcontrols/wearable/images/back@4x.png
index 03193681b1..03193681b1 100644
--- a/examples/quickcontrols2/wearable/images/back@4x.png
+++ b/examples/quickcontrols/wearable/images/back@4x.png
diff --git a/examples/quickcontrols2/wearable/images/background-dark.png b/examples/quickcontrols/wearable/images/background-dark.png
index 6a8c0761aa..6a8c0761aa 100644
--- a/examples/quickcontrols2/wearable/images/background-dark.png
+++ b/examples/quickcontrols/wearable/images/background-dark.png
diff --git a/examples/quickcontrols2/wearable/images/background-light.png b/examples/quickcontrols/wearable/images/background-light.png
index 913befab82..913befab82 100644
--- a/examples/quickcontrols2/wearable/images/background-light.png
+++ b/examples/quickcontrols/wearable/images/background-light.png
diff --git a/examples/quickcontrols2/wearable/images/home.png b/examples/quickcontrols/wearable/images/home.png
index b6ee1459f7..b6ee1459f7 100644
--- a/examples/quickcontrols2/wearable/images/home.png
+++ b/examples/quickcontrols/wearable/images/home.png
diff --git a/examples/quickcontrols2/wearable/images/home@2x.png b/examples/quickcontrols/wearable/images/home@2x.png
index d5595b2378..d5595b2378 100644
--- a/examples/quickcontrols2/wearable/images/home@2x.png
+++ b/examples/quickcontrols/wearable/images/home@2x.png
diff --git a/examples/quickcontrols2/wearable/images/home@3x.png b/examples/quickcontrols/wearable/images/home@3x.png
index 9a5188d22b..9a5188d22b 100644
--- a/examples/quickcontrols2/wearable/images/home@3x.png
+++ b/examples/quickcontrols/wearable/images/home@3x.png
diff --git a/examples/quickcontrols2/wearable/images/home@4x.png b/examples/quickcontrols/wearable/images/home@4x.png
index c4d2eb515a..c4d2eb515a 100644
--- a/examples/quickcontrols2/wearable/images/home@4x.png
+++ b/examples/quickcontrols/wearable/images/home@4x.png
diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols/wearable/qml/Alarms/AlarmsPage.qml
index 65b34b83cb..65b34b83cb 100644
--- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
+++ b/examples/quickcontrols/wearable/qml/Alarms/AlarmsPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/DemoMode.qml b/examples/quickcontrols/wearable/qml/DemoMode.qml
index d7d4b6e61f..d7d4b6e61f 100644
--- a/examples/quickcontrols2/wearable/qml/DemoMode.qml
+++ b/examples/quickcontrols/wearable/qml/DemoMode.qml
diff --git a/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml b/examples/quickcontrols/wearable/qml/DemoModeIndicator.qml
index 977c600653..977c600653 100644
--- a/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml
+++ b/examples/quickcontrols/wearable/qml/DemoModeIndicator.qml
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols/wearable/qml/Fitness/FitnessPage.qml
index c1047de9aa..c1047de9aa 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
+++ b/examples/quickcontrols/wearable/qml/Fitness/FitnessPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/fitness.js b/examples/quickcontrols/wearable/qml/Fitness/fitness.js
index 95ce06cdc1..95ce06cdc1 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/fitness.js
+++ b/examples/quickcontrols/wearable/qml/Fitness/fitness.js
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png b/examples/quickcontrols/wearable/qml/Fitness/images/man-running-dark.png
index 6c791d6170..6c791d6170 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png
+++ b/examples/quickcontrols/wearable/qml/Fitness/images/man-running-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png b/examples/quickcontrols/wearable/qml/Fitness/images/man-running-dark@2x.png
index e9abae9de4..e9abae9de4 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Fitness/images/man-running-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light.png b/examples/quickcontrols/wearable/qml/Fitness/images/man-running-light.png
index e7eef12cb3..e7eef12cb3 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light.png
+++ b/examples/quickcontrols/wearable/qml/Fitness/images/man-running-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light@2x.png b/examples/quickcontrols/wearable/qml/Fitness/images/man-running-light@2x.png
index 79861f5718..79861f5718 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Fitness/images/man-running-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png b/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-dark.png
index 6d455b4925..6d455b4925 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png
+++ b/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png b/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-dark@2x.png
index a3ac08baf3..a3ac08baf3 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light.png b/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-light.png
index f963f8897b..f963f8897b 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light.png
+++ b/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light@2x.png b/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-light@2x.png
index 1b4d7592d6..1b4d7592d6 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols/wearable/qml/LauncherPage.qml
index 4017a81c57..4017a81c57 100644
--- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml
+++ b/examples/quickcontrols/wearable/qml/LauncherPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/NaviButton.qml b/examples/quickcontrols/wearable/qml/NaviButton.qml
index 3c1c30fb7f..3c1c30fb7f 100644
--- a/examples/quickcontrols2/wearable/qml/NaviButton.qml
+++ b/examples/quickcontrols/wearable/qml/NaviButton.qml
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml b/examples/quickcontrols/wearable/qml/Navigation/NavigationPage.qml
index f9fdd61b47..f9fdd61b47 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
+++ b/examples/quickcontrols/wearable/qml/Navigation/NavigationPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml b/examples/quickcontrols/wearable/qml/Navigation/RouteElement.qml
index dd4aebbb2f..dd4aebbb2f 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
+++ b/examples/quickcontrols/wearable/qml/Navigation/RouteElement.qml
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/end.png b/examples/quickcontrols/wearable/qml/Navigation/images/end.png
index 4805ad8207..4805ad8207 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/end.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/end.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/end@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/end@2x.png
index e91d537465..e91d537465 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/end@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/end@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png b/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-dark.png
index 66d258f5ac..66d258f5ac 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-dark@2x.png
index 639deb81cf..639deb81cf 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light.png b/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-light.png
index 1346e8eaff..1346e8eaff 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-light@2x.png
index 268a6283f9..268a6283f9 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/marker.png b/examples/quickcontrols/wearable/qml/Navigation/images/marker.png
index 4805ad8207..4805ad8207 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/marker.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/marker.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png b/examples/quickcontrols/wearable/qml/Navigation/images/navigation-dark.png
index b80b7b610f..b80b7b610f 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/navigation-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/navigation-dark@2x.png
index b198aa3d9a..b198aa3d9a 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/navigation-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light.png b/examples/quickcontrols/wearable/qml/Navigation/images/navigation-light.png
index 08e73005fd..08e73005fd 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/navigation-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/navigation-light@2x.png
index 7d4a62b9e1..7d4a62b9e1 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/navigation-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png b/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-dark.png
index 6a779dadc4..6a779dadc4 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-dark@2x.png
index 13143c2e2c..13143c2e2c 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light.png b/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-light.png
index a6be08c1a1..a6be08c1a1 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-light@2x.png
index 58f04b5052..58f04b5052 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/start.png b/examples/quickcontrols/wearable/qml/Navigation/images/start.png
index 41de60e60c..41de60e60c 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/start.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/start.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/start@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/start@2x.png
index 6fe3ba9dbd..6fe3ba9dbd 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/start@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/start@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png b/examples/quickcontrols/wearable/qml/Navigation/images/straight-dark.png
index 3f4ab66430..3f4ab66430 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/straight-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/straight-dark@2x.png
index f5baa6da42..f5baa6da42 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/straight-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light.png b/examples/quickcontrols/wearable/qml/Navigation/images/straight-light.png
index 1321b97aa5..1321b97aa5 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/straight-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/straight-light@2x.png
index a2d3c4c2ab..a2d3c4c2ab 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/straight-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/uturn.png b/examples/quickcontrols/wearable/qml/Navigation/images/uturn.png
index 596046ca9a..596046ca9a 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/uturn.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/uturn.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/uturn@2x.png b/examples/quickcontrols/wearable/qml/Navigation/images/uturn@2x.png
index 659f103573..659f103573 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/images/uturn@2x.png
+++ b/examples/quickcontrols/wearable/qml/Navigation/images/uturn@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/navigation.js b/examples/quickcontrols/wearable/qml/Navigation/navigation.js
index e82cccbea5..e82cccbea5 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/navigation.js
+++ b/examples/quickcontrols/wearable/qml/Navigation/navigation.js
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/walk_route.json b/examples/quickcontrols/wearable/qml/Navigation/walk_route.json
index e69b5cc187..e69b5cc187 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/walk_route.json
+++ b/examples/quickcontrols/wearable/qml/Navigation/walk_route.json
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols/wearable/qml/Notifications/NotificationsPage.qml
index 6cbf2d92cf..6cbf2d92cf 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
+++ b/examples/quickcontrols/wearable/qml/Notifications/NotificationsPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark.png b/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-dark.png
index 37bc1f291b..37bc1f291b 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark@2x.png b/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-dark@2x.png
index efcd7cba74..efcd7cba74 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light.png b/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-light.png
index e38b260724..e38b260724 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light@2x.png b/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-light@2x.png
index 1f28beac6c..1f28beac6c 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark.png b/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-dark.png
index 5a2a394d8c..5a2a394d8c 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark@2x.png b/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-dark@2x.png
index 1a19b0fc8e..1a19b0fc8e 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light.png b/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-light.png
index f0fc7a9606..f0fc7a9606 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light@2x.png b/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-light@2x.png
index 64a0f1f9ac..64a0f1f9ac 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark.png b/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-dark.png
index 26bcf98ad3..26bcf98ad3 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark@2x.png b/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-dark@2x.png
index 5eb54ce809..5eb54ce809 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light.png b/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-light.png
index 641e1f0c43..641e1f0c43 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light@2x.png b/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-light@2x.png
index e8d2d81c9a..e8d2d81c9a 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/notifications.js b/examples/quickcontrols/wearable/qml/Notifications/notifications.js
index 62f46e0a0b..62f46e0a0b 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/notifications.js
+++ b/examples/quickcontrols/wearable/qml/Notifications/notifications.js
diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml b/examples/quickcontrols/wearable/qml/Settings/SettingsPage.qml
index 68fb17990d..68fb17990d 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
+++ b/examples/quickcontrols/wearable/qml/Settings/SettingsPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark.png b/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-dark.png
index 0f1f4d0a54..0f1f4d0a54 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-dark@2x.png
index 7496fc5685..7496fc5685 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light.png b/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-light.png
index 6e297cfab3..6e297cfab3 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-light@2x.png
index 62d084032f..62d084032f 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark.png b/examples/quickcontrols/wearable/qml/Settings/images/brightness-dark.png
index f9eb07b583..f9eb07b583 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/brightness-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/brightness-dark@2x.png
index 3efc5a6c4b..3efc5a6c4b 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/brightness-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light.png b/examples/quickcontrols/wearable/qml/Settings/images/brightness-light.png
index ce3023b565..ce3023b565 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/brightness-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/brightness-light@2x.png
index dc01aae1fd..dc01aae1fd 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/brightness-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-dark.png b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-dark.png
index e93c417d79..e93c417d79 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-dark.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-dark@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-dark@2x.png
index faa1bf6d11..faa1bf6d11 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-light.png b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-light.png
index c38d146d37..c38d146d37 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-light.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-light@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-light@2x.png
index b9d6409cbc..b9d6409cbc 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-white.png b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-white.png
index aac8ef3f6c..aac8ef3f6c 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-white.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-white.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-white@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-white@2x.png
index b4d8954f5d..b4d8954f5d 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-white@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-white@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode.svg b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode.svg
index ad1ce44873..ad1ce44873 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode.svg
+++ b/examples/quickcontrols/wearable/qml/Settings/images/demo-mode.svg
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark.png b/examples/quickcontrols/wearable/qml/Settings/images/theme-dark.png
index d4c4a8c094..d4c4a8c094 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/theme-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/theme-dark@2x.png
index 30d8c6de28..30d8c6de28 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/theme-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/theme-light.png b/examples/quickcontrols/wearable/qml/Settings/images/theme-light.png
index e7a0771b94..e7a0771b94 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/theme-light.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/theme-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/theme-light@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/theme-light@2x.png
index 83bc878b03..83bc878b03 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/theme-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/theme-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/theme.svg b/examples/quickcontrols/wearable/qml/Settings/images/theme.svg
index bf3f1e57d7..bf3f1e57d7 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/theme.svg
+++ b/examples/quickcontrols/wearable/qml/Settings/images/theme.svg
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark.png b/examples/quickcontrols/wearable/qml/Settings/images/wifi-dark.png
index 14bfe8f5c8..14bfe8f5c8 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/wifi-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/wifi-dark@2x.png
index b70d04290b..b70d04290b 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/wifi-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light.png b/examples/quickcontrols/wearable/qml/Settings/images/wifi-light.png
index 2de34118a7..2de34118a7 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/wifi-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light@2x.png b/examples/quickcontrols/wearable/qml/Settings/images/wifi-light@2x.png
index 64b5f1725c..64b5f1725c 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Settings/images/wifi-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml b/examples/quickcontrols/wearable/qml/Style/PageIndicator.qml
index 593b50afb5..593b50afb5 100644
--- a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
+++ b/examples/quickcontrols/wearable/qml/Style/PageIndicator.qml
diff --git a/examples/quickcontrols2/wearable/qml/Style/Slider.qml b/examples/quickcontrols/wearable/qml/Style/Slider.qml
index 79c664280f..79c664280f 100644
--- a/examples/quickcontrols2/wearable/qml/Style/Slider.qml
+++ b/examples/quickcontrols/wearable/qml/Style/Slider.qml
diff --git a/examples/quickcontrols2/wearable/qml/Style/Switch.qml b/examples/quickcontrols/wearable/qml/Style/Switch.qml
index 6219bf231e..6219bf231e 100644
--- a/examples/quickcontrols2/wearable/qml/Style/Switch.qml
+++ b/examples/quickcontrols/wearable/qml/Style/Switch.qml
diff --git a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml b/examples/quickcontrols/wearable/qml/Style/UIStyle.qml
index 524b8394f5..524b8394f5 100644
--- a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml
+++ b/examples/quickcontrols/wearable/qml/Style/UIStyle.qml
diff --git a/examples/quickcontrols2/wearable/qml/Style/qmldir b/examples/quickcontrols/wearable/qml/Style/qmldir
index a04072bed6..a04072bed6 100644
--- a/examples/quickcontrols2/wearable/qml/Style/qmldir
+++ b/examples/quickcontrols/wearable/qml/Style/qmldir
diff --git a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml b/examples/quickcontrols/wearable/qml/SwipeViewPage.qml
index 1f005363dc..1f005363dc 100644
--- a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml
+++ b/examples/quickcontrols/wearable/qml/SwipeViewPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml b/examples/quickcontrols/wearable/qml/Weather/WeatherPage.qml
index d110fabdf9..d110fabdf9 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
+++ b/examples/quickcontrols/wearable/qml/Weather/WeatherPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png b/examples/quickcontrols/wearable/qml/Weather/images/humidity-dark.png
index 5d82238cdb..5d82238cdb 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/humidity-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/humidity-dark@2x.png
index d83bb4f00c..d83bb4f00c 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/humidity-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png b/examples/quickcontrols/wearable/qml/Weather/images/humidity-light.png
index 5f3bf714e6..5f3bf714e6 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/humidity-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/humidity-light@2x.png
index a23364c52c..a23364c52c 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/humidity-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png b/examples/quickcontrols/wearable/qml/Weather/images/pressure-dark.png
index b2870a55a6..b2870a55a6 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/pressure-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/pressure-dark@2x.png
index 061f9b8266..061f9b8266 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/pressure-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png b/examples/quickcontrols/wearable/qml/Weather/images/pressure-light.png
index 7b1b158734..7b1b158734 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/pressure-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/pressure-light@2x.png
index 1a40c6422a..1a40c6422a 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/pressure-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png b/examples/quickcontrols/wearable/qml/Weather/images/sunrise-dark.png
index 9cac22e1e1..9cac22e1e1 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/sunrise-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/sunrise-dark@2x.png
index fe32682386b..fe32682386b 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/sunrise-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png b/examples/quickcontrols/wearable/qml/Weather/images/sunrise-light.png
index f67a5dff34..f67a5dff34 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/sunrise-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/sunrise-light@2x.png
index 86f5483761..86f5483761 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/sunrise-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png b/examples/quickcontrols/wearable/qml/Weather/images/sunset-dark.png
index 0068d30539..0068d30539 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/sunset-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/sunset-dark@2x.png
index e515bcc37c..e515bcc37c 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/sunset-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png b/examples/quickcontrols/wearable/qml/Weather/images/sunset-light.png
index 495f78a786..495f78a786 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/sunset-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/sunset-light@2x.png
index d220e829d1..d220e829d1 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/sunset-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png b/examples/quickcontrols/wearable/qml/Weather/images/temperature-dark.png
index a207d9440d..a207d9440d 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/temperature-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/temperature-dark@2x.png
index c0e4ef39bf..c0e4ef39bf 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/temperature-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png b/examples/quickcontrols/wearable/qml/Weather/images/temperature-light.png
index c4f7b61c2e..c4f7b61c2e 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/temperature-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/temperature-light@2x.png
index 50d4f4c43c..50d4f4c43c 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/temperature-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png b/examples/quickcontrols/wearable/qml/Weather/images/wind-dark.png
index 6a530491af..6a530491af 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/wind-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/wind-dark@2x.png
index 487e3e78a3..487e3e78a3 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/wind-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png b/examples/quickcontrols/wearable/qml/Weather/images/wind-light.png
index 97824bee8f..97824bee8f 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/wind-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png b/examples/quickcontrols/wearable/qml/Weather/images/wind-light@2x.png
index 7f94bd8542..7f94bd8542 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png
+++ b/examples/quickcontrols/wearable/qml/Weather/images/wind-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Weather/weather.js b/examples/quickcontrols/wearable/qml/Weather/weather.js
index c08fd96e9e..c08fd96e9e 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/weather.js
+++ b/examples/quickcontrols/wearable/qml/Weather/weather.js
diff --git a/examples/quickcontrols2/wearable/qml/Weather/weather.json b/examples/quickcontrols/wearable/qml/Weather/weather.json
index 2cce95c60b..2cce95c60b 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/weather.json
+++ b/examples/quickcontrols/wearable/qml/Weather/weather.json
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml b/examples/quickcontrols/wearable/qml/WorldClock/Clock.qml
index e89489b045..e89489b045 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
+++ b/examples/quickcontrols/wearable/qml/WorldClock/Clock.qml
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml b/examples/quickcontrols/wearable/qml/WorldClock/WorldClockPage.qml
index 34a51da5cf..34a51da5cf 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
+++ b/examples/quickcontrols/wearable/qml/WorldClock/WorldClockPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/center.png b/examples/quickcontrols/wearable/qml/WorldClock/images/center.png
index 0dec43a0aa..0dec43a0aa 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/center.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/center.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/center@2x.png b/examples/quickcontrols/wearable/qml/WorldClock/images/center@2x.png
index dffc5d60e4..dffc5d60e4 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/center@2x.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/center@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/clock-night.png b/examples/quickcontrols/wearable/qml/WorldClock/images/clock-night.png
index 2de330243a..2de330243a 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/clock-night.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/clock-night.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/clock-night@2x.png b/examples/quickcontrols/wearable/qml/WorldClock/images/clock-night@2x.png
index f675acea69..f675acea69 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/clock-night@2x.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/clock-night@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/clock.png b/examples/quickcontrols/wearable/qml/WorldClock/images/clock.png
index 686fb8c2f7..686fb8c2f7 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/clock.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/clock.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/second.png b/examples/quickcontrols/wearable/qml/WorldClock/images/second.png
index 1e64f357df..1e64f357df 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/second.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/second.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/second@2x.png b/examples/quickcontrols/wearable/qml/WorldClock/images/second@2x.png
index cebc1deb06..cebc1deb06 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/second@2x.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/second@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdaydial.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdaydial.png
index 0e6321537a..0e6321537a 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdaydial.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdaydial.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdaydial@2x.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdaydial@2x.png
index ed5de8c646..ed5de8c646 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdaydial@2x.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdaydial@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayhour.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayhour.png
index 4a835ac3f0..4a835ac3f0 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayhour.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayhour.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayhour@2x.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayhour@2x.png
index 70f3fa0eee..70f3fa0eee 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayhour@2x.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayhour@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayminute.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayminute.png
index 048acc7b3f..048acc7b3f 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayminute.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayminute.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayminute@2x.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayminute@2x.png
index 4cc6ce64b4..4cc6ce64b4 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayminute@2x.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayminute@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightdial.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightdial.png
index ee5a15bb9b..ee5a15bb9b 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightdial.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightdial.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightdial@2x.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightdial@2x.png
index ec7e5c77dc..ec7e5c77dc 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightdial@2x.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightdial@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnighthour.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnighthour.png
index c5b41cb043..c5b41cb043 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnighthour.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnighthour.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnighthour@2x.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnighthour@2x.png
index bbbc36f1d7..bbbc36f1d7 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnighthour@2x.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnighthour@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightminute.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightminute.png
index 026c742446..026c742446 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightminute.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightminute.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightminute@2x.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightminute@2x.png
index 8ad69047a4..8ad69047a4 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightminute@2x.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightminute@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissseconds.png b/examples/quickcontrols/wearable/qml/WorldClock/images/swissseconds.png
index 06446ac0fe..06446ac0fe 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/images/swissseconds.png
+++ b/examples/quickcontrols/wearable/qml/WorldClock/images/swissseconds.png
diff --git a/examples/quickcontrols2/wearable/wearable.cpp b/examples/quickcontrols/wearable/wearable.cpp
index 861d4b7610..861d4b7610 100644
--- a/examples/quickcontrols2/wearable/wearable.cpp
+++ b/examples/quickcontrols/wearable/wearable.cpp
diff --git a/examples/quickcontrols2/wearable/wearable.pro b/examples/quickcontrols/wearable/wearable.pro
index 8d55e44eaa..8d55e44eaa 100644
--- a/examples/quickcontrols2/wearable/wearable.pro
+++ b/examples/quickcontrols/wearable/wearable.pro
diff --git a/examples/quickcontrols2/wearable/wearable.qml b/examples/quickcontrols/wearable/wearable.qml
index 27887354dc..27887354dc 100644
--- a/examples/quickcontrols2/wearable/wearable.qml
+++ b/examples/quickcontrols/wearable/wearable.qml
diff --git a/examples/quickcontrols2/wearable/wearable.qrc b/examples/quickcontrols/wearable/wearable.qrc
index db59d038f6..db59d038f6 100644
--- a/examples/quickcontrols2/wearable/wearable.qrc
+++ b/examples/quickcontrols/wearable/wearable.qrc
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake
index cd9d4a1311..2fc41a5f66 100644
--- a/qt_cmdline.cmake
+++ b/qt_cmdline.cmake
@@ -4,5 +4,5 @@
 qt_commandline_subconfig(src/qml)
 qt_commandline_subconfig(src/qmlmodels)
 qt_commandline_subconfig(src/quick)
-qt_commandline_subconfig(src/quickcontrols2)
-qt_commandline_subconfig(src/quicktemplates2)
+qt_commandline_subconfig(src/quickcontrols)
+qt_commandline_subconfig(src/quicktemplates)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c49d7a97e..0852679a3e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,10 +49,10 @@ if(TARGET Qt::Gui AND TARGET Qt::qsb AND QT_FEATURE_qml_animation)
         add_subdirectory(quickwidgets)
     endif()
 
-    add_subdirectory(quicktemplates2)
-    add_subdirectory(quickcontrols2impl)
-    add_subdirectory(quickcontrols2)
-    add_subdirectory(quickdialogs2)
+    add_subdirectory(quicktemplates)
+    add_subdirectory(quickcontrolsimpl)
+    add_subdirectory(quickcontrols)
+    add_subdirectory(quickdialogs)
     add_subdirectory(quicknativestyle)
 
     if(QT_FEATURE_testlib AND TARGET Qt::Test AND TARGET Qt::QuickControls2)
diff --git a/src/core/qqmlsettings.cpp b/src/core/qqmlsettings.cpp
index a5dc81e335..1b4481cfc7 100644
--- a/src/core/qqmlsettings.cpp
+++ b/src/core/qqmlsettings.cpp
@@ -173,9 +173,9 @@ QT_BEGIN_NAMESPACE
     It's often useful to have settings available to every QML file as a
     singleton. For an example of this, see the
     \l {Qt Quick Controls - To Do List}{To Do List example}. Specifically,
-    \l {https://code.qt.io/cgit/qt/qtdeclarative.git/tree/examples/quickcontrols2/ios/todolist/AppSettings.qml}
+    \l {https://code.qt.io/cgit/qt/qtdeclarative.git/tree/examples/quickcontrols/ios/todolist/AppSettings.qml}
     {AppSettings.qml} is the singleton, and in the
-    \l {https://code.qt.io/cgit/qt/qtdeclarative.git/tree/examples/quickcontrols2/ios/todolist/CMakeLists.txt}
+    \l {https://code.qt.io/cgit/qt/qtdeclarative.git/tree/examples/quickcontrols/ios/todolist/CMakeLists.txt}
     {CMakeLists.txt file},
     the \c QT_QML_SINGLETON_TYPE property is set to \c TRUE for that file via
     \c set_source_files_properties.
diff --git a/src/quickcontrols2/CMakeLists.txt b/src/quickcontrols/CMakeLists.txt
index 24a2ca8ca2..24a2ca8ca2 100644
--- a/src/quickcontrols2/CMakeLists.txt
+++ b/src/quickcontrols/CMakeLists.txt
diff --git a/src/quickcontrols2/basic/AbstractButton.qml b/src/quickcontrols/basic/AbstractButton.qml
index 82105f3f81..82105f3f81 100644
--- a/src/quickcontrols2/basic/AbstractButton.qml
+++ b/src/quickcontrols/basic/AbstractButton.qml
diff --git a/src/quickcontrols2/basic/Action.qml b/src/quickcontrols/basic/Action.qml
index aa360f0aa7..aa360f0aa7 100644
--- a/src/quickcontrols2/basic/Action.qml
+++ b/src/quickcontrols/basic/Action.qml
diff --git a/src/quickcontrols2/basic/ActionGroup.qml b/src/quickcontrols/basic/ActionGroup.qml
index 8ab1495d32..8ab1495d32 100644
--- a/src/quickcontrols2/basic/ActionGroup.qml
+++ b/src/quickcontrols/basic/ActionGroup.qml
diff --git a/src/quickcontrols2/basic/ApplicationWindow.qml b/src/quickcontrols/basic/ApplicationWindow.qml
index d64a87c99d..d64a87c99d 100644
--- a/src/quickcontrols2/basic/ApplicationWindow.qml
+++ b/src/quickcontrols/basic/ApplicationWindow.qml
diff --git a/src/quickcontrols2/basic/BusyIndicator.qml b/src/quickcontrols/basic/BusyIndicator.qml
index 2276f5a002..2276f5a002 100644
--- a/src/quickcontrols2/basic/BusyIndicator.qml
+++ b/src/quickcontrols/basic/BusyIndicator.qml
diff --git a/src/quickcontrols2/basic/Button.qml b/src/quickcontrols/basic/Button.qml
index cc02c2d7cd..cc02c2d7cd 100644
--- a/src/quickcontrols2/basic/Button.qml
+++ b/src/quickcontrols/basic/Button.qml
diff --git a/src/quickcontrols2/basic/ButtonGroup.qml b/src/quickcontrols/basic/ButtonGroup.qml
index 9c615a0286..9c615a0286 100644
--- a/src/quickcontrols2/basic/ButtonGroup.qml
+++ b/src/quickcontrols/basic/ButtonGroup.qml
diff --git a/src/quickcontrols2/basic/CMakeLists.txt b/src/quickcontrols/basic/CMakeLists.txt
index e45b6d09c0..e45b6d09c0 100644
--- a/src/quickcontrols2/basic/CMakeLists.txt
+++ b/src/quickcontrols/basic/CMakeLists.txt
diff --git a/src/quickcontrols2/basic/Calendar.qml b/src/quickcontrols/basic/Calendar.qml
index 66d03afc09..66d03afc09 100644
--- a/src/quickcontrols2/basic/Calendar.qml
+++ b/src/quickcontrols/basic/Calendar.qml
diff --git a/src/quickcontrols2/basic/CalendarModel.qml b/src/quickcontrols/basic/CalendarModel.qml
index 0f18f62aee..0f18f62aee 100644
--- a/src/quickcontrols2/basic/CalendarModel.qml
+++ b/src/quickcontrols/basic/CalendarModel.qml
diff --git a/src/quickcontrols2/basic/CheckBox.qml b/src/quickcontrols/basic/CheckBox.qml
index 3d71008b50..3d71008b50 100644
--- a/src/quickcontrols2/basic/CheckBox.qml
+++ b/src/quickcontrols/basic/CheckBox.qml
diff --git a/src/quickcontrols2/basic/CheckDelegate.qml b/src/quickcontrols/basic/CheckDelegate.qml
index 59e1543265..59e1543265 100644
--- a/src/quickcontrols2/basic/CheckDelegate.qml
+++ b/src/quickcontrols/basic/CheckDelegate.qml
diff --git a/src/quickcontrols2/basic/ComboBox.qml b/src/quickcontrols/basic/ComboBox.qml
index 8cd148e9fe..8cd148e9fe 100644
--- a/src/quickcontrols2/basic/ComboBox.qml
+++ b/src/quickcontrols/basic/ComboBox.qml
diff --git a/src/quickcontrols2/basic/Container.qml b/src/quickcontrols/basic/Container.qml
index 28e50279f0..28e50279f0 100644
--- a/src/quickcontrols2/basic/Container.qml
+++ b/src/quickcontrols/basic/Container.qml
diff --git a/src/quickcontrols2/basic/Control.qml b/src/quickcontrols/basic/Control.qml
index 20b27136db..20b27136db 100644
--- a/src/quickcontrols2/basic/Control.qml
+++ b/src/quickcontrols/basic/Control.qml
diff --git a/src/quickcontrols2/basic/DayOfWeekRow.qml b/src/quickcontrols/basic/DayOfWeekRow.qml
index 0de64264ba..0de64264ba 100644
--- a/src/quickcontrols2/basic/DayOfWeekRow.qml
+++ b/src/quickcontrols/basic/DayOfWeekRow.qml
diff --git a/src/quickcontrols2/basic/DelayButton.qml b/src/quickcontrols/basic/DelayButton.qml
index 1be4450c69..1be4450c69 100644
--- a/src/quickcontrols2/basic/DelayButton.qml
+++ b/src/quickcontrols/basic/DelayButton.qml
diff --git a/src/quickcontrols2/basic/Dial.qml b/src/quickcontrols/basic/Dial.qml
index 3692ae22de..3692ae22de 100644
--- a/src/quickcontrols2/basic/Dial.qml
+++ b/src/quickcontrols/basic/Dial.qml
diff --git a/src/quickcontrols2/basic/Dialog.qml b/src/quickcontrols/basic/Dialog.qml
index c4c59b27fb..c4c59b27fb 100644
--- a/src/quickcontrols2/basic/Dialog.qml
+++ b/src/quickcontrols/basic/Dialog.qml
diff --git a/src/quickcontrols2/basic/DialogButtonBox.qml b/src/quickcontrols/basic/DialogButtonBox.qml
index 89fca1e41d..89fca1e41d 100644
--- a/src/quickcontrols2/basic/DialogButtonBox.qml
+++ b/src/quickcontrols/basic/DialogButtonBox.qml
diff --git a/src/quickcontrols2/basic/Drawer.qml b/src/quickcontrols/basic/Drawer.qml
index c69d319e92..c69d319e92 100644
--- a/src/quickcontrols2/basic/Drawer.qml
+++ b/src/quickcontrols/basic/Drawer.qml
diff --git a/src/quickcontrols2/basic/Frame.qml b/src/quickcontrols/basic/Frame.qml
index d1ecc4b9df..d1ecc4b9df 100644
--- a/src/quickcontrols2/basic/Frame.qml
+++ b/src/quickcontrols/basic/Frame.qml
diff --git a/src/quickcontrols2/basic/GroupBox.qml b/src/quickcontrols/basic/GroupBox.qml
index 510acf1586..510acf1586 100644
--- a/src/quickcontrols2/basic/GroupBox.qml
+++ b/src/quickcontrols/basic/GroupBox.qml
diff --git a/src/quickcontrols2/basic/HorizontalHeaderView.qml b/src/quickcontrols/basic/HorizontalHeaderView.qml
index 140c9f3ae8..140c9f3ae8 100644
--- a/src/quickcontrols2/basic/HorizontalHeaderView.qml
+++ b/src/quickcontrols/basic/HorizontalHeaderView.qml
diff --git a/src/quickcontrols2/basic/ItemDelegate.qml b/src/quickcontrols/basic/ItemDelegate.qml
index 7bef49d6d6..7bef49d6d6 100644
--- a/src/quickcontrols2/basic/ItemDelegate.qml
+++ b/src/quickcontrols/basic/ItemDelegate.qml
diff --git a/src/quickcontrols2/basic/Label.qml b/src/quickcontrols/basic/Label.qml
index e3274142c2..e3274142c2 100644
--- a/src/quickcontrols2/basic/Label.qml
+++ b/src/quickcontrols/basic/Label.qml
diff --git a/src/quickcontrols2/basic/Menu.qml b/src/quickcontrols/basic/Menu.qml
index fd21f5de5b..fd21f5de5b 100644
--- a/src/quickcontrols2/basic/Menu.qml
+++ b/src/quickcontrols/basic/Menu.qml
diff --git a/src/quickcontrols2/basic/MenuBar.qml b/src/quickcontrols/basic/MenuBar.qml
index c0d4bda60d..c0d4bda60d 100644
--- a/src/quickcontrols2/basic/MenuBar.qml
+++ b/src/quickcontrols/basic/MenuBar.qml
diff --git a/src/quickcontrols2/basic/MenuBarItem.qml b/src/quickcontrols/basic/MenuBarItem.qml
index 9362d26c15..9362d26c15 100644
--- a/src/quickcontrols2/basic/MenuBarItem.qml
+++ b/src/quickcontrols/basic/MenuBarItem.qml
diff --git a/src/quickcontrols2/basic/MenuItem.qml b/src/quickcontrols/basic/MenuItem.qml
index ad50eacad9..ad50eacad9 100644
--- a/src/quickcontrols2/basic/MenuItem.qml
+++ b/src/quickcontrols/basic/MenuItem.qml
diff --git a/src/quickcontrols2/basic/MenuSeparator.qml b/src/quickcontrols/basic/MenuSeparator.qml
index ff7e79e784..ff7e79e784 100644
--- a/src/quickcontrols2/basic/MenuSeparator.qml
+++ b/src/quickcontrols/basic/MenuSeparator.qml
diff --git a/src/quickcontrols2/basic/MonthGrid.qml b/src/quickcontrols/basic/MonthGrid.qml
index b8d2379bcf..b8d2379bcf 100644
--- a/src/quickcontrols2/basic/MonthGrid.qml
+++ b/src/quickcontrols/basic/MonthGrid.qml
diff --git a/src/quickcontrols2/basic/Page.qml b/src/quickcontrols/basic/Page.qml
index b6d503e65d..b6d503e65d 100644
--- a/src/quickcontrols2/basic/Page.qml
+++ b/src/quickcontrols/basic/Page.qml
diff --git a/src/quickcontrols2/basic/PageIndicator.qml b/src/quickcontrols/basic/PageIndicator.qml
index e858695d0c..e858695d0c 100644
--- a/src/quickcontrols2/basic/PageIndicator.qml
+++ b/src/quickcontrols/basic/PageIndicator.qml
diff --git a/src/quickcontrols2/basic/Pane.qml b/src/quickcontrols/basic/Pane.qml
index 46e15e2966..46e15e2966 100644
--- a/src/quickcontrols2/basic/Pane.qml
+++ b/src/quickcontrols/basic/Pane.qml
diff --git a/src/quickcontrols2/basic/Popup.qml b/src/quickcontrols/basic/Popup.qml
index f4b787c311..f4b787c311 100644
--- a/src/quickcontrols2/basic/Popup.qml
+++ b/src/quickcontrols/basic/Popup.qml
diff --git a/src/quickcontrols2/basic/ProgressBar.qml b/src/quickcontrols/basic/ProgressBar.qml
index 09ab1fb2c1..09ab1fb2c1 100644
--- a/src/quickcontrols2/basic/ProgressBar.qml
+++ b/src/quickcontrols/basic/ProgressBar.qml
diff --git a/src/quickcontrols2/basic/RadioButton.qml b/src/quickcontrols/basic/RadioButton.qml
index 7b3f4063e1..7b3f4063e1 100644
--- a/src/quickcontrols2/basic/RadioButton.qml
+++ b/src/quickcontrols/basic/RadioButton.qml
diff --git a/src/quickcontrols2/basic/RadioDelegate.qml b/src/quickcontrols/basic/RadioDelegate.qml
index 87e6e66b29..87e6e66b29 100644
--- a/src/quickcontrols2/basic/RadioDelegate.qml
+++ b/src/quickcontrols/basic/RadioDelegate.qml
diff --git a/src/quickcontrols2/basic/RangeSlider.qml b/src/quickcontrols/basic/RangeSlider.qml
index 155807da8d..155807da8d 100644
--- a/src/quickcontrols2/basic/RangeSlider.qml
+++ b/src/quickcontrols/basic/RangeSlider.qml
diff --git a/src/quickcontrols2/basic/RoundButton.qml b/src/quickcontrols/basic/RoundButton.qml
index 7e7bd039b0..7e7bd039b0 100644
--- a/src/quickcontrols2/basic/RoundButton.qml
+++ b/src/quickcontrols/basic/RoundButton.qml
diff --git a/src/quickcontrols2/basic/ScrollBar.qml b/src/quickcontrols/basic/ScrollBar.qml
index 8927a4f13f..8927a4f13f 100644
--- a/src/quickcontrols2/basic/ScrollBar.qml
+++ b/src/quickcontrols/basic/ScrollBar.qml
diff --git a/src/quickcontrols2/basic/ScrollIndicator.qml b/src/quickcontrols/basic/ScrollIndicator.qml
index 8b1ca93c26..8b1ca93c26 100644
--- a/src/quickcontrols2/basic/ScrollIndicator.qml
+++ b/src/quickcontrols/basic/ScrollIndicator.qml
diff --git a/src/quickcontrols2/basic/ScrollView.qml b/src/quickcontrols/basic/ScrollView.qml
index aab91a3bcc..aab91a3bcc 100644
--- a/src/quickcontrols2/basic/ScrollView.qml
+++ b/src/quickcontrols/basic/ScrollView.qml
diff --git a/src/quickcontrols2/basic/SelectionRectangle.qml b/src/quickcontrols/basic/SelectionRectangle.qml
index 8e16d10418..8e16d10418 100644
--- a/src/quickcontrols2/basic/SelectionRectangle.qml
+++ b/src/quickcontrols/basic/SelectionRectangle.qml
diff --git a/src/quickcontrols2/basic/Slider.qml b/src/quickcontrols/basic/Slider.qml
index 7ca8e02bf1..7ca8e02bf1 100644
--- a/src/quickcontrols2/basic/Slider.qml
+++ b/src/quickcontrols/basic/Slider.qml
diff --git a/src/quickcontrols2/basic/SpinBox.qml b/src/quickcontrols/basic/SpinBox.qml
index 758472c5cb..758472c5cb 100644
--- a/src/quickcontrols2/basic/SpinBox.qml
+++ b/src/quickcontrols/basic/SpinBox.qml
diff --git a/src/quickcontrols2/basic/SplitView.qml b/src/quickcontrols/basic/SplitView.qml
index 6d673b55b7..6d673b55b7 100644
--- a/src/quickcontrols2/basic/SplitView.qml
+++ b/src/quickcontrols/basic/SplitView.qml
diff --git a/src/quickcontrols2/basic/StackView.qml b/src/quickcontrols/basic/StackView.qml
index 689d7ff9ca..689d7ff9ca 100644
--- a/src/quickcontrols2/basic/StackView.qml
+++ b/src/quickcontrols/basic/StackView.qml
diff --git a/src/quickcontrols2/basic/SwipeDelegate.qml b/src/quickcontrols/basic/SwipeDelegate.qml
index 552f34dc01..552f34dc01 100644
--- a/src/quickcontrols2/basic/SwipeDelegate.qml
+++ b/src/quickcontrols/basic/SwipeDelegate.qml
diff --git a/src/quickcontrols2/basic/SwipeView.qml b/src/quickcontrols/basic/SwipeView.qml
index b0068fd301..b0068fd301 100644
--- a/src/quickcontrols2/basic/SwipeView.qml
+++ b/src/quickcontrols/basic/SwipeView.qml
diff --git a/src/quickcontrols2/basic/Switch.qml b/src/quickcontrols/basic/Switch.qml
index d299ea3748..d299ea3748 100644
--- a/src/quickcontrols2/basic/Switch.qml
+++ b/src/quickcontrols/basic/Switch.qml
diff --git a/src/quickcontrols2/basic/SwitchDelegate.qml b/src/quickcontrols/basic/SwitchDelegate.qml
index 98392557ad..98392557ad 100644
--- a/src/quickcontrols2/basic/SwitchDelegate.qml
+++ b/src/quickcontrols/basic/SwitchDelegate.qml
diff --git a/src/quickcontrols2/basic/TabBar.qml b/src/quickcontrols/basic/TabBar.qml
index f8bdb91460..f8bdb91460 100644
--- a/src/quickcontrols2/basic/TabBar.qml
+++ b/src/quickcontrols/basic/TabBar.qml
diff --git a/src/quickcontrols2/basic/TabButton.qml b/src/quickcontrols/basic/TabButton.qml
index 071048dce5..071048dce5 100644
--- a/src/quickcontrols2/basic/TabButton.qml
+++ b/src/quickcontrols/basic/TabButton.qml
diff --git a/src/quickcontrols2/basic/TextArea.qml b/src/quickcontrols/basic/TextArea.qml
index 0dc7c4558e..0dc7c4558e 100644
--- a/src/quickcontrols2/basic/TextArea.qml
+++ b/src/quickcontrols/basic/TextArea.qml
diff --git a/src/quickcontrols2/basic/TextField.qml b/src/quickcontrols/basic/TextField.qml
index cf542a6886..cf542a6886 100644
--- a/src/quickcontrols2/basic/TextField.qml
+++ b/src/quickcontrols/basic/TextField.qml
diff --git a/src/quickcontrols2/basic/ToolBar.qml b/src/quickcontrols/basic/ToolBar.qml
index 6ef70bc99c..6ef70bc99c 100644
--- a/src/quickcontrols2/basic/ToolBar.qml
+++ b/src/quickcontrols/basic/ToolBar.qml
diff --git a/src/quickcontrols2/basic/ToolButton.qml b/src/quickcontrols/basic/ToolButton.qml
index e4bc90d665..e4bc90d665 100644
--- a/src/quickcontrols2/basic/ToolButton.qml
+++ b/src/quickcontrols/basic/ToolButton.qml
diff --git a/src/quickcontrols2/basic/ToolSeparator.qml b/src/quickcontrols/basic/ToolSeparator.qml
index 2d2cefcdf4..2d2cefcdf4 100644
--- a/src/quickcontrols2/basic/ToolSeparator.qml
+++ b/src/quickcontrols/basic/ToolSeparator.qml
diff --git a/src/quickcontrols2/basic/ToolTip.qml b/src/quickcontrols/basic/ToolTip.qml
index 6d71f55db3..6d71f55db3 100644
--- a/src/quickcontrols2/basic/ToolTip.qml
+++ b/src/quickcontrols/basic/ToolTip.qml
diff --git a/src/quickcontrols2/basic/TreeViewDelegate.qml b/src/quickcontrols/basic/TreeViewDelegate.qml
index fc9a072c43..fc9a072c43 100644
--- a/src/quickcontrols2/basic/TreeViewDelegate.qml
+++ b/src/quickcontrols/basic/TreeViewDelegate.qml
diff --git a/src/quickcontrols2/basic/Tumbler.qml b/src/quickcontrols/basic/Tumbler.qml
index d3d1254fea..d3d1254fea 100644
--- a/src/quickcontrols2/basic/Tumbler.qml
+++ b/src/quickcontrols/basic/Tumbler.qml
diff --git a/src/quickcontrols2/basic/VerticalHeaderView.qml b/src/quickcontrols/basic/VerticalHeaderView.qml
index a59e228d20..a59e228d20 100644
--- a/src/quickcontrols2/basic/VerticalHeaderView.qml
+++ b/src/quickcontrols/basic/VerticalHeaderView.qml
diff --git a/src/quickcontrols2/basic/WeekNumberColumn.qml b/src/quickcontrols/basic/WeekNumberColumn.qml
index e5ce90bf3c..e5ce90bf3c 100644
--- a/src/quickcontrols2/basic/WeekNumberColumn.qml
+++ b/src/quickcontrols/basic/WeekNumberColumn.qml
diff --git a/src/quickcontrols2/basic/images/arrow-indicator.png b/src/quickcontrols/basic/images/arrow-indicator.png
index d833d52c40..d833d52c40 100644
--- a/src/quickcontrols2/basic/images/arrow-indicator.png
+++ b/src/quickcontrols/basic/images/arrow-indicator.png
diff --git a/src/quickcontrols2/basic/images/arrow-indicator@2x.png b/src/quickcontrols/basic/images/arrow-indicator@2x.png
index 55c7940a51..55c7940a51 100644
--- a/src/quickcontrols2/basic/images/arrow-indicator@2x.png
+++ b/src/quickcontrols/basic/images/arrow-indicator@2x.png
diff --git a/src/quickcontrols2/basic/images/arrow-indicator@3x.png b/src/quickcontrols/basic/images/arrow-indicator@3x.png
index c7067c5cd0..c7067c5cd0 100644
--- a/src/quickcontrols2/basic/images/arrow-indicator@3x.png
+++ b/src/quickcontrols/basic/images/arrow-indicator@3x.png
diff --git a/src/quickcontrols2/basic/images/arrow-indicator@4x.png b/src/quickcontrols/basic/images/arrow-indicator@4x.png
index 4c5cf3515a..4c5cf3515a 100644
--- a/src/quickcontrols2/basic/images/arrow-indicator@4x.png
+++ b/src/quickcontrols/basic/images/arrow-indicator@4x.png
diff --git a/src/quickcontrols2/basic/images/check.png b/src/quickcontrols/basic/images/check.png
index 479a84428d..479a84428d 100644
--- a/src/quickcontrols2/basic/images/check.png
+++ b/src/quickcontrols/basic/images/check.png
diff --git a/src/quickcontrols2/basic/images/check@2x.png b/src/quickcontrols/basic/images/check@2x.png
index 79663c0b03..79663c0b03 100644
--- a/src/quickcontrols2/basic/images/check@2x.png
+++ b/src/quickcontrols/basic/images/check@2x.png
diff --git a/src/quickcontrols2/basic/images/check@3x.png b/src/quickcontrols/basic/images/check@3x.png
index fd0135abe2..fd0135abe2 100644
--- a/src/quickcontrols2/basic/images/check@3x.png
+++ b/src/quickcontrols/basic/images/check@3x.png
diff --git a/src/quickcontrols2/basic/images/check@4x.png b/src/quickcontrols/basic/images/check@4x.png
index e7e0b64044..e7e0b64044 100644
--- a/src/quickcontrols2/basic/images/check@4x.png
+++ b/src/quickcontrols/basic/images/check@4x.png
diff --git a/src/quickcontrols2/basic/images/dial-indicator.png b/src/quickcontrols/basic/images/dial-indicator.png
index 92357c51d4..92357c51d4 100644
--- a/src/quickcontrols2/basic/images/dial-indicator.png
+++ b/src/quickcontrols/basic/images/dial-indicator.png
diff --git a/src/quickcontrols2/basic/images/dial-indicator@2x.png b/src/quickcontrols/basic/images/dial-indicator@2x.png
index f436443b0a..f436443b0a 100644
--- a/src/quickcontrols2/basic/images/dial-indicator@2x.png
+++ b/src/quickcontrols/basic/images/dial-indicator@2x.png
diff --git a/src/quickcontrols2/basic/images/dial-indicator@3x.png b/src/quickcontrols/basic/images/dial-indicator@3x.png
index d883045bcb..d883045bcb 100644
--- a/src/quickcontrols2/basic/images/dial-indicator@3x.png
+++ b/src/quickcontrols/basic/images/dial-indicator@3x.png
diff --git a/src/quickcontrols2/basic/images/dial-indicator@4x.png b/src/quickcontrols/basic/images/dial-indicator@4x.png
index 794777128b..794777128b 100644
--- a/src/quickcontrols2/basic/images/dial-indicator@4x.png
+++ b/src/quickcontrols/basic/images/dial-indicator@4x.png
diff --git a/src/quickcontrols2/basic/images/double-arrow.png b/src/quickcontrols/basic/images/double-arrow.png
index 3ecd7f89f3..3ecd7f89f3 100644
--- a/src/quickcontrols2/basic/images/double-arrow.png
+++ b/src/quickcontrols/basic/images/double-arrow.png
diff --git a/src/quickcontrols2/basic/images/double-arrow@2x.png b/src/quickcontrols/basic/images/double-arrow@2x.png
index eeb03e2847..eeb03e2847 100644
--- a/src/quickcontrols2/basic/images/double-arrow@2x.png
+++ b/src/quickcontrols/basic/images/double-arrow@2x.png
diff --git a/src/quickcontrols2/basic/images/double-arrow@3x.png b/src/quickcontrols/basic/images/double-arrow@3x.png
index f0662d2026..f0662d2026 100644
--- a/src/quickcontrols2/basic/images/double-arrow@3x.png
+++ b/src/quickcontrols/basic/images/double-arrow@3x.png
diff --git a/src/quickcontrols2/basic/images/double-arrow@4x.png b/src/quickcontrols/basic/images/double-arrow@4x.png
index 10891e9133..10891e9133 100644
--- a/src/quickcontrols2/basic/images/double-arrow@4x.png
+++ b/src/quickcontrols/basic/images/double-arrow@4x.png
diff --git a/src/quickcontrols2/basic/images/drop-indicator.png b/src/quickcontrols/basic/images/drop-indicator.png
index 80c1d958e3..80c1d958e3 100644
--- a/src/quickcontrols2/basic/images/drop-indicator.png
+++ b/src/quickcontrols/basic/images/drop-indicator.png
diff --git a/src/quickcontrols2/basic/images/drop-indicator@2x.png b/src/quickcontrols/basic/images/drop-indicator@2x.png
index 6e0f228c54..6e0f228c54 100644
--- a/src/quickcontrols2/basic/images/drop-indicator@2x.png
+++ b/src/quickcontrols/basic/images/drop-indicator@2x.png
diff --git a/src/quickcontrols2/basic/images/drop-indicator@3x.png b/src/quickcontrols/basic/images/drop-indicator@3x.png
index 199752fbf8..199752fbf8 100644
--- a/src/quickcontrols2/basic/images/drop-indicator@3x.png
+++ b/src/quickcontrols/basic/images/drop-indicator@3x.png
diff --git a/src/quickcontrols2/basic/images/drop-indicator@4x.png b/src/quickcontrols/basic/images/drop-indicator@4x.png
index 58311fbe2a..58311fbe2a 100644
--- a/src/quickcontrols2/basic/images/drop-indicator@4x.png
+++ b/src/quickcontrols/basic/images/drop-indicator@4x.png
diff --git a/src/quickcontrols2/basic/impl/CMakeLists.txt b/src/quickcontrols/basic/impl/CMakeLists.txt
index ec79fafdda..ec79fafdda 100644
--- a/src/quickcontrols2/basic/impl/CMakeLists.txt
+++ b/src/quickcontrols/basic/impl/CMakeLists.txt
diff --git a/src/quickcontrols2/basic/impl/qquickbasicbusyindicator.cpp b/src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp
index 2acefa2bed..2acefa2bed 100644
--- a/src/quickcontrols2/basic/impl/qquickbasicbusyindicator.cpp
+++ b/src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp
diff --git a/src/quickcontrols2/basic/impl/qquickbasicbusyindicator_p.h b/src/quickcontrols/basic/impl/qquickbasicbusyindicator_p.h
index a39b61cde4..a39b61cde4 100644
--- a/src/quickcontrols2/basic/impl/qquickbasicbusyindicator_p.h
+++ b/src/quickcontrols/basic/impl/qquickbasicbusyindicator_p.h
diff --git a/src/quickcontrols2/basic/impl/qquickbasicdial.cpp b/src/quickcontrols/basic/impl/qquickbasicdial.cpp
index 8eb2b3840d..8eb2b3840d 100644
--- a/src/quickcontrols2/basic/impl/qquickbasicdial.cpp
+++ b/src/quickcontrols/basic/impl/qquickbasicdial.cpp
diff --git a/src/quickcontrols2/basic/impl/qquickbasicdial_p.h b/src/quickcontrols/basic/impl/qquickbasicdial_p.h
index 1406bf6906..1406bf6906 100644
--- a/src/quickcontrols2/basic/impl/qquickbasicdial_p.h
+++ b/src/quickcontrols/basic/impl/qquickbasicdial_p.h
diff --git a/src/quickcontrols2/basic/impl/qquickbasicprogressbar.cpp b/src/quickcontrols/basic/impl/qquickbasicprogressbar.cpp
index 4dbe04e4b1..4dbe04e4b1 100644
--- a/src/quickcontrols2/basic/impl/qquickbasicprogressbar.cpp
+++ b/src/quickcontrols/basic/impl/qquickbasicprogressbar.cpp
diff --git a/src/quickcontrols2/basic/impl/qquickbasicprogressbar_p.h b/src/quickcontrols/basic/impl/qquickbasicprogressbar_p.h
index 72b5521263..72b5521263 100644
--- a/src/quickcontrols2/basic/impl/qquickbasicprogressbar_p.h
+++ b/src/quickcontrols/basic/impl/qquickbasicprogressbar_p.h
diff --git a/src/quickcontrols2/basic/qquickbasicstyle.cpp b/src/quickcontrols/basic/qquickbasicstyle.cpp
index 7602cc7340..7602cc7340 100644
--- a/src/quickcontrols2/basic/qquickbasicstyle.cpp
+++ b/src/quickcontrols/basic/qquickbasicstyle.cpp
diff --git a/src/quickcontrols2/basic/qquickbasicstyle_p.h b/src/quickcontrols/basic/qquickbasicstyle_p.h
index f543d27e47..f543d27e47 100644
--- a/src/quickcontrols2/basic/qquickbasicstyle_p.h
+++ b/src/quickcontrols/basic/qquickbasicstyle_p.h
diff --git a/src/quickcontrols2/basic/qquickbasictheme.cpp b/src/quickcontrols/basic/qquickbasictheme.cpp
index 7884ad102e..7884ad102e 100644
--- a/src/quickcontrols2/basic/qquickbasictheme.cpp
+++ b/src/quickcontrols/basic/qquickbasictheme.cpp
diff --git a/src/quickcontrols2/basic/qquickbasictheme_p.h b/src/quickcontrols/basic/qquickbasictheme_p.h
index 710c57f074..710c57f074 100644
--- a/src/quickcontrols2/basic/qquickbasictheme_p.h
+++ b/src/quickcontrols/basic/qquickbasictheme_p.h
diff --git a/src/quickcontrols2/basic/qtquickcontrols2basicstyleplugin.cpp b/src/quickcontrols/basic/qtquickcontrols2basicstyleplugin.cpp
index 57c52fff27..57c52fff27 100644
--- a/src/quickcontrols2/basic/qtquickcontrols2basicstyleplugin.cpp
+++ b/src/quickcontrols/basic/qtquickcontrols2basicstyleplugin.cpp
diff --git a/src/quickcontrols2/configure.cmake b/src/quickcontrols/configure.cmake
index e713e73f7c..e713e73f7c 100644
--- a/src/quickcontrols2/configure.cmake
+++ b/src/quickcontrols/configure.cmake
diff --git a/src/quickcontrols2/designer/AbstractButtonSection.qml b/src/quickcontrols/designer/AbstractButtonSection.qml
index c7684c20d0..c7684c20d0 100644
--- a/src/quickcontrols2/designer/AbstractButtonSection.qml
+++ b/src/quickcontrols/designer/AbstractButtonSection.qml
diff --git a/src/quickcontrols2/designer/BusyIndicatorSpecifics.qml b/src/quickcontrols/designer/BusyIndicatorSpecifics.qml
index 8e0021fc71..8e0021fc71 100644
--- a/src/quickcontrols2/designer/BusyIndicatorSpecifics.qml
+++ b/src/quickcontrols/designer/BusyIndicatorSpecifics.qml
diff --git a/src/quickcontrols2/designer/ButtonSection.qml b/src/quickcontrols/designer/ButtonSection.qml
index d338bd2990..d338bd2990 100644
--- a/src/quickcontrols2/designer/ButtonSection.qml
+++ b/src/quickcontrols/designer/ButtonSection.qml
diff --git a/src/quickcontrols2/designer/ButtonSpecifics.qml b/src/quickcontrols/designer/ButtonSpecifics.qml
index 1de3c0a3c2..1de3c0a3c2 100644
--- a/src/quickcontrols2/designer/ButtonSpecifics.qml
+++ b/src/quickcontrols/designer/ButtonSpecifics.qml
diff --git a/src/quickcontrols2/designer/CMakeLists.txt b/src/quickcontrols/designer/CMakeLists.txt
index 5576d42bd3..5576d42bd3 100644
--- a/src/quickcontrols2/designer/CMakeLists.txt
+++ b/src/quickcontrols/designer/CMakeLists.txt
diff --git a/src/quickcontrols2/designer/CheckBoxSpecifics.qml b/src/quickcontrols/designer/CheckBoxSpecifics.qml
index 497a66858f..497a66858f 100644
--- a/src/quickcontrols2/designer/CheckBoxSpecifics.qml
+++ b/src/quickcontrols/designer/CheckBoxSpecifics.qml
diff --git a/src/quickcontrols2/designer/CheckDelegateSpecifics.qml b/src/quickcontrols/designer/CheckDelegateSpecifics.qml
index 2f959b86f5..2f959b86f5 100644
--- a/src/quickcontrols2/designer/CheckDelegateSpecifics.qml
+++ b/src/quickcontrols/designer/CheckDelegateSpecifics.qml
diff --git a/src/quickcontrols2/designer/CheckSection.qml b/src/quickcontrols/designer/CheckSection.qml
index b58d6a27ce..b58d6a27ce 100644
--- a/src/quickcontrols2/designer/CheckSection.qml
+++ b/src/quickcontrols/designer/CheckSection.qml
diff --git a/src/quickcontrols2/designer/ComboBoxSpecifics.qml b/src/quickcontrols/designer/ComboBoxSpecifics.qml
index 9700bc5fd9..9700bc5fd9 100644
--- a/src/quickcontrols2/designer/ComboBoxSpecifics.qml
+++ b/src/quickcontrols/designer/ComboBoxSpecifics.qml
diff --git a/src/quickcontrols2/designer/ContainerSection.qml b/src/quickcontrols/designer/ContainerSection.qml
index 93618cb5bf..93618cb5bf 100644
--- a/src/quickcontrols2/designer/ContainerSection.qml
+++ b/src/quickcontrols/designer/ContainerSection.qml
diff --git a/src/quickcontrols2/designer/ControlSection.qml b/src/quickcontrols/designer/ControlSection.qml
index c7f6283ea7..c7f6283ea7 100644
--- a/src/quickcontrols2/designer/ControlSection.qml
+++ b/src/quickcontrols/designer/ControlSection.qml
diff --git a/src/quickcontrols2/designer/ControlSpecifics.qml b/src/quickcontrols/designer/ControlSpecifics.qml
index c7c34a4ae1..c7c34a4ae1 100644
--- a/src/quickcontrols2/designer/ControlSpecifics.qml
+++ b/src/quickcontrols/designer/ControlSpecifics.qml
diff --git a/src/quickcontrols2/designer/DelayButtonSpecifics.qml b/src/quickcontrols/designer/DelayButtonSpecifics.qml
index 309075d2b7..309075d2b7 100644
--- a/src/quickcontrols2/designer/DelayButtonSpecifics.qml
+++ b/src/quickcontrols/designer/DelayButtonSpecifics.qml
diff --git a/src/quickcontrols2/designer/DialSpecifics.qml b/src/quickcontrols/designer/DialSpecifics.qml
index c0fd3df2ed..c0fd3df2ed 100644
--- a/src/quickcontrols2/designer/DialSpecifics.qml
+++ b/src/quickcontrols/designer/DialSpecifics.qml
diff --git a/src/quickcontrols2/designer/FrameSpecifics.qml b/src/quickcontrols/designer/FrameSpecifics.qml
index a7a0acaf4a..a7a0acaf4a 100644
--- a/src/quickcontrols2/designer/FrameSpecifics.qml
+++ b/src/quickcontrols/designer/FrameSpecifics.qml
diff --git a/src/quickcontrols2/designer/GroupBoxSpecifics.qml b/src/quickcontrols/designer/GroupBoxSpecifics.qml
index 29f826efff..29f826efff 100644
--- a/src/quickcontrols2/designer/GroupBoxSpecifics.qml
+++ b/src/quickcontrols/designer/GroupBoxSpecifics.qml
diff --git a/src/quickcontrols2/designer/InsetSection.qml b/src/quickcontrols/designer/InsetSection.qml
index 125cc011ef..125cc011ef 100644
--- a/src/quickcontrols2/designer/InsetSection.qml
+++ b/src/quickcontrols/designer/InsetSection.qml
diff --git a/src/quickcontrols2/designer/ItemDelegateSection.qml b/src/quickcontrols/designer/ItemDelegateSection.qml
index 1d6c45606a..1d6c45606a 100644
--- a/src/quickcontrols2/designer/ItemDelegateSection.qml
+++ b/src/quickcontrols/designer/ItemDelegateSection.qml
diff --git a/src/quickcontrols2/designer/ItemDelegateSpecifics.qml b/src/quickcontrols/designer/ItemDelegateSpecifics.qml
index e80bc01528..e80bc01528 100644
--- a/src/quickcontrols2/designer/ItemDelegateSpecifics.qml
+++ b/src/quickcontrols/designer/ItemDelegateSpecifics.qml
diff --git a/src/quickcontrols2/designer/LabelSpecifics.qml b/src/quickcontrols/designer/LabelSpecifics.qml
index 932922573a..932922573a 100644
--- a/src/quickcontrols2/designer/LabelSpecifics.qml
+++ b/src/quickcontrols/designer/LabelSpecifics.qml
diff --git a/src/quickcontrols2/designer/PaddingSection.qml b/src/quickcontrols/designer/PaddingSection.qml
index d921d2878f..d921d2878f 100644
--- a/src/quickcontrols2/designer/PaddingSection.qml
+++ b/src/quickcontrols/designer/PaddingSection.qml
diff --git a/src/quickcontrols2/designer/PageIndicatorSpecifics.qml b/src/quickcontrols/designer/PageIndicatorSpecifics.qml
index 65d9031025..65d9031025 100644
--- a/src/quickcontrols2/designer/PageIndicatorSpecifics.qml
+++ b/src/quickcontrols/designer/PageIndicatorSpecifics.qml
diff --git a/src/quickcontrols2/designer/PageSpecifics.qml b/src/quickcontrols/designer/PageSpecifics.qml
index c4b8027b69..c4b8027b69 100644
--- a/src/quickcontrols2/designer/PageSpecifics.qml
+++ b/src/quickcontrols/designer/PageSpecifics.qml
diff --git a/src/quickcontrols2/designer/PaneSection.qml b/src/quickcontrols/designer/PaneSection.qml
index 7710198f19..7710198f19 100644
--- a/src/quickcontrols2/designer/PaneSection.qml
+++ b/src/quickcontrols/designer/PaneSection.qml
diff --git a/src/quickcontrols2/designer/PaneSpecifics.qml b/src/quickcontrols/designer/PaneSpecifics.qml
index a7a0acaf4a..a7a0acaf4a 100644
--- a/src/quickcontrols2/designer/PaneSpecifics.qml
+++ b/src/quickcontrols/designer/PaneSpecifics.qml
diff --git a/src/quickcontrols2/designer/ProgressBarSpecifics.qml b/src/quickcontrols/designer/ProgressBarSpecifics.qml
index 9a604d4037..9a604d4037 100644
--- a/src/quickcontrols2/designer/ProgressBarSpecifics.qml
+++ b/src/quickcontrols/designer/ProgressBarSpecifics.qml
diff --git a/src/quickcontrols2/designer/RadioButtonSpecifics.qml b/src/quickcontrols/designer/RadioButtonSpecifics.qml
index ecfd4cf406..ecfd4cf406 100644
--- a/src/quickcontrols2/designer/RadioButtonSpecifics.qml
+++ b/src/quickcontrols/designer/RadioButtonSpecifics.qml
diff --git a/src/quickcontrols2/designer/RadioDelegateSpecifics.qml b/src/quickcontrols/designer/RadioDelegateSpecifics.qml
index e80bc01528..e80bc01528 100644
--- a/src/quickcontrols2/designer/RadioDelegateSpecifics.qml
+++ b/src/quickcontrols/designer/RadioDelegateSpecifics.qml
diff --git a/src/quickcontrols2/designer/RangeSliderSpecifics.qml b/src/quickcontrols/designer/RangeSliderSpecifics.qml
index cb66eec393..cb66eec393 100644
--- a/src/quickcontrols2/designer/RangeSliderSpecifics.qml
+++ b/src/quickcontrols/designer/RangeSliderSpecifics.qml
diff --git a/src/quickcontrols2/designer/RoundButtonSpecifics.qml b/src/quickcontrols/designer/RoundButtonSpecifics.qml
index 45c617bc94..45c617bc94 100644
--- a/src/quickcontrols2/designer/RoundButtonSpecifics.qml
+++ b/src/quickcontrols/designer/RoundButtonSpecifics.qml
diff --git a/src/quickcontrols2/designer/ScrollViewSpecifics.qml b/src/quickcontrols/designer/ScrollViewSpecifics.qml
index c2623a0966..c2623a0966 100644
--- a/src/quickcontrols2/designer/ScrollViewSpecifics.qml
+++ b/src/quickcontrols/designer/ScrollViewSpecifics.qml
diff --git a/src/quickcontrols2/designer/SliderSpecifics.qml b/src/quickcontrols/designer/SliderSpecifics.qml
index a2fada6f52..a2fada6f52 100644
--- a/src/quickcontrols2/designer/SliderSpecifics.qml
+++ b/src/quickcontrols/designer/SliderSpecifics.qml
diff --git a/src/quickcontrols2/designer/SpinBoxSpecifics.qml b/src/quickcontrols/designer/SpinBoxSpecifics.qml
index 6bd28bb880..6bd28bb880 100644
--- a/src/quickcontrols2/designer/SpinBoxSpecifics.qml
+++ b/src/quickcontrols/designer/SpinBoxSpecifics.qml
diff --git a/src/quickcontrols2/designer/StackViewSpecifics.qml b/src/quickcontrols/designer/StackViewSpecifics.qml
index c7c34a4ae1..c7c34a4ae1 100644
--- a/src/quickcontrols2/designer/StackViewSpecifics.qml
+++ b/src/quickcontrols/designer/StackViewSpecifics.qml
diff --git a/src/quickcontrols2/designer/SwipeDelegateSpecifics.qml b/src/quickcontrols/designer/SwipeDelegateSpecifics.qml
index e80bc01528..e80bc01528 100644
--- a/src/quickcontrols2/designer/SwipeDelegateSpecifics.qml
+++ b/src/quickcontrols/designer/SwipeDelegateSpecifics.qml
diff --git a/src/quickcontrols2/designer/SwipeViewSpecifics.qml b/src/quickcontrols/designer/SwipeViewSpecifics.qml
index 70882e2832..70882e2832 100644
--- a/src/quickcontrols2/designer/SwipeViewSpecifics.qml
+++ b/src/quickcontrols/designer/SwipeViewSpecifics.qml
diff --git a/src/quickcontrols2/designer/SwitchDelegateSpecifics.qml b/src/quickcontrols/designer/SwitchDelegateSpecifics.qml
index d3d600f462..d3d600f462 100644
--- a/src/quickcontrols2/designer/SwitchDelegateSpecifics.qml
+++ b/src/quickcontrols/designer/SwitchDelegateSpecifics.qml
diff --git a/src/quickcontrols2/designer/SwitchSpecifics.qml b/src/quickcontrols/designer/SwitchSpecifics.qml
index ecfd4cf406..ecfd4cf406 100644
--- a/src/quickcontrols2/designer/SwitchSpecifics.qml
+++ b/src/quickcontrols/designer/SwitchSpecifics.qml
diff --git a/src/quickcontrols2/designer/TabBarSpecifics.qml b/src/quickcontrols/designer/TabBarSpecifics.qml
index 1a5b08e528..1a5b08e528 100644
--- a/src/quickcontrols2/designer/TabBarSpecifics.qml
+++ b/src/quickcontrols/designer/TabBarSpecifics.qml
diff --git a/src/quickcontrols2/designer/TabButtonSpecifics.qml b/src/quickcontrols/designer/TabButtonSpecifics.qml
index ecfd4cf406..ecfd4cf406 100644
--- a/src/quickcontrols2/designer/TabButtonSpecifics.qml
+++ b/src/quickcontrols/designer/TabButtonSpecifics.qml
diff --git a/src/quickcontrols2/designer/TextAreaSpecifics.qml b/src/quickcontrols/designer/TextAreaSpecifics.qml
index faec481eb8..faec481eb8 100644
--- a/src/quickcontrols2/designer/TextAreaSpecifics.qml
+++ b/src/quickcontrols/designer/TextAreaSpecifics.qml
diff --git a/src/quickcontrols2/designer/TextFieldSpecifics.qml b/src/quickcontrols/designer/TextFieldSpecifics.qml
index 54dcefb3b1..54dcefb3b1 100644
--- a/src/quickcontrols2/designer/TextFieldSpecifics.qml
+++ b/src/quickcontrols/designer/TextFieldSpecifics.qml
diff --git a/src/quickcontrols2/designer/ToolBarSpecifics.qml b/src/quickcontrols/designer/ToolBarSpecifics.qml
index 284443c2a0..284443c2a0 100644
--- a/src/quickcontrols2/designer/ToolBarSpecifics.qml
+++ b/src/quickcontrols/designer/ToolBarSpecifics.qml
diff --git a/src/quickcontrols2/designer/ToolButtonSpecifics.qml b/src/quickcontrols/designer/ToolButtonSpecifics.qml
index 1de3c0a3c2..1de3c0a3c2 100644
--- a/src/quickcontrols2/designer/ToolButtonSpecifics.qml
+++ b/src/quickcontrols/designer/ToolButtonSpecifics.qml
diff --git a/src/quickcontrols2/designer/ToolSeparatorSpecifics.qml b/src/quickcontrols/designer/ToolSeparatorSpecifics.qml
index a2dfe43d18..a2dfe43d18 100644
--- a/src/quickcontrols2/designer/ToolSeparatorSpecifics.qml
+++ b/src/quickcontrols/designer/ToolSeparatorSpecifics.qml
diff --git a/src/quickcontrols2/designer/TumblerSpecifics.qml b/src/quickcontrols/designer/TumblerSpecifics.qml
index 4026a63d12..4026a63d12 100644
--- a/src/quickcontrols2/designer/TumblerSpecifics.qml
+++ b/src/quickcontrols/designer/TumblerSpecifics.qml
diff --git a/src/quickcontrols2/designer/images/busyindicator-icon.png b/src/quickcontrols/designer/images/busyindicator-icon.png
index 666d1ed93f..666d1ed93f 100644
--- a/src/quickcontrols2/designer/images/busyindicator-icon.png
+++ b/src/quickcontrols/designer/images/busyindicator-icon.png
diff --git a/src/quickcontrols2/designer/images/busyindicator-icon16.png b/src/quickcontrols/designer/images/busyindicator-icon16.png
index 5aa57d7f48..5aa57d7f48 100644
--- a/src/quickcontrols2/designer/images/busyindicator-icon16.png
+++ b/src/quickcontrols/designer/images/busyindicator-icon16.png
diff --git a/src/quickcontrols2/designer/images/busyindicator-icon@2x.png b/src/quickcontrols/designer/images/busyindicator-icon@2x.png
index bb2278ff89..bb2278ff89 100644
--- a/src/quickcontrols2/designer/images/busyindicator-icon@2x.png
+++ b/src/quickcontrols/designer/images/busyindicator-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/button-icon.png b/src/quickcontrols/designer/images/button-icon.png
index c44909f6dd..c44909f6dd 100644
--- a/src/quickcontrols2/designer/images/button-icon.png
+++ b/src/quickcontrols/designer/images/button-icon.png
diff --git a/src/quickcontrols2/designer/images/button-icon16.png b/src/quickcontrols/designer/images/button-icon16.png
index 5c921deb13..5c921deb13 100644
--- a/src/quickcontrols2/designer/images/button-icon16.png
+++ b/src/quickcontrols/designer/images/button-icon16.png
diff --git a/src/quickcontrols2/designer/images/button-icon@2x.png b/src/quickcontrols/designer/images/button-icon@2x.png
index f90a1ba7dc..f90a1ba7dc 100644
--- a/src/quickcontrols2/designer/images/button-icon@2x.png
+++ b/src/quickcontrols/designer/images/button-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/checkbox-icon.png b/src/quickcontrols/designer/images/checkbox-icon.png
index ee669b3a88..ee669b3a88 100644
--- a/src/quickcontrols2/designer/images/checkbox-icon.png
+++ b/src/quickcontrols/designer/images/checkbox-icon.png
diff --git a/src/quickcontrols2/designer/images/checkbox-icon16.png b/src/quickcontrols/designer/images/checkbox-icon16.png
index 8d89eab841..8d89eab841 100644
--- a/src/quickcontrols2/designer/images/checkbox-icon16.png
+++ b/src/quickcontrols/designer/images/checkbox-icon16.png
diff --git a/src/quickcontrols2/designer/images/checkbox-icon@2x.png b/src/quickcontrols/designer/images/checkbox-icon@2x.png
index 51c5601de0..51c5601de0 100644
--- a/src/quickcontrols2/designer/images/checkbox-icon@2x.png
+++ b/src/quickcontrols/designer/images/checkbox-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/combobox-icon.png b/src/quickcontrols/designer/images/combobox-icon.png
index 2d31b17c65..2d31b17c65 100644
--- a/src/quickcontrols2/designer/images/combobox-icon.png
+++ b/src/quickcontrols/designer/images/combobox-icon.png
diff --git a/src/quickcontrols2/designer/images/combobox-icon16.png b/src/quickcontrols/designer/images/combobox-icon16.png
index 15fc3505ba..15fc3505ba 100644
--- a/src/quickcontrols2/designer/images/combobox-icon16.png
+++ b/src/quickcontrols/designer/images/combobox-icon16.png
diff --git a/src/quickcontrols2/designer/images/combobox-icon@2x.png b/src/quickcontrols/designer/images/combobox-icon@2x.png
index 5f82390596..5f82390596 100644
--- a/src/quickcontrols2/designer/images/combobox-icon@2x.png
+++ b/src/quickcontrols/designer/images/combobox-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/control-icon.png b/src/quickcontrols/designer/images/control-icon.png
index fd9e4e8ff3..fd9e4e8ff3 100644
--- a/src/quickcontrols2/designer/images/control-icon.png
+++ b/src/quickcontrols/designer/images/control-icon.png
diff --git a/src/quickcontrols2/designer/images/control-icon16.png b/src/quickcontrols/designer/images/control-icon16.png
index 31c765483e..31c765483e 100644
--- a/src/quickcontrols2/designer/images/control-icon16.png
+++ b/src/quickcontrols/designer/images/control-icon16.png
diff --git a/src/quickcontrols2/designer/images/control-icon@2x.png b/src/quickcontrols/designer/images/control-icon@2x.png
index 22604d2492..22604d2492 100644
--- a/src/quickcontrols2/designer/images/control-icon@2x.png
+++ b/src/quickcontrols/designer/images/control-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/delaybutton-icon.png b/src/quickcontrols/designer/images/delaybutton-icon.png
index 5a55bd9f77..5a55bd9f77 100644
--- a/src/quickcontrols2/designer/images/delaybutton-icon.png
+++ b/src/quickcontrols/designer/images/delaybutton-icon.png
diff --git a/src/quickcontrols2/designer/images/delaybutton-icon16.png b/src/quickcontrols/designer/images/delaybutton-icon16.png
index cd21394e46..cd21394e46 100644
--- a/src/quickcontrols2/designer/images/delaybutton-icon16.png
+++ b/src/quickcontrols/designer/images/delaybutton-icon16.png
diff --git a/src/quickcontrols2/designer/images/delaybutton-icon@2x.png b/src/quickcontrols/designer/images/delaybutton-icon@2x.png
index 7beee2fab0..7beee2fab0 100644
--- a/src/quickcontrols2/designer/images/delaybutton-icon@2x.png
+++ b/src/quickcontrols/designer/images/delaybutton-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/dial-icon.png b/src/quickcontrols/designer/images/dial-icon.png
index b3b63e3523..b3b63e3523 100644
--- a/src/quickcontrols2/designer/images/dial-icon.png
+++ b/src/quickcontrols/designer/images/dial-icon.png
diff --git a/src/quickcontrols2/designer/images/dial-icon16.png b/src/quickcontrols/designer/images/dial-icon16.png
index 8d8c7c09b0..8d8c7c09b0 100644
--- a/src/quickcontrols2/designer/images/dial-icon16.png
+++ b/src/quickcontrols/designer/images/dial-icon16.png
diff --git a/src/quickcontrols2/designer/images/dial-icon@2x.png b/src/quickcontrols/designer/images/dial-icon@2x.png
index 22547a16b8..22547a16b8 100644
--- a/src/quickcontrols2/designer/images/dial-icon@2x.png
+++ b/src/quickcontrols/designer/images/dial-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/frame-icon.png b/src/quickcontrols/designer/images/frame-icon.png
index 32abc8bf1e..32abc8bf1e 100644
--- a/src/quickcontrols2/designer/images/frame-icon.png
+++ b/src/quickcontrols/designer/images/frame-icon.png
diff --git a/src/quickcontrols2/designer/images/frame-icon16.png b/src/quickcontrols/designer/images/frame-icon16.png
index e5b65ad53b..e5b65ad53b 100644
--- a/src/quickcontrols2/designer/images/frame-icon16.png
+++ b/src/quickcontrols/designer/images/frame-icon16.png
diff --git a/src/quickcontrols2/designer/images/frame-icon@2x.png b/src/quickcontrols/designer/images/frame-icon@2x.png
index 8b876f38ec..8b876f38ec 100644
--- a/src/quickcontrols2/designer/images/frame-icon@2x.png
+++ b/src/quickcontrols/designer/images/frame-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/groupbox-icon.png b/src/quickcontrols/designer/images/groupbox-icon.png
index 5542ecf8bf..5542ecf8bf 100644
--- a/src/quickcontrols2/designer/images/groupbox-icon.png
+++ b/src/quickcontrols/designer/images/groupbox-icon.png
diff --git a/src/quickcontrols2/designer/images/groupbox-icon16.png b/src/quickcontrols/designer/images/groupbox-icon16.png
index 9cf4324819..9cf4324819 100644
--- a/src/quickcontrols2/designer/images/groupbox-icon16.png
+++ b/src/quickcontrols/designer/images/groupbox-icon16.png
diff --git a/src/quickcontrols2/designer/images/groupbox-icon@2x.png b/src/quickcontrols/designer/images/groupbox-icon@2x.png
index 80dab3c716..80dab3c716 100644
--- a/src/quickcontrols2/designer/images/groupbox-icon@2x.png
+++ b/src/quickcontrols/designer/images/groupbox-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/itemdelegate-icon.png b/src/quickcontrols/designer/images/itemdelegate-icon.png
index 822cf3e7b8..822cf3e7b8 100644
--- a/src/quickcontrols2/designer/images/itemdelegate-icon.png
+++ b/src/quickcontrols/designer/images/itemdelegate-icon.png
diff --git a/src/quickcontrols2/designer/images/itemdelegate-icon16.png b/src/quickcontrols/designer/images/itemdelegate-icon16.png
index b3ed007a0e..b3ed007a0e 100644
--- a/src/quickcontrols2/designer/images/itemdelegate-icon16.png
+++ b/src/quickcontrols/designer/images/itemdelegate-icon16.png
diff --git a/src/quickcontrols2/designer/images/itemdelegate-icon@2x.png b/src/quickcontrols/designer/images/itemdelegate-icon@2x.png
index cb81308ff8..cb81308ff8 100644
--- a/src/quickcontrols2/designer/images/itemdelegate-icon@2x.png
+++ b/src/quickcontrols/designer/images/itemdelegate-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/label-icon.png b/src/quickcontrols/designer/images/label-icon.png
index 788bef078c..788bef078c 100644
--- a/src/quickcontrols2/designer/images/label-icon.png
+++ b/src/quickcontrols/designer/images/label-icon.png
diff --git a/src/quickcontrols2/designer/images/label-icon16.png b/src/quickcontrols/designer/images/label-icon16.png
index b68d384568..b68d384568 100644
--- a/src/quickcontrols2/designer/images/label-icon16.png
+++ b/src/quickcontrols/designer/images/label-icon16.png
diff --git a/src/quickcontrols2/designer/images/label-icon@2x.png b/src/quickcontrols/designer/images/label-icon@2x.png
index 7001413d3b..7001413d3b 100644
--- a/src/quickcontrols2/designer/images/label-icon@2x.png
+++ b/src/quickcontrols/designer/images/label-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/page-icon.png b/src/quickcontrols/designer/images/page-icon.png
index b5ac87e899..b5ac87e899 100644
--- a/src/quickcontrols2/designer/images/page-icon.png
+++ b/src/quickcontrols/designer/images/page-icon.png
diff --git a/src/quickcontrols2/designer/images/page-icon16.png b/src/quickcontrols/designer/images/page-icon16.png
index bc6810b605..bc6810b605 100644
--- a/src/quickcontrols2/designer/images/page-icon16.png
+++ b/src/quickcontrols/designer/images/page-icon16.png
diff --git a/src/quickcontrols2/designer/images/page-icon@2x.png b/src/quickcontrols/designer/images/page-icon@2x.png
index 23db032f4a..23db032f4a 100644
--- a/src/quickcontrols2/designer/images/page-icon@2x.png
+++ b/src/quickcontrols/designer/images/page-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/pageindicator-icon.png b/src/quickcontrols/designer/images/pageindicator-icon.png
index edb6b377bb..edb6b377bb 100644
--- a/src/quickcontrols2/designer/images/pageindicator-icon.png
+++ b/src/quickcontrols/designer/images/pageindicator-icon.png
diff --git a/src/quickcontrols2/designer/images/pageindicator-icon16.png b/src/quickcontrols/designer/images/pageindicator-icon16.png
index 0fb8967564..0fb8967564 100644
--- a/src/quickcontrols2/designer/images/pageindicator-icon16.png
+++ b/src/quickcontrols/designer/images/pageindicator-icon16.png
diff --git a/src/quickcontrols2/designer/images/pageindicator-icon@2x.png b/src/quickcontrols/designer/images/pageindicator-icon@2x.png
index 7be0ee813b..7be0ee813b 100644
--- a/src/quickcontrols2/designer/images/pageindicator-icon@2x.png
+++ b/src/quickcontrols/designer/images/pageindicator-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/pane-icon.png b/src/quickcontrols/designer/images/pane-icon.png
index 62ebe487ff..62ebe487ff 100644
--- a/src/quickcontrols2/designer/images/pane-icon.png
+++ b/src/quickcontrols/designer/images/pane-icon.png
diff --git a/src/quickcontrols2/designer/images/pane-icon16.png b/src/quickcontrols/designer/images/pane-icon16.png
index 2b8048441c..2b8048441c 100644
--- a/src/quickcontrols2/designer/images/pane-icon16.png
+++ b/src/quickcontrols/designer/images/pane-icon16.png
diff --git a/src/quickcontrols2/designer/images/pane-icon@2x.png b/src/quickcontrols/designer/images/pane-icon@2x.png
index 55bb116a69..55bb116a69 100644
--- a/src/quickcontrols2/designer/images/pane-icon@2x.png
+++ b/src/quickcontrols/designer/images/pane-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/progressbar-icon.png b/src/quickcontrols/designer/images/progressbar-icon.png
index a023f73c30..a023f73c30 100644
--- a/src/quickcontrols2/designer/images/progressbar-icon.png
+++ b/src/quickcontrols/designer/images/progressbar-icon.png
diff --git a/src/quickcontrols2/designer/images/progressbar-icon16.png b/src/quickcontrols/designer/images/progressbar-icon16.png
index 6fede21d8c..6fede21d8c 100644
--- a/src/quickcontrols2/designer/images/progressbar-icon16.png
+++ b/src/quickcontrols/designer/images/progressbar-icon16.png
diff --git a/src/quickcontrols2/designer/images/progressbar-icon@2x.png b/src/quickcontrols/designer/images/progressbar-icon@2x.png
index 0069400335..0069400335 100644
--- a/src/quickcontrols2/designer/images/progressbar-icon@2x.png
+++ b/src/quickcontrols/designer/images/progressbar-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/radiobutton-icon.png b/src/quickcontrols/designer/images/radiobutton-icon.png
index d38170e22f..d38170e22f 100644
--- a/src/quickcontrols2/designer/images/radiobutton-icon.png
+++ b/src/quickcontrols/designer/images/radiobutton-icon.png
diff --git a/src/quickcontrols2/designer/images/radiobutton-icon16.png b/src/quickcontrols/designer/images/radiobutton-icon16.png
index 07b46a8ab0..07b46a8ab0 100644
--- a/src/quickcontrols2/designer/images/radiobutton-icon16.png
+++ b/src/quickcontrols/designer/images/radiobutton-icon16.png
diff --git a/src/quickcontrols2/designer/images/radiobutton-icon@2x.png b/src/quickcontrols/designer/images/radiobutton-icon@2x.png
index 4bbddda4b2..4bbddda4b2 100644
--- a/src/quickcontrols2/designer/images/radiobutton-icon@2x.png
+++ b/src/quickcontrols/designer/images/radiobutton-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/rangeslider-icon.png b/src/quickcontrols/designer/images/rangeslider-icon.png
index 1c4c7b2948..1c4c7b2948 100644
--- a/src/quickcontrols2/designer/images/rangeslider-icon.png
+++ b/src/quickcontrols/designer/images/rangeslider-icon.png
diff --git a/src/quickcontrols2/designer/images/rangeslider-icon16.png b/src/quickcontrols/designer/images/rangeslider-icon16.png
index 3be4624ddd..3be4624ddd 100644
--- a/src/quickcontrols2/designer/images/rangeslider-icon16.png
+++ b/src/quickcontrols/designer/images/rangeslider-icon16.png
diff --git a/src/quickcontrols2/designer/images/rangeslider-icon@2x.png b/src/quickcontrols/designer/images/rangeslider-icon@2x.png
index aee69b3302..aee69b3302 100644
--- a/src/quickcontrols2/designer/images/rangeslider-icon@2x.png
+++ b/src/quickcontrols/designer/images/rangeslider-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/roundbutton-icon.png b/src/quickcontrols/designer/images/roundbutton-icon.png
index d4b470dc25..d4b470dc25 100644
--- a/src/quickcontrols2/designer/images/roundbutton-icon.png
+++ b/src/quickcontrols/designer/images/roundbutton-icon.png
diff --git a/src/quickcontrols2/designer/images/roundbutton-icon16.png b/src/quickcontrols/designer/images/roundbutton-icon16.png
index f6f3666639..f6f3666639 100644
--- a/src/quickcontrols2/designer/images/roundbutton-icon16.png
+++ b/src/quickcontrols/designer/images/roundbutton-icon16.png
diff --git a/src/quickcontrols2/designer/images/roundbutton-icon@2x.png b/src/quickcontrols/designer/images/roundbutton-icon@2x.png
index 4553e165e7..4553e165e7 100644
--- a/src/quickcontrols2/designer/images/roundbutton-icon@2x.png
+++ b/src/quickcontrols/designer/images/roundbutton-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/scrollview-icon.png b/src/quickcontrols/designer/images/scrollview-icon.png
index 5ef73ff19f..5ef73ff19f 100644
--- a/src/quickcontrols2/designer/images/scrollview-icon.png
+++ b/src/quickcontrols/designer/images/scrollview-icon.png
diff --git a/src/quickcontrols2/designer/images/scrollview-icon16.png b/src/quickcontrols/designer/images/scrollview-icon16.png
index f8ca7a3685..f8ca7a3685 100644
--- a/src/quickcontrols2/designer/images/scrollview-icon16.png
+++ b/src/quickcontrols/designer/images/scrollview-icon16.png
diff --git a/src/quickcontrols2/designer/images/scrollview-icon@2x.png b/src/quickcontrols/designer/images/scrollview-icon@2x.png
index 0eb7f9665e..0eb7f9665e 100644
--- a/src/quickcontrols2/designer/images/scrollview-icon@2x.png
+++ b/src/quickcontrols/designer/images/scrollview-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/slider-icon.png b/src/quickcontrols/designer/images/slider-icon.png
index bd0a9729be..bd0a9729be 100644
--- a/src/quickcontrols2/designer/images/slider-icon.png
+++ b/src/quickcontrols/designer/images/slider-icon.png
diff --git a/src/quickcontrols2/designer/images/slider-icon16.png b/src/quickcontrols/designer/images/slider-icon16.png
index a08622df89..a08622df89 100644
--- a/src/quickcontrols2/designer/images/slider-icon16.png
+++ b/src/quickcontrols/designer/images/slider-icon16.png
diff --git a/src/quickcontrols2/designer/images/slider-icon@2x.png b/src/quickcontrols/designer/images/slider-icon@2x.png
index 93842e4cdd..93842e4cdd 100644
--- a/src/quickcontrols2/designer/images/slider-icon@2x.png
+++ b/src/quickcontrols/designer/images/slider-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/spinbox-icon.png b/src/quickcontrols/designer/images/spinbox-icon.png
index 37277c5e43..37277c5e43 100644
--- a/src/quickcontrols2/designer/images/spinbox-icon.png
+++ b/src/quickcontrols/designer/images/spinbox-icon.png
diff --git a/src/quickcontrols2/designer/images/spinbox-icon16.png b/src/quickcontrols/designer/images/spinbox-icon16.png
index f88711dd25..f88711dd25 100644
--- a/src/quickcontrols2/designer/images/spinbox-icon16.png
+++ b/src/quickcontrols/designer/images/spinbox-icon16.png
diff --git a/src/quickcontrols2/designer/images/spinbox-icon@2x.png b/src/quickcontrols/designer/images/spinbox-icon@2x.png
index b62a3bad51..b62a3bad51 100644
--- a/src/quickcontrols2/designer/images/spinbox-icon@2x.png
+++ b/src/quickcontrols/designer/images/spinbox-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/stackview-icon.png b/src/quickcontrols/designer/images/stackview-icon.png
index a6ced34925..a6ced34925 100644
--- a/src/quickcontrols2/designer/images/stackview-icon.png
+++ b/src/quickcontrols/designer/images/stackview-icon.png
diff --git a/src/quickcontrols2/designer/images/stackview-icon16.png b/src/quickcontrols/designer/images/stackview-icon16.png
index 0f19d0efa3..0f19d0efa3 100644
--- a/src/quickcontrols2/designer/images/stackview-icon16.png
+++ b/src/quickcontrols/designer/images/stackview-icon16.png
diff --git a/src/quickcontrols2/designer/images/stackview-icon@2x.png b/src/quickcontrols/designer/images/stackview-icon@2x.png
index 9b5ef9517b..9b5ef9517b 100644
--- a/src/quickcontrols2/designer/images/stackview-icon@2x.png
+++ b/src/quickcontrols/designer/images/stackview-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/swipeview-icon.png b/src/quickcontrols/designer/images/swipeview-icon.png
index 031cb27c36..031cb27c36 100644
--- a/src/quickcontrols2/designer/images/swipeview-icon.png
+++ b/src/quickcontrols/designer/images/swipeview-icon.png
diff --git a/src/quickcontrols2/designer/images/swipeview-icon16.png b/src/quickcontrols/designer/images/swipeview-icon16.png
index 446c469690..446c469690 100644
--- a/src/quickcontrols2/designer/images/swipeview-icon16.png
+++ b/src/quickcontrols/designer/images/swipeview-icon16.png
diff --git a/src/quickcontrols2/designer/images/swipeview-icon@2x.png b/src/quickcontrols/designer/images/swipeview-icon@2x.png
index 0ccb978c46..0ccb978c46 100644
--- a/src/quickcontrols2/designer/images/swipeview-icon@2x.png
+++ b/src/quickcontrols/designer/images/swipeview-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/switch-icon.png b/src/quickcontrols/designer/images/switch-icon.png
index e018159286..e018159286 100644
--- a/src/quickcontrols2/designer/images/switch-icon.png
+++ b/src/quickcontrols/designer/images/switch-icon.png
diff --git a/src/quickcontrols2/designer/images/switch-icon16.png b/src/quickcontrols/designer/images/switch-icon16.png
index 9abd275659..9abd275659 100644
--- a/src/quickcontrols2/designer/images/switch-icon16.png
+++ b/src/quickcontrols/designer/images/switch-icon16.png
diff --git a/src/quickcontrols2/designer/images/switch-icon@2x.png b/src/quickcontrols/designer/images/switch-icon@2x.png
index 787f54ca41..787f54ca41 100644
--- a/src/quickcontrols2/designer/images/switch-icon@2x.png
+++ b/src/quickcontrols/designer/images/switch-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/textarea-icon.png b/src/quickcontrols/designer/images/textarea-icon.png
index f1b2dc0f84..f1b2dc0f84 100644
--- a/src/quickcontrols2/designer/images/textarea-icon.png
+++ b/src/quickcontrols/designer/images/textarea-icon.png
diff --git a/src/quickcontrols2/designer/images/textarea-icon16.png b/src/quickcontrols/designer/images/textarea-icon16.png
index 4afc1fbab5..4afc1fbab5 100644
--- a/src/quickcontrols2/designer/images/textarea-icon16.png
+++ b/src/quickcontrols/designer/images/textarea-icon16.png
diff --git a/src/quickcontrols2/designer/images/textarea-icon@2x.png b/src/quickcontrols/designer/images/textarea-icon@2x.png
index c32ecc71a9..c32ecc71a9 100644
--- a/src/quickcontrols2/designer/images/textarea-icon@2x.png
+++ b/src/quickcontrols/designer/images/textarea-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/textfield-icon.png b/src/quickcontrols/designer/images/textfield-icon.png
index ba5537acef..ba5537acef 100644
--- a/src/quickcontrols2/designer/images/textfield-icon.png
+++ b/src/quickcontrols/designer/images/textfield-icon.png
diff --git a/src/quickcontrols2/designer/images/textfield-icon16.png b/src/quickcontrols/designer/images/textfield-icon16.png
index c4a62a6582..c4a62a6582 100644
--- a/src/quickcontrols2/designer/images/textfield-icon16.png
+++ b/src/quickcontrols/designer/images/textfield-icon16.png
diff --git a/src/quickcontrols2/designer/images/textfield-icon@2x.png b/src/quickcontrols/designer/images/textfield-icon@2x.png
index e05fd41b9a..e05fd41b9a 100644
--- a/src/quickcontrols2/designer/images/textfield-icon@2x.png
+++ b/src/quickcontrols/designer/images/textfield-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/toolbar-icon.png b/src/quickcontrols/designer/images/toolbar-icon.png
index 5cb5b2e1af..5cb5b2e1af 100644
--- a/src/quickcontrols2/designer/images/toolbar-icon.png
+++ b/src/quickcontrols/designer/images/toolbar-icon.png
diff --git a/src/quickcontrols2/designer/images/toolbar-icon16.png b/src/quickcontrols/designer/images/toolbar-icon16.png
index 569373afa1..569373afa1 100644
--- a/src/quickcontrols2/designer/images/toolbar-icon16.png
+++ b/src/quickcontrols/designer/images/toolbar-icon16.png
diff --git a/src/quickcontrols2/designer/images/toolbar-icon@2x.png b/src/quickcontrols/designer/images/toolbar-icon@2x.png
index fd9e6ceebc..fd9e6ceebc 100644
--- a/src/quickcontrols2/designer/images/toolbar-icon@2x.png
+++ b/src/quickcontrols/designer/images/toolbar-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/toolbutton-icon.png b/src/quickcontrols/designer/images/toolbutton-icon.png
index 3298f69519..3298f69519 100644
--- a/src/quickcontrols2/designer/images/toolbutton-icon.png
+++ b/src/quickcontrols/designer/images/toolbutton-icon.png
diff --git a/src/quickcontrols2/designer/images/toolbutton-icon16.png b/src/quickcontrols/designer/images/toolbutton-icon16.png
index 9ab7861c25..9ab7861c25 100644
--- a/src/quickcontrols2/designer/images/toolbutton-icon16.png
+++ b/src/quickcontrols/designer/images/toolbutton-icon16.png
diff --git a/src/quickcontrols2/designer/images/toolbutton-icon@2x.png b/src/quickcontrols/designer/images/toolbutton-icon@2x.png
index e5958cded3..e5958cded3 100644
--- a/src/quickcontrols2/designer/images/toolbutton-icon@2x.png
+++ b/src/quickcontrols/designer/images/toolbutton-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/toolseparator-icon.png b/src/quickcontrols/designer/images/toolseparator-icon.png
index 5e99f06f2e..5e99f06f2e 100644
--- a/src/quickcontrols2/designer/images/toolseparator-icon.png
+++ b/src/quickcontrols/designer/images/toolseparator-icon.png
diff --git a/src/quickcontrols2/designer/images/toolseparator-icon16.png b/src/quickcontrols/designer/images/toolseparator-icon16.png
index 68f22c5df1..68f22c5df1 100644
--- a/src/quickcontrols2/designer/images/toolseparator-icon16.png
+++ b/src/quickcontrols/designer/images/toolseparator-icon16.png
diff --git a/src/quickcontrols2/designer/images/toolseparator-icon@2x.png b/src/quickcontrols/designer/images/toolseparator-icon@2x.png
index 549c11c67c..549c11c67c 100644
--- a/src/quickcontrols2/designer/images/toolseparator-icon@2x.png
+++ b/src/quickcontrols/designer/images/toolseparator-icon@2x.png
diff --git a/src/quickcontrols2/designer/images/tumbler-icon.png b/src/quickcontrols/designer/images/tumbler-icon.png
index 98eb8232a2..98eb8232a2 100644
--- a/src/quickcontrols2/designer/images/tumbler-icon.png
+++ b/src/quickcontrols/designer/images/tumbler-icon.png
diff --git a/src/quickcontrols2/designer/images/tumbler-icon16.png b/src/quickcontrols/designer/images/tumbler-icon16.png
index ff5f95cf32..ff5f95cf32 100644
--- a/src/quickcontrols2/designer/images/tumbler-icon16.png
+++ b/src/quickcontrols/designer/images/tumbler-icon16.png
diff --git a/src/quickcontrols2/designer/images/tumbler-icon@2x.png b/src/quickcontrols/designer/images/tumbler-icon@2x.png
index 236abf0cfe..236abf0cfe 100644
--- a/src/quickcontrols2/designer/images/tumbler-icon@2x.png
+++ b/src/quickcontrols/designer/images/tumbler-icon@2x.png
diff --git a/src/quickcontrols2/designer/qtquickcontrols2.metainfo b/src/quickcontrols/designer/qtquickcontrols2.metainfo
index 1075cec62e..1075cec62e 100644
--- a/src/quickcontrols2/designer/qtquickcontrols2.metainfo
+++ b/src/quickcontrols/designer/qtquickcontrols2.metainfo
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-applicationwindow-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols2-applicationwindow-wireframe.png
index f31378004a..f31378004a 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-applicationwindow-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-applicationwindow-wireframe.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-basic-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols2-basic-thumbnail.png
index e971a7aaec..e971a7aaec 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-basic-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-basic-thumbnail.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-basic.png b/src/quickcontrols/doc/images/qtquickcontrols2-basic.png
index 099db17038..099db17038 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-basic.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-basic.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator-custom.png
index fefae223ef..fefae223ef 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator.gif b/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.gif
index 653d200f3c..653d200f3c 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator.png b/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.png
index 4be09579bb..4be09579bb 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-busyindicator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-button-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-button-custom.png
index 46d3e3eb5e..46d3e3eb5e 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-button-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-button-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-button-flat.gif b/src/quickcontrols/doc/images/qtquickcontrols2-button-flat.gif
index e2bd8b6fcf..e2bd8b6fcf 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-button-flat.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-button-flat.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-button-highlighted.gif b/src/quickcontrols/doc/images/qtquickcontrols2-button-highlighted.gif
index 7de076d3d0..7de076d3d0 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-button-highlighted.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-button-highlighted.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-button-icononly.png b/src/quickcontrols/doc/images/qtquickcontrols2-button-icononly.png
index 9c8dd0f43f..9c8dd0f43f 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-button-icononly.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-button-icononly.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-button-textbesideicon.png b/src/quickcontrols/doc/images/qtquickcontrols2-button-textbesideicon.png
index 3dc64fb92b..3dc64fb92b 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-button-textbesideicon.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-button-textbesideicon.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-button-textonly.png b/src/quickcontrols/doc/images/qtquickcontrols2-button-textonly.png
index 737beb165f..737beb165f 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-button-textonly.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-button-textonly.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-button-textundericon.png b/src/quickcontrols/doc/images/qtquickcontrols2-button-textundericon.png
index 37c40c7c66..37c40c7c66 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-button-textundericon.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-button-textundericon.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-button.gif b/src/quickcontrols/doc/images/qtquickcontrols2-button.gif
index 10d626a331..10d626a331 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-button.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-button.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-calendarmodel.png b/src/quickcontrols/doc/images/qtquickcontrols2-calendarmodel.png
index a017682326..a017682326 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-calendarmodel.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-calendarmodel.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-custom.png
index c6c3d1bcbd..c6c3d1bcbd 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-group.png b/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-group.png
index d5a0d51be6..d5a0d51be6 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-group.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-group.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-tristate.gif b/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-tristate.gif
index 56a1586795..56a1586795 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox-tristate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-tristate.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox.gif b/src/quickcontrols/doc/images/qtquickcontrols2-checkbox.gif
index d70c0ee4b9..d70c0ee4b9 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-checkbox.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-checkbox.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-custom.png
index c0dd06892c..c0dd06892c 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate-tristate.gif b/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-tristate.gif
index 8d058d6c54..8d058d6c54 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate-tristate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-tristate.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate.gif
index da3fab98a4..da3fab98a4 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-checkdelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-combobox-custom.png
index 4f7206dc78..4f7206dc78 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-combobox-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-delegate.png b/src/quickcontrols/doc/images/qtquickcontrols2-combobox-delegate.png
index cf31064895..cf31064895 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-delegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-combobox-delegate.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-popup.png b/src/quickcontrols/doc/images/qtquickcontrols2-combobox-popup.png
index cf31064895..cf31064895 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-combobox-popup.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-combobox-popup.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-combobox.gif b/src/quickcontrols/doc/images/qtquickcontrols2-combobox.gif
index 966a2d4ae5..966a2d4ae5 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-combobox.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-combobox.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-control.png b/src/quickcontrols/doc/images/qtquickcontrols2-control.png
index 0f004a89dd..0f004a89dd 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-control.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-control.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-control.svg b/src/quickcontrols/doc/images/qtquickcontrols2-control.svg
index 4b2057d197..4b2057d197 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-control.svg
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-control.svg
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-customize-buttons.png b/src/quickcontrols/doc/images/qtquickcontrols2-customize-buttons.png
index 551e8a0cf7..551e8a0cf7 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-customize-buttons.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-customize-buttons.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dayofweekrow-layout.png b/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow-layout.png
index 3a816e85a9..3a816e85a9 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dayofweekrow-layout.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow-layout.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dayofweekrow.png b/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow.png
index 7548e22147..7548e22147 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dayofweekrow.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-delaybutton-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton-custom.png
index a7bd7c19d8..a7bd7c19d8 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-delaybutton-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-delaybutton.gif b/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton.gif
index 16a198f9cb..16a198f9cb 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-delaybutton.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-dial-custom.png
index 6312c99933..6312c99933 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dial-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-handle.png b/src/quickcontrols/doc/images/qtquickcontrols2-dial-handle.png
index 9e22b2e709..9e22b2e709 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-handle.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dial-handle.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-inputMode.svgz b/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputMode.svgz
index 005ab7b331..005ab7b331 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-inputMode.svgz
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputMode.svgz
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-inputmode.png b/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputmode.png
index 5bbc41a49c..5bbc41a49c 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-inputmode.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputmode.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-no-wrap.gif b/src/quickcontrols/doc/images/qtquickcontrols2-dial-no-wrap.gif
index 24f6790b6d..24f6790b6d 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-no-wrap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dial-no-wrap.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-wrap.gif b/src/quickcontrols/doc/images/qtquickcontrols2-dial-wrap.gif
index cfb1fb5b10..cfb1fb5b10 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dial-wrap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dial-wrap.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dial.png b/src/quickcontrols/doc/images/qtquickcontrols2-dial.png
index 71c54113b7..71c54113b7 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dial.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dial.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png b/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png
index c17f38ac0c..c17f38ac0c 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-dialogbuttonbox.png b/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox.png
index 33b5f45f4f..33b5f45f4f 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-dialogbuttonbox.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png
index 0c92f86587..0c92f86587 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-drawer-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols2-drawer-wireframe.png
index 74806f17b7..74806f17b7 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-drawer-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-drawer-wireframe.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-drawer.gif b/src/quickcontrols/doc/images/qtquickcontrols2-drawer.gif
index 736f34f66f..736f34f66f 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-drawer.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-drawer.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-frame-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-frame-custom.png
index f628b20c20..f628b20c20 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-frame-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-frame-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-frame.png b/src/quickcontrols/doc/images/qtquickcontrols2-frame.png
index e3cb31dc71..e3cb31dc71 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-frame.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-frame.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-palettes.png b/src/quickcontrols/doc/images/qtquickcontrols2-fusion-palettes.png
index d806116167..d806116167 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-palettes.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-fusion-palettes.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols2-fusion-thumbnail.png
index c270c6efba..c270c6efba 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-fusion-thumbnail.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-violet.png b/src/quickcontrols/doc/images/qtquickcontrols2-fusion-violet.png
index 99e5b59786..99e5b59786 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-fusion-violet.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-fusion-violet.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-fusion.png b/src/quickcontrols/doc/images/qtquickcontrols2-fusion.png
index 7119ef225d..7119ef225d 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-fusion.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-fusion.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-checkable.png b/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-checkable.png
index 820ad79c80..820ad79c80 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-checkable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-checkable.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-custom.png
index 029679ced0..029679ced0 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-label.png b/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-label.png
index c26795a7a7..c26795a7a7 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox-label.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-label.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox.png b/src/quickcontrols/doc/images/qtquickcontrols2-groupbox.png
index ea2f9ea5c5..ea2f9ea5c5 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-groupbox.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-groupbox.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-4x.png b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-4x.png
index bab99a5e55..bab99a5e55 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-4x.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-4x.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png
index c42df81edc..c42df81edc 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-inset.png b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset.png
index 0627d08590..0627d08590 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-inset.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png
index 0a606c9926..0a606c9926 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png
index 9598b13a1c..9598b13a1c 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-size.png b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-size.png
index db6453758f..db6453758f 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch-size.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-size.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch.svgz b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch.svgz
index 5a1a1094d1..5a1a1094d1 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-9-patch.svgz
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch.svgz
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-customization-dark.png b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization-dark.png
index 144ac97c87..144ac97c87 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-customization-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization-dark.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-customization.svgz b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization.svgz
index fb8305638b..fb8305638b 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-customization.svgz
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization.svgz
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-thumbnail.png
index ecf2bb163d..ecf2bb163d 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine-thumbnail.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine.png b/src/quickcontrols/doc/images/qtquickcontrols2-imagine.png
index ffe2c267b2..ffe2c267b2 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-imagine.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-imagine.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-ios-dark.png b/src/quickcontrols/doc/images/qtquickcontrols2-ios-dark.png
index fd4609c729..fd4609c729 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-ios-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-ios-dark.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-ios-light.png b/src/quickcontrols/doc/images/qtquickcontrols2-ios-light.png
index f990078ddf..f990078ddf 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-ios-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-ios-light.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate-custom.png
index 35f8892f16..35f8892f16 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.gif
index dccb6efcdb..dccb6efcdb 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate.png b/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.png
index 7242f343a0..7242f343a0 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-itemdelegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-label-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-label-custom.png
index 5730ff23bf..5730ff23bf 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-label-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-label-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-label.png b/src/quickcontrols/doc/images/qtquickcontrols2-label.png
index 0bafcf8602..0bafcf8602 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-label.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-label.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-macos-dark.png b/src/quickcontrols/doc/images/qtquickcontrols2-macos-dark.png
index 97d8a5a4e7..97d8a5a4e7 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-macos-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-macos-dark.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-macos-light.png b/src/quickcontrols/doc/images/qtquickcontrols2-macos-light.png
index 4a598ad498..4a598ad498 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-macos-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-macos-light.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-macos-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols2-macos-thumbnail.png
index 57fd98d63a..57fd98d63a 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-macos-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-macos-thumbnail.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-accent.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-accent.png
index a85afc68ed..a85afc68ed 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-accent.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-accent.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-attributes.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-attributes.png
index bb54071d79..bb54071d79 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-attributes.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-attributes.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-background.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-background.png
index 62028f523c..62028f523c 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-background.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-background.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-dark.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-dark.png
index f6e45b3b1c..f6e45b3b1c 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-dark.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-elevation.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-elevation.png
index d152f14529..d152f14529 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-elevation.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-elevation.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-foreground.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-foreground.png
index 0d0e1b651a..0d0e1b651a 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-foreground.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-foreground.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-light.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-light.png
index c9abe2cb8b..c9abe2cb8b 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-light.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-purple.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-purple.png
index b955736b0b..b955736b0b 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-purple.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-purple.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-theme.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-theme.png
index 1d09a82580..1d09a82580 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-theme.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-theme.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-thumbnail.png
index d758ff1803..d758ff1803 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-thumbnail.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-variant-dense.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-dense.png
index 02f39b7885..02f39b7885 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-variant-dense.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-dense.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-material-variant-normal.png b/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-normal.png
index c1e366c531..c1e366c531 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-material-variant-normal.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-normal.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-menu-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-menu-custom.png
index 922bf591b5..922bf591b5 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-menu-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-menu-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-menu.gif b/src/quickcontrols/doc/images/qtquickcontrols2-menu.gif
index 93a873a33a..93a873a33a 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-menu.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-menu.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-menu.png b/src/quickcontrols/doc/images/qtquickcontrols2-menu.png
index 926c33eed2..926c33eed2 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-menu.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-menu.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-menubar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-menubar-custom.png
index b6007e466d..b6007e466d 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-menubar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-menubar-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-menubar.png b/src/quickcontrols/doc/images/qtquickcontrols2-menubar.png
index 873b7a1960..873b7a1960 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-menubar.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-menubar.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-menuseparator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator-custom.png
index 78635b9c88..78635b9c88 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-menuseparator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-menuseparator.png b/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator.png
index 35307817f6..35307817f6 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-menuseparator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-monthgrid-layout.png b/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid-layout.png
index f67501a751..f67501a751 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-monthgrid-layout.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid-layout.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-monthgrid.png b/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid.png
index a2f9a47f70..a2f9a47f70 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-monthgrid.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-page-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols2-page-wireframe.png
index f612c243c4..f612c243c4 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-page-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-page-wireframe.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-custom.png
index a767a51aa0..a767a51aa0 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator-delegate.png b/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-delegate.png
index 95acde70cf..95acde70cf 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator-delegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-delegate.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator.png b/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator.png
index e2a0a157f6..e2a0a157f6 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-pageindicator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-pane-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-pane-custom.png
index 03a0369f56..03a0369f56 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-pane-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-pane-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-pane.png b/src/quickcontrols/doc/images/qtquickcontrols2-pane.png
index 3801cc3efb..3801cc3efb 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-pane.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-pane.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-popup-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-popup-custom.png
index cb7813d387..cb7813d387 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-popup-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-popup-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-popup-settings.png b/src/quickcontrols/doc/images/qtquickcontrols2-popup-settings.png
index 5122158ef4..5122158ef4 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-popup-settings.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-popup-settings.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-popup-transformorigin.png b/src/quickcontrols/doc/images/qtquickcontrols2-popup-transformorigin.png
index 16d2617786..16d2617786 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-popup-transformorigin.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-popup-transformorigin.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-popup.png b/src/quickcontrols/doc/images/qtquickcontrols2-popup.png
index 8fc424a854..8fc424a854 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-popup.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-popup.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-popup.svg b/src/quickcontrols/doc/images/qtquickcontrols2-popup.svg
index e39f3dce21..e39f3dce21 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-popup.svg
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-popup.svg
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-custom.png
index 9d73df2c25..9d73df2c25 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar-indeterminate.gif b/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-indeterminate.gif
index d6756d16fd..d6756d16fd 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar-indeterminate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-indeterminate.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar.gif b/src/quickcontrols/doc/images/qtquickcontrols2-progressbar.gif
index 49af5f45a1..49af5f45a1 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-progressbar.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-progressbar.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-radiobutton-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton-custom.png
index 5c85179f70..5c85179f70 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-radiobutton-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-radiobutton.gif b/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton.gif
index 4cbf3ed9d6..4cbf3ed9d6 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-radiobutton.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-radiodelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate-custom.png
index 7d32699bf9..7d32699bf9 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-radiodelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-radiodelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate.gif
index b6afd6fe6a..b6afd6fe6a 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-radiodelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-rangeslider-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider-custom.png
index 47379a300d..47379a300d 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-rangeslider-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-rangeslider.gif b/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider.gif
index db565b0a93..db565b0a93 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-rangeslider.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-roundbutton.png b/src/quickcontrols/doc/images/qtquickcontrols2-roundbutton.png
index 4dce37f239..4dce37f239 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-roundbutton.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-roundbutton.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-custom.png
index 690bc8beef..690bc8beef 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-non-attached.png b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-non-attached.png
index eba363dda2..eba363dda2 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-non-attached.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-non-attached.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-nosnap.gif b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-nosnap.gif
index f61ac5b46a..f61ac5b46a 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-nosnap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-nosnap.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-snapalways.gif b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snapalways.gif
index 438d4a3318..438d4a3318 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-snapalways.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snapalways.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif
index c2fa67b027..c2fa67b027 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar.gif b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar.gif
index ed3ab607d9..ed3ab607d9 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollbar.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-custom.png
index b1183bc52a..b1183bc52a 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator-non-attached.png b/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-non-attached.png
index a61e048743..a61e048743 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator-non-attached.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-non-attached.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator.gif b/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator.gif
index 73007820f8..73007820f8 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollindicator.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-custom.png
index 8f4bd92863..8f4bd92863 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-wireframe.png
index 8a39056aa9..8a39056aa9 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-wireframe.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview.png b/src/quickcontrols/doc/images/qtquickcontrols2-scrollview.png
index 1a4039e1fd..1a4039e1fd 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-scrollview.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-scrollview.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-selectionrectangle.png b/src/quickcontrols/doc/images/qtquickcontrols2-selectionrectangle.png
index 69e47b2909..69e47b2909 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-selectionrectangle.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-selectionrectangle.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-slider-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-slider-custom.png
index dbbacb343f..dbbacb343f 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-slider-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-slider-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-slider-handle.png b/src/quickcontrols/doc/images/qtquickcontrols2-slider-handle.png
index 5450d57480..5450d57480 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-slider-handle.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-slider-handle.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-slider-nosnap.gif b/src/quickcontrols/doc/images/qtquickcontrols2-slider-nosnap.gif
index ab233c5b93..ab233c5b93 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-slider-nosnap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-slider-nosnap.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-slider-snapalways.gif b/src/quickcontrols/doc/images/qtquickcontrols2-slider-snapalways.gif
index 8eb4011fb5..8eb4011fb5 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-slider-snapalways.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-slider-snapalways.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-slider-snaponrelease.gif b/src/quickcontrols/doc/images/qtquickcontrols2-slider-snaponrelease.gif
index f3b1d5c7a9..f3b1d5c7a9 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-slider-snaponrelease.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-slider-snaponrelease.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-slider.gif b/src/quickcontrols/doc/images/qtquickcontrols2-slider.gif
index 2ee56334e0..2ee56334e0 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-slider.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-slider.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-custom.png
index d1e883fc56..d1e883fc56 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-double.png b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-double.png
index d3f5876c4a..d3f5876c4a 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-double.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-double.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-down.png b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-down.png
index 1d5dcf7b44..1d5dcf7b44 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-down.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-down.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-textual.png b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-textual.png
index 5513d6e67d..5513d6e67d 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-textual.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-textual.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-up.png b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-up.png
index 1ee1c4798e..1ee1c4798e 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox-up.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-up.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox.png b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox.png
index 835bb1d67d..835bb1d67d 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-spinbox.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-spinbox.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-splitview-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-splitview-custom.png
index da820ccafe..da820ccafe 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-splitview-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-splitview-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-custom.png
index 5ee6049e74..5ee6049e74 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-pop.gif b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-pop.gif
index 1971c2e004..1971c2e004 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-pop.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-pop.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-push.gif b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-push.gif
index 0218cc0f2f..0218cc0f2f 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-push.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-push.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-replace.gif b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-replace.gif
index 63a6b2b4b5..63a6b2b4b5 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-replace.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-replace.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-unwind.gif b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-unwind.gif
index 28c051d866..28c051d866 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-unwind.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-unwind.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-visible.png b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-visible.png
index d937b417e6..d937b417e6 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-visible.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-visible.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-wireframe.png
index f28b5c67de..f28b5c67de 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-stackview-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-stackview-wireframe.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-styles.png b/src/quickcontrols/doc/images/qtquickcontrols2-styles.png
index 992dd47eba..992dd47eba 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-styles.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-styles.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-behind.gif b/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-behind.gif
index 97d6a59277..97d6a59277 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-behind.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-behind.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-custom.png
index 5813b73cf4..5813b73cf4 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif b/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif
index 0641bd1400..0641bd1400 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate.gif
index 86c380b7b3..86c380b7b3 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-swipedelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview-indicator.png b/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-indicator.png
index 998ec9f7c9..998ec9f7c9 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview-indicator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-indicator.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-wireframe.png
index 3cc2b83c4b..3cc2b83c4b 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-wireframe.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview.gif b/src/quickcontrols/doc/images/qtquickcontrols2-swipeview.gif
index 4af26c1058..4af26c1058 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-swipeview.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-swipeview.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-switch-checked.png b/src/quickcontrols/doc/images/qtquickcontrols2-switch-checked.png
index 7a0cde1bad..7a0cde1bad 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-switch-checked.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-switch-checked.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-switch-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-switch-custom.png
index 6d535ef96f..6d535ef96f 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-switch-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-switch-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-switch.gif b/src/quickcontrols/doc/images/qtquickcontrols2-switch.gif
index 5f956304a0..5f956304a0 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-switch.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-switch.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-switch.png b/src/quickcontrols/doc/images/qtquickcontrols2-switch.png
index 7f613f3343..7f613f3343 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-switch.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-switch.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-switchdelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate-custom.png
index f5337e2c83..f5337e2c83 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-switchdelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-switchdelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate.gif
index 950b10731f..950b10731f 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-switchdelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-custom.png
index 8c8e4accd8..8c8e4accd8 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-explicit.png b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-explicit.png
index b1de5f715e..b1de5f715e 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-explicit.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-explicit.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-flickable.png b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-flickable.png
index 0c253f82d5..0c253f82d5 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-flickable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-flickable.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-wireframe.png
index 35a64ae285..35a64ae285 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-wireframe.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar.gif b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.gif
index 31db1f9e7c..31db1f9e7c 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar.png b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.png
index 9f113497db..9f113497db 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbar.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbutton.png b/src/quickcontrols/doc/images/qtquickcontrols2-tabbutton.png
index 3df2f53147..3df2f53147 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tabbutton.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tabbutton.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-textarea-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-textarea-custom.png
index 6220a13f39..6220a13f39 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-textarea-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-textarea-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-textarea-scrollable.png b/src/quickcontrols/doc/images/qtquickcontrols2-textarea-scrollable.png
index ae868a27da..ae868a27da 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-textarea-scrollable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-textarea-scrollable.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-textarea.png b/src/quickcontrols/doc/images/qtquickcontrols2-textarea.png
index fc221bd757..fc221bd757 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-textarea.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-textarea.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-textfield-custom.png
index 9102317065..9102317065 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-textfield-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-disabled.png b/src/quickcontrols/doc/images/qtquickcontrols2-textfield-disabled.png
index b143d21053..b143d21053 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-disabled.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-textfield-disabled.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-focused.png b/src/quickcontrols/doc/images/qtquickcontrols2-textfield-focused.png
index de7f9599c9..de7f9599c9 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-focused.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-textfield-focused.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-normal.png b/src/quickcontrols/doc/images/qtquickcontrols2-textfield-normal.png
index 4229c706ad..4229c706ad 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-textfield-normal.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-textfield-normal.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-textfield.png b/src/quickcontrols/doc/images/qtquickcontrols2-textfield.png
index a008383a00..a008383a00 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-textfield.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-textfield.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-toolbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-toolbar-custom.png
index 425e5f8c64..425e5f8c64 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-toolbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-toolbar-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-toolbar.png b/src/quickcontrols/doc/images/qtquickcontrols2-toolbar.png
index e5a33eee9a..e5a33eee9a 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-toolbar.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-toolbar.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-toolbutton-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton-custom.png
index b78269d087..b78269d087 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-toolbutton-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-toolbutton.png b/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton.png
index 610c1a7cb4..610c1a7cb4 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-toolbutton.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-toolseparator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator-custom.png
index 6703eeba53..6703eeba53 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-toolseparator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-toolseparator.png b/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator.png
index 88ced12361..88ced12361 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-toolseparator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-delay.png b/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-delay.png
index 59813835b4..59813835b4 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-delay.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-delay.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-hover.png b/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-hover.png
index 62a9cf844b..62a9cf844b 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-hover.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-hover.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-pressandhold.png b/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-pressandhold.png
index 62a9cf844b..62a9cf844b 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-pressandhold.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-pressandhold.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-slider.png b/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-slider.png
index a15e723a02..a15e723a02 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip-slider.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-slider.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip.png b/src/quickcontrols/doc/images/qtquickcontrols2-tooltip.png
index 4238d52a77..4238d52a77 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tooltip.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tooltip.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-treeviewdelegate.png b/src/quickcontrols/doc/images/qtquickcontrols2-treeviewdelegate.png
index 4d1e74f5dd..4d1e74f5dd 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-treeviewdelegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-treeviewdelegate.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-custom.png b/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-custom.png
index bbfa9b0cef..bbfa9b0cef 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-custom.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-delegate.png b/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-delegate.png
index a28da93e46..a28da93e46 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-delegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-delegate.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-wrap.gif b/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-wrap.gif
index 8f59eedcc7..8f59eedcc7 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler-wrap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-wrap.gif
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler.png b/src/quickcontrols/doc/images/qtquickcontrols2-tumbler.png
index 38339dfa25..38339dfa25 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-tumbler.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-tumbler.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-accent.png b/src/quickcontrols/doc/images/qtquickcontrols2-universal-accent.png
index e1d74f7a91..e1d74f7a91 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-accent.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-universal-accent.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-attributes.png b/src/quickcontrols/doc/images/qtquickcontrols2-universal-attributes.png
index 7a7ef347fc..7a7ef347fc 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-attributes.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-universal-attributes.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-background.png b/src/quickcontrols/doc/images/qtquickcontrols2-universal-background.png
index 4f1bfbd284..4f1bfbd284 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-background.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-universal-background.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-button.png b/src/quickcontrols/doc/images/qtquickcontrols2-universal-button.png
index 6c764ec97e..6c764ec97e 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-button.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-universal-button.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-dark.png b/src/quickcontrols/doc/images/qtquickcontrols2-universal-dark.png
index 952651dca0..952651dca0 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-universal-dark.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-foreground.png b/src/quickcontrols/doc/images/qtquickcontrols2-universal-foreground.png
index b0ecf23a9e..b0ecf23a9e 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-foreground.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-universal-foreground.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-light.png b/src/quickcontrols/doc/images/qtquickcontrols2-universal-light.png
index e65447a4c5..e65447a4c5 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-universal-light.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-theme.png b/src/quickcontrols/doc/images/qtquickcontrols2-universal-theme.png
index d128134636..d128134636 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-theme.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-universal-theme.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols2-universal-thumbnail.png
index db7fe5b076..db7fe5b076 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-universal-thumbnail.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-violet.png b/src/quickcontrols/doc/images/qtquickcontrols2-universal-violet.png
index ec459457a8..ec459457a8 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-universal-violet.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-universal-violet.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-weeknumbercolumn-layout.png b/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn-layout.png
index 19fbeefd49..19fbeefd49 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-weeknumbercolumn-layout.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn-layout.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-weeknumbercolumn.png b/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn.png
index a73cccd544..a73cccd544 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-weeknumbercolumn.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-windows-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols2-windows-thumbnail.png
index 15408d3bba..15408d3bba 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-windows-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-windows-thumbnail.png
diff --git a/src/quickcontrols2/doc/images/qtquickcontrols2-windows.png b/src/quickcontrols/doc/images/qtquickcontrols2-windows.png
index 324a03412d..324a03412d 100644
--- a/src/quickcontrols2/doc/images/qtquickcontrols2-windows.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols2-windows.png
diff --git a/src/quickcontrols2/doc/manifest-meta.qdocconf b/src/quickcontrols/doc/manifest-meta.qdocconf
index 5626aca067..5626aca067 100644
--- a/src/quickcontrols2/doc/manifest-meta.qdocconf
+++ b/src/quickcontrols/doc/manifest-meta.qdocconf
diff --git a/src/quickcontrols2/doc/qtquickcontrols.qdocconf b/src/quickcontrols/doc/qtquickcontrols.qdocconf
index 285141b14b..285141b14b 100644
--- a/src/quickcontrols2/doc/qtquickcontrols.qdocconf
+++ b/src/quickcontrols/doc/qtquickcontrols.qdocconf
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-action.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-action.qml
index 4f50ba46d7..4f50ba46d7 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-action.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-action.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-busyindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
index 3eefb11110..3eefb11110 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-button-custom.qml
index cf197a18ae..cf197a18ae 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-button-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-button-icononly.qml
index 027ecb4ed8..027ecb4ed8 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-icononly.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-button-icononly.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
index c2dce1d99a..c2dce1d99a 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-textonly.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textonly.qml
index 4b12b8acc2..4b12b8acc2 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-button-textonly.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textonly.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-calendarmodel.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-calendarmodel.qml
index af2777b123..af2777b123 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-calendarmodel.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-calendarmodel.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-custom.qml
index a7421af39c..a7421af39c 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkbox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkbox-group.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-group.qml
index 0d676be397..0d676be397 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkbox-group.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-group.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
index a4f4b84d18..a4f4b84d18 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-accepted.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-accepted.qml
index 6f5eff6b55..6f5eff6b55 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-accepted.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-accepted.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-custom.qml
index 2481f6dcf8..2481f6dcf8 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-find.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-find.qml
index 2513002264..2513002264 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-find.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-find.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-popup.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-popup.qml
index 8c636a3d5c..8c636a3d5c 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-popup.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-popup.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-textat.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-textat.qml
index 8910ba3237..8910ba3237 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-textat.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-textat.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-valuerole.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-valuerole.qml
index 8d32201799..8d32201799 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-combobox-valuerole.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-valuerole.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dayofweekrow-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow-layout.qml
index 2358f252e0..2358f252e0 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dayofweekrow-layout.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow-layout.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dayofweekrow.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow.qml
index 2188b4ccf1..2188b4ccf1 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dayofweekrow.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-delaybutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
index a8b17ab36a..a8b17ab36a 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dial-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-dial-custom.qml
index f1efc22c4d..f1efc22c4d 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dial-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-dial-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog-modal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modal.qml
index ba1580a4df..ba1580a4df 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog-modal.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modal.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog-modeless.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modeless.qml
index d70c9921e2..d70c9921e2 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog-modeless.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modeless.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog.qml
index 4d774c4e10..4d774c4e10 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialog.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
index ef85771bfd..ef85771bfd 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
index 13a927520f..13a927520f 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-frame-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-frame-custom.qml
index de3e1a2327..de3e1a2327 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-frame-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-frame-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-frame.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-frame.qml
index fcb128db54..fcb128db54 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-frame.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-frame.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox-checkable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
index 0ab0822aca..0ab0822aca 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-custom.qml
index 34d9df8a63..34d9df8a63 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox.qml
index 98282ed348..98282ed348 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-groupbox.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-headerview-simple.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-headerview-simple.qml
index 6f2e5fac45..6f2e5fac45 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-headerview-simple.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-headerview-simple.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
index 3212cbc762..3212cbc762 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-itemdelegate.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate.qml
index 49c12b1dff..49c12b1dff 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-itemdelegate.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-label-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-label-custom.qml
index 79bc9d3c13..79bc9d3c13 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-label-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-label-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-label.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-label.qml
index 7ca63d0251..7ca63d0251 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-label.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-label.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-accent.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-accent.qml
index 71a84fac82..71a84fac82 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-accent.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-accent.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-background.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-background.qml
index f9f1dd0915..f9f1dd0915 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-background.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-background.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-elevation.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-elevation.qml
index 4f8b27e7ef..4f8b27e7ef 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-elevation.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-elevation.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-foreground.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-foreground.qml
index b4a7743c16..b4a7743c16 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-foreground.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-foreground.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-theme.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-theme.qml
index 4e5bf81cd9..4e5bf81cd9 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-theme.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-theme.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-variant.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-variant.qml
index ad824f1e34..ad824f1e34 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-material-variant.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-material-variant.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menu-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-custom.qml
index f38d5f370a..f38d5f370a 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menu-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menu-instantiator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-instantiator.qml
index cda91182df..cda91182df 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menu-instantiator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-instantiator.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menubar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar-custom.qml
index 2d2d15efdf..2d2d15efdf 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menubar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menubar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar.qml
index 55064604b4..55064604b4 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menubar.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menuseparator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
index 2b66187e10..2b66187e10 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menuseparator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator.qml
index 6be0de85bc..6be0de85bc 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-menuseparator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-monthgrid-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-layout.qml
index 0620ee6d0b..0620ee6d0b 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-monthgrid-layout.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-layout.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-monthgrid-localization.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-localization.qml
index 56a801ab75..56a801ab75 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-monthgrid-localization.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-localization.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-monthgrid.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid.qml
index c630edbe26..c630edbe26 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-monthgrid.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-overlay-modal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modal.qml
index d1537d73bf..d1537d73bf 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-overlay-modal.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modal.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-overlay-modeless.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modeless.qml
index 06ebb16fb1..06ebb16fb1 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-overlay-modeless.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modeless.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-overview.cmake b/src/quickcontrols/doc/snippets/qtquickcontrols2-overview.cmake
index 6aa63152db..6aa63152db 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-overview.cmake
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-overview.cmake
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
index 5372c41f31..5372c41f31 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
index e3e65beb22..e3e65beb22 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator.qml
index 6929565825..6929565825 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-pageindicator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-pane-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-pane-custom.qml
index 96e3db1f37..96e3db1f37 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-pane-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-pane-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-pane.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-pane.qml
index ed1b80d4e8..ed1b80d4e8 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-pane.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-pane.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-popup-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-popup-custom.qml
index 951dfa7d52..951dfa7d52 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-popup-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-popup-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-popup.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-popup.qml
index 5b9ec29fb2..5b9ec29fb2 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-popup.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-popup.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-progressbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-progressbar-custom.qml
index 7158232081..7158232081 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-progressbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-progressbar-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-radiobutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
index 929fe7e8e2..929fe7e8e2 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
index 5eb856b8b5..5eb856b8b5 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-rangeslider-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
index 81bcb0d668..81bcb0d668 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-roundbutton.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-roundbutton.qml
index d83e4abc32..d83e4abc32 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-roundbutton.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-roundbutton.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-active.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-active.qml
index 5292bc5499..5292bc5499 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-active.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-active.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
index 2a4faede61..2a4faede61 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
index 6ba505b199..6ba505b199 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-policy.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
index 7f08912e7e..7f08912e7e 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-active.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
index 0f6afdfc4d..0f6afdfc4d 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
index f447fd4c94..f447fd4c94 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
index 063c771f1b..063c771f1b 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-custom.qml
index 2f23b9fd58..2f23b9fd58 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-interactive.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
index 3f7bc8eb6d..3f7bc8eb6d 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-listview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-listview.qml
index 053e8e395a..053e8e395a 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-listview.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-listview.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-policy.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-policy.qml
index fa75cd14ed..fa75cd14ed 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview-policy.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-policy.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview.qml
index e7f1adf758..e7f1adf758 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-scrollview.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-selectionrectangle.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-selectionrectangle.qml
index a53941e824..a53941e824 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-selectionrectangle.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-selectionrectangle.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-slider-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-slider-custom.qml
index 66e0bd7990..66e0bd7990 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-slider-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-slider-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-custom.qml
index b32106a5bd..b32106a5bd 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-double.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-double.qml
index fe2dfbd722..fe2dfbd722 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-double.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-double.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-textual.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-textual.qml
index 271cad0f07..271cad0f07 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox-textual.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-textual.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox.qml
index 24fac81ca6..24fac81ca6 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-spinbox.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-splitview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-custom.qml
index 0d5452c25d..0d5452c25d 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-splitview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-splitview-handle-containmentmask.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-handle-containmentmask.qml
index f12bfe1da8..f12bfe1da8 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-splitview-handle-containmentmask.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-handle-containmentmask.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-stackview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-custom.qml
index 381fbe6b95..381fbe6b95 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-stackview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-stackview-visible.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-visible.qml
index d711a02e1a..d711a02e1a 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-stackview-visible.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-visible.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
index 973511c418..973511c418 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
index 4215ea9202..4215ea9202 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate.qml
index fb2df4f6d3..fb2df4f6d3 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipedelegate.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipeview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-custom.qml
index e77bc9a3e8..e77bc9a3e8 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipeview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipeview-indicator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
index 1831d92b9f..1831d92b9f 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-switch-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-switch-custom.qml
index 5ca4b96140..5ca4b96140 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-switch-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-switch-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
index 13cc7b4402..13cc7b4402 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-custom.qml
index cdce972150..cdce972150 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-explicit.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
index 2293984e30..2293984e30 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-flickable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
index 3851b226bd..3851b226bd 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar.qml
index 3ce32c1c50..3ce32c1c50 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbar.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbutton.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbutton.qml
index c397092a8a..c397092a8a 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tabbutton.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbutton.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textarea-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-custom.qml
index 39a94e13cc..39a94e13cc 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textarea-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textarea-scrollable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
index 7f915815e3..7f915815e3 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-custom.qml
index c4d0c88c2a..c4d0c88c2a 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-disabled.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-disabled.qml
index aa8639190c..aa8639190c 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-disabled.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-disabled.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-focused.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-focused.qml
index 62299eeabc..62299eeabc 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-focused.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-focused.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-normal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-normal.qml
index 72a5626142..72a5626142 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-textfield-normal.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-normal.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar-custom.qml
index 2aabcbfbe3..2aabcbfbe3 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar.qml
index cb07df80f6..cb07df80f6 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbar.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
index 6ec46b0adf..6ec46b0adf 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolseparator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
index 201e04b0e8..201e04b0e8 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolseparator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator.qml
index eb3543402d..eb3543402d 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-toolseparator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-custom.qml
index 089e6d02b9..089e6d02b9 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-hover.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-hover.qml
index 289334d20d..289334d20d 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-hover.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-hover.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
index e209ce9ce9..e209ce9ce9 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-slider.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-slider.qml
index 823e7f1842..823e7f1842 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip-slider.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-slider.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip.qml
index d0cf142376..d0cf142376 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tooltip.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-custom.qml
index 3487e7316d..3487e7316d 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-custom.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-listView.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-listView.qml
index 1b39c2aa16..1b39c2aa16 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-listView.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-listView.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-pathView.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
index 30e90b2ba5..30e90b2ba5 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
index a5d4b3585a..a5d4b3585a 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-accent.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-accent.qml
index 52aca6eea9..52aca6eea9 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-accent.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-accent.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-background.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-background.qml
index 106549f789..106549f789 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-background.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-background.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-foreground.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-foreground.qml
index 491a4f94d4..491a4f94d4 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-foreground.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-foreground.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-theme.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-theme.qml
index 5ade2c7c55..5ade2c7c55 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-universal-theme.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-theme.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-weeknumbercolumn-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn-layout.qml
index 6d1dd1ba79..6d1dd1ba79 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-weeknumbercolumn-layout.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn-layout.qml
diff --git a/src/quickcontrols2/doc/snippets/qtquickcontrols2-weeknumbercolumn.qml b/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn.qml
index e3c757a0b8..e3c757a0b8 100644
--- a/src/quickcontrols2/doc/snippets/qtquickcontrols2-weeknumbercolumn.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn.qml
diff --git a/src/quickcontrols2/doc/src/external-pages.qdoc b/src/quickcontrols/doc/src/external-pages.qdoc
index 0b1c99a7c1..0b1c99a7c1 100644
--- a/src/quickcontrols2/doc/src/external-pages.qdoc
+++ b/src/quickcontrols/doc/src/external-pages.qdoc
diff --git a/src/quickcontrols2/doc/src/includes/customize-button-background.qdocinc b/src/quickcontrols/doc/src/includes/customize-button-background.qdocinc
index 0acad02d38..0acad02d38 100644
--- a/src/quickcontrols2/doc/src/includes/customize-button-background.qdocinc
+++ b/src/quickcontrols/doc/src/includes/customize-button-background.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/customizing-native-styles.qdocinc b/src/quickcontrols/doc/src/includes/customizing-native-styles.qdocinc
index e1feacaa49..e1feacaa49 100644
--- a/src/quickcontrols2/doc/src/includes/customizing-native-styles.qdocinc
+++ b/src/quickcontrols/doc/src/includes/customizing-native-styles.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/inputmethodhints.qdocinc b/src/quickcontrols/doc/src/includes/inputmethodhints.qdocinc
index 73710e1e15..73710e1e15 100644
--- a/src/quickcontrols2/doc/src/includes/inputmethodhints.qdocinc
+++ b/src/quickcontrols/doc/src/includes/inputmethodhints.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickcombobox.qdocinc b/src/quickcontrols/doc/src/includes/qquickcombobox.qdocinc
index 5e19f5f1f4..5e19f5f1f4 100644
--- a/src/quickcontrols2/doc/src/includes/qquickcombobox.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickcombobox.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickcontrol-background.qdocinc b/src/quickcontrols/doc/src/includes/qquickcontrol-background.qdocinc
index 02d92de07c..02d92de07c 100644
--- a/src/quickcontrols2/doc/src/includes/qquickcontrol-background.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickcontrol-background.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickcontrol-focusreason.qdocinc b/src/quickcontrols/doc/src/includes/qquickcontrol-focusreason.qdocinc
index b69e9e60ec..b69e9e60ec 100644
--- a/src/quickcontrols2/doc/src/includes/qquickcontrol-focusreason.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickcontrol-focusreason.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickdial.qdocinc b/src/quickcontrols/doc/src/includes/qquickdial.qdocinc
index 3370b3d8f3..3370b3d8f3 100644
--- a/src/quickcontrols2/doc/src/includes/qquickdial.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickdial.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickicon.qdocinc b/src/quickcontrols/doc/src/includes/qquickicon.qdocinc
index eadaea5983..eadaea5983 100644
--- a/src/quickcontrols2/doc/src/includes/qquickicon.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickicon.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickimaginestyle.qdocinc b/src/quickcontrols/doc/src/includes/qquickimaginestyle.qdocinc
index 411c6c1088..411c6c1088 100644
--- a/src/quickcontrols2/doc/src/includes/qquickimaginestyle.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickimaginestyle.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickmaterialstyle.qdocinc b/src/quickcontrols/doc/src/includes/qquickmaterialstyle.qdocinc
index 803425a88b..803425a88b 100644
--- a/src/quickcontrols2/doc/src/includes/qquickmaterialstyle.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickmaterialstyle.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickoverlay-popup-parent.qdocinc b/src/quickcontrols/doc/src/includes/qquickoverlay-popup-parent.qdocinc
index 5562f6a039..5562f6a039 100644
--- a/src/quickcontrols2/doc/src/includes/qquickoverlay-popup-parent.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickoverlay-popup-parent.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickpopup-padding.qdocinc b/src/quickcontrols/doc/src/includes/qquickpopup-padding.qdocinc
index 31f5d2db02..31f5d2db02 100644
--- a/src/quickcontrols2/doc/src/includes/qquickpopup-padding.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickpopup-padding.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickstackview.qdocinc b/src/quickcontrols/doc/src/includes/qquickstackview.qdocinc
index 20c9bdc369..20c9bdc369 100644
--- a/src/quickcontrols2/doc/src/includes/qquickstackview.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickstackview.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickswipedelegate-interaction.qdocinc b/src/quickcontrols/doc/src/includes/qquickswipedelegate-interaction.qdocinc
index 05aeadb654..05aeadb654 100644
--- a/src/quickcontrols2/doc/src/includes/qquickswipedelegate-interaction.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickswipedelegate-interaction.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickswitch.qdocinc b/src/quickcontrols/doc/src/includes/qquickswitch.qdocinc
index 985f85d979..985f85d979 100644
--- a/src/quickcontrols2/doc/src/includes/qquickswitch.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickswitch.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquicktooltip.qdocinc b/src/quickcontrols/doc/src/includes/qquicktooltip.qdocinc
index 0046a2d8b0..0046a2d8b0 100644
--- a/src/quickcontrols2/doc/src/includes/qquicktooltip.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquicktooltip.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/qquickuniversalstyle.qdocinc b/src/quickcontrols/doc/src/includes/qquickuniversalstyle.qdocinc
index 6c3b1289fa..6c3b1289fa 100644
--- a/src/quickcontrols2/doc/src/includes/qquickuniversalstyle.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickuniversalstyle.qdocinc
diff --git a/src/quickcontrols2/doc/src/includes/zero-based-months.qdocinc b/src/quickcontrols/doc/src/includes/zero-based-months.qdocinc
index ca2d62264f..ca2d62264f 100644
--- a/src/quickcontrols2/doc/src/includes/zero-based-months.qdocinc
+++ b/src/quickcontrols/doc/src/includes/zero-based-months.qdocinc
diff --git a/src/quickcontrols2/doc/src/qt6-changes.qdoc b/src/quickcontrols/doc/src/qt6-changes.qdoc
index c0eb7755d6..c0eb7755d6 100644
--- a/src/quickcontrols2/doc/src/qt6-changes.qdoc
+++ b/src/quickcontrols/doc/src/qt6-changes.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-basic.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-basic.qdoc
index b87fe8b7db..b87fe8b7db 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-basic.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-basic.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-buttons.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-buttons.qdoc
index b2256f0e60..b2256f0e60 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-buttons.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-buttons.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-configuration.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-configuration.qdoc
index 02adbe5644..02adbe5644 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-configuration.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-configuration.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-containers.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-containers.qdoc
index bd840ebec8..bd840ebec8 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-containers.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-containers.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-cppclasses.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-cppclasses.qdoc
index 10ae30a689..10ae30a689 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-cppclasses.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-cppclasses.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-customize.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-customize.qdoc
index e30d393771..e30d393771 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-customize.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-delegates.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-delegates.qdoc
index 5d498ced1f..5d498ced1f 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-delegates.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-delegates.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-deployment.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-deployment.qdoc
index daea9eccf0..daea9eccf0 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-deployment.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-deployment.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-environment.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-environment.qdoc
index b939a6741a..b939a6741a 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-environment.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-environment.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-examples.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-examples.qdoc
index 505c6200f5..505c6200f5 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-examples.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-examples.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-fileselectors.qdoc
index edd7b76d81..edd7b76d81 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-fileselectors.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-fileselectors.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-focus.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-focus.qdoc
index ff73e560a0..ff73e560a0 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-focus.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-focus.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-fusion.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-fusion.qdoc
index 42fcd6e87c..42fcd6e87c 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-fusion.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-fusion.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-gettingstarted.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-gettingstarted.qdoc
index f8667579b6..f8667579b6 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-gettingstarted.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-gettingstarted.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-guidelines.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-guidelines.qdoc
index f9c8246be8..f9c8246be8 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-guidelines.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-guidelines.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-icons.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-icons.qdoc
index 4948461c1a..4948461c1a 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-icons.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-icons.qdoc
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-imagine.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-imagine.qdoc
new file mode 100644
index 0000000000..98bb726d00
--- /dev/null
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-imagine.qdoc
@@ -0,0 +1,2511 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page qtquickcontrols2-imagine.html
+    \title Imagine Style
+
+    The Imagine Style is based on configurable image assets. \l{detailed-desc-imagine}{More...}
+
+    \styleimport {QtQuick.Controls.Imagine 2.12} {Qt 5.10}
+
+    \section1 Attached Properties
+
+    \list
+        \li \l {imagine-path-attached-prop}{\b path} : string
+    \endlist
+
+    \section1 Detailed Description
+    \target detailed-desc-imagine
+
+    The Imagine style is based on image assets. The style comes with a default
+    set of images, but the images can be easily changed by providing a directory
+    with images using a predefined naming convention.
+
+    \image qtquickcontrols2-imagine.png
+    \caption The Imagine style with the default images
+
+    To run an application with the Imagine style, see
+    \l {Using Styles in Qt Quick Controls}.
+
+    \section2 File Names
+
+    The image files are named using the following convention:
+
+    \c <control>-<element>-<states>
+
+    The \c <control> and \c <element> sections are mandatory, but the
+    \c <states> section is optional. For example, if a single file named
+    \c "button-background.9.png" is provided for \l {Button}, it will be used
+    for every state that \c Button supports. It is up to the developer to
+    decide the set of states that they will provide images for. However, it
+    is recommended to provide images for the most common control states where
+    possible, such as \c disabled, \c pressed, etc. This will ensure that
+    interactive controls visually behave as the end user would expect them to.
+
+    \section2 Element Reference
+
+    The following table lists which elements are supported for each control,
+    along with the possible states for that element, and the file extension
+    that it expects. An element is an image that represents a certain visual
+    part of the control. For example, \c {Button}'s \c "background" element
+    represents its \l {Control::}{background}.
+
+    \table
+        \header
+            \li Control
+            \li Element
+            \li States
+            \li Extension
+        \row
+            \li \l ApplicationWindow
+            \li background
+            \li active
+            \li .9.png (or .png)
+        \row
+            \li \l BusyIndicator
+            \li animation
+            \li disabled, running, mirrored, hovered
+            \li .webp
+        \row
+            \li
+            \li background
+            \li same as above
+            \li .webp
+        \row
+            \li \l Button
+            \li background
+            \li disabled, pressed, checked, checkable, focused, highlighted, flat, mirrored, hovered
+            \li .9.png
+        \row
+            \li \l CheckBox
+            \li background
+            \li disabled, pressed, checked, partially-checked, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li indicator
+            \li same as above
+            \li .png
+        \row
+            \li \l CheckDelegate
+            \li background
+            \li disabled, pressed, checked, partially-checked, focused, highlighted, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li indicator
+            \li same as above
+            \li .png
+        \row
+            \li \l ComboBox
+            \li background
+            \li disabled, pressed, editable, open, focused, mirrored, hovered, flat
+            \li .9.png (or .png)
+        \row
+            \li
+            \li indicator
+            \li same as above
+            \li .png
+        \row
+            \li
+            \li popup
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l DelayButton
+            \li background
+            \li disabled, pressed, checked, checkable, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li progress
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li
+            \li mask
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l Dial
+            \li background
+            \li disabled, pressed, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li handle
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l Dialog
+            \li background
+            \li modal, dim
+            \li .9.png (or .png)
+        \row
+            \li
+            \li title
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li
+            \li overlay
+            \li modal
+            \li .9.png (or .png)
+        \row
+            \li \l DialogButtonBox
+            \li background
+            \li disabled, mirrored
+            \li .9.png (or .png)
+        \row
+            \li \l Drawer
+            \li background
+            \li modal, dim, top, left, right, bottom
+            \li .9.png (or .png)
+        \row
+            \li
+            \li overlay
+            \li modal
+            \li .9.png (or .png)
+        \row
+            \li \l Frame
+            \li background
+            \li disabled, mirrored
+            \li .9.png (or .png)
+        \row
+            \li \l GroupBox
+            \li background
+            \li disabled, mirrored
+            \li .9.png (or .png)
+        \row
+            \li
+            \li title
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l ItemDelegate
+            \li background
+            \li disabled, pressed, focused, highlighted, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li \l Label
+            \li background
+            \li disabled, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li \l Menu
+            \li background
+            \li modal, dim
+            \li .9.png (or .png)
+        \row
+            \li
+            \li overlay
+            \li modal
+            \li .9.png (or .png)
+        \row
+            \li \l MenuItem
+            \li arrow
+            \li disabled, pressed, checked, focused, highlighted, mirrored, hovered
+            \li .png
+        \row
+            \li
+            \li background
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li
+            \li indicator
+            \li same as above
+            \li .png
+        \row
+            \li \l MenuSeparator
+            \li background
+            \li disabled, mirrored
+            \li .9.png (or .png)
+        \row
+            \li
+            \li separator
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l Page
+            \li background
+            \li disabled, mirrored
+            \li .9.png (or .png)
+        \row
+            \li \l PageIndicator
+            \li background
+            \li disabled, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li delegate
+            \li disabled, pressed, current, mirrored, hovered
+            \li .png
+        \row
+            \li \l Pane
+            \li background
+            \li disabled, mirrored
+            \li .9.png (or .png)
+        \row
+            \li \l Popup
+            \li background
+            \li modal, dim
+            \li .9.png (or .png)
+        \row
+            \li
+            \li overlay
+            \li modal
+            \li .9.png (or .png)
+        \row
+            \li \l ProgressBar
+            \li animation
+            \li disabled, mirrored, hovered
+            \li .png
+        \row
+            \li
+            \li background
+            \li disabled, indeterminate, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li mask
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li
+            \li progress
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l RadioButton
+            \li background
+            \li disabled, pressed, checked, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li indicator
+            \li same as above
+            \li .png
+        \row
+            \li \l RadioDelegate
+            \li background
+            \li disabled, pressed, checked, focused, highlighted, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li indicator
+            \li same as above
+            \li .png
+        \row
+            \li \l RangeSlider
+            \li background
+            \li vertical, horizontal, disabled, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li \l RangeSlider
+            \li progress
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li
+            \li handle
+            \li first, second, vertical, horizontal, disabled, pressed, focused, mirrored, hovered
+            \li .png
+        \row
+            \li \l RoundButton
+            \li background
+            \li disabled, pressed, checked, checkable, focused, highlighted, flat, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li \l ScrollBar
+            \li background
+            \li vertical, horizontal, disabled, interactive, pressed, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li handle
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l ScrollIndicator
+            \li background
+            \li vertical, horizontal, disabled, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li handle
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l ScrollView
+            \li background
+            \li disabled, mirrored
+            \li .9.png (or .png)
+        \row
+            \li \l Slider
+            \li background
+            \li vertical, horizontal, disabled, pressed, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li handle
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li
+            \li progress
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l SpinBox
+            \li background
+            \li disabled, editable, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li editor
+            \li disabled, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li indicator
+            \li up, down, disabled, editable, pressed, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li \l StackView
+            \li background
+            \li disabled, mirrored
+            \li .9.png (or .png)
+        \row
+            \li \l SwipeDelegate
+            \li background
+            \li disabled, pressed, focused, highlighted, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li \l SwipeView
+            \li background
+            \li vertical, horizontal, disabled, interactive, focused, mirrored
+            \li .9.png (or .png)
+        \row
+            \li \l Switch
+            \li background
+            \li disabled, pressed, checked, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li handle
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li
+            \li indicator
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l SwitchDelegate
+            \li background
+            \li disabled, pressed, checked, focused, highlighted, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li
+            \li handle
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li
+            \li indicator
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l TabBar
+            \li background
+            \li disabled, header, footer, mirrored
+            \li .9.png (or .png)
+        \row
+            \li \l TabButton
+            \li background
+            \li disabled, pressed, checked, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li \l TextArea
+            \li background
+            \li disabled, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li \l TextField
+            \li background
+            \li disabled, focused, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li \l ToolBar
+            \li background
+            \li disabled, header, footer, mirrored
+            \li .9.png (or .png)
+        \row
+            \li \l ToolButton
+            \li background
+            \li disabled, pressed, checked, checkable, focused, highlighted, flat, mirrored, hovered
+            \li .9.png (or .png)
+        \row
+            \li \l ToolSeparator
+            \li background
+            \li vertical, horizontal, disabled, mirrored
+            \li .9.png (or .png)
+        \row
+            \li
+            \li separator
+            \li same as above
+            \li .9.png (or .png)
+        \row
+            \li \l ToolTip
+            \li background
+            \li
+            \li .9.png (or .png)
+        \row
+            \li \l Tumbler
+            \li background
+            \li disabled, focused, mirrored, hovered
+            \li .9.png (or .png)
+    \endtable
+
+    \section2 Asset Examples
+
+    The following table lists examples of assets (taken from the
+    \l {https://code.qt.io/cgit/qt/qtdeclarative.git/tree/src/quickcontrols/imagine/images}
+    {default Imagine style assets}) for all controls. The list is not
+    exhaustive, as not all elements need assets, but it can be used as a guide
+    when creating your own assets.
+
+    The template that these assets were \l {Exporting 9-Patch Images}
+    {exported from} is available as a
+    \l {https://code.qt.io/cgit/qt/qtdeclarative.git/plain/src/quickcontrols/imagine/design/imagine.sketch}
+    {Sketch project}.
+
+    \table
+        \header
+            \li Control
+            \li Element
+            \li States
+            \li Asset
+            \li Notes
+        \row
+            \li \l ApplicationWindow
+            \li background
+            \li
+            \li \image imagine/images/applicationwindow-background.png
+            \li \l {sup1}{See footnote} \sup 1
+        \row
+            \li
+            \li overlay
+            \li
+            \li \image imagine/images/applicationwindow-overlay.png
+            \li \l {sup1}{See footnote} \sup 1
+        \row
+            \li
+            \li overlay
+            \li modal
+            \li \image imagine/images/applicationwindow-overlay-modal.png
+            \li \l {sup1}{See footnote} \sup 1
+        \row
+            \li \l Button
+            \li background
+            \li
+            \li \image imagine/images/button-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/button-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/button-background-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/button-background-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked
+            \li \image imagine/images/button-background-checked.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked, disabled
+            \li \image imagine/images/button-background-checked-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked, focused
+            \li \image imagine/images/button-background-checked-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked, hovered
+            \li \image imagine/images/button-background-checked-hovered.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted
+            \li \image imagine/images/button-background-highlighted.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted, disabled
+            \li \image imagine/images/button-background-highlighted-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted, focused
+            \li \image imagine/images/button-background-highlighted-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted, hovered
+            \li \image imagine/images/button-background-highlighted-hovered.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted, pressed
+            \li \image imagine/images/button-background-highlighted-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted, checked
+            \li \image imagine/images/button-background-highlighted-checked.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/button-background-hovered.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li flat
+            \li \image imagine/images/button-background-flat.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li flat, disabled
+            \li \image imagine/images/button-background-flat-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li flat, hovered
+            \li \image imagine/images/button-background-flat-hovered.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li flat, pressed
+            \li \image imagine/images/button-background-flat-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li flat, checked
+            \li \image imagine/images/button-background-flat-checked.9.png
+            \li
+        \row
+            \li \l CheckBox
+            \li indicator
+            \li
+            \li \image imagine/images/checkbox-indicator.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li disabled
+            \li \image imagine/images/checkbox-indicator-disabled.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li pressed
+            \li \image imagine/images/checkbox-indicator-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked
+            \li \image imagine/images/checkbox-indicator-checked.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, pressed
+            \li \image imagine/images/checkbox-indicator-checked-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, hovered
+            \li \image imagine/images/checkbox-indicator-checked-hovered.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, focused
+            \li \image imagine/images/checkbox-indicator-checked-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li partially, checked
+            \li \image imagine/images/checkbox-indicator-partially-checked.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li partially, checked, pressed
+            \li \image imagine/images/checkbox-indicator-partially-checked-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li partially, checked, focused
+            \li \image imagine/images/checkbox-indicator-partially-checked-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li partially, checked, hovered
+            \li \image imagine/images/checkbox-indicator-partially-checked-hovered.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li focused
+            \li \image imagine/images/checkbox-indicator-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li hovered
+            \li \image imagine/images/checkbox-indicator-hovered.png
+            \li
+        \row
+            \li \l CheckDelegate
+            \li background
+            \li
+            \li \image imagine/images/checkdelegate-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/checkdelegate-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/checkdelegate-background-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/checkdelegate-background-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/checkdelegate-background-hovered.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li
+            \li \image imagine/images/checkdelegate-indicator.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li disabled
+            \li \image imagine/images/checkdelegate-indicator-disabled.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li pressed
+            \li \image imagine/images/checkdelegate-indicator-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked
+            \li \image imagine/images/checkdelegate-indicator-checked.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, pressed
+            \li \image imagine/images/checkdelegate-indicator-checked-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, focused
+            \li \image imagine/images/checkdelegate-indicator-checked-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, hovered
+            \li \image imagine/images/checkdelegate-indicator-checked-hovered.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li focused
+            \li \image imagine/images/checkdelegate-indicator-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li hovered
+            \li \image imagine/images/checkdelegate-indicator-hovered.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li partially, checked
+            \li \image imagine/images/checkdelegate-indicator-partially-checked.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li partially, checked, pressed
+            \li \image imagine/images/checkdelegate-indicator-partially-checked-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li partially, checked, focused
+            \li \image imagine/images/checkdelegate-indicator-partially-checked-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li partially, checked, hovered
+            \li \image imagine/images/checkdelegate-indicator-partially-checked-hovered.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li hovered
+            \li \image imagine/images/checkdelegate-indicator-hovered.png
+            \li
+        \row
+            \li \l ComboBox
+            \li background
+            \li
+            \li \image imagine/images/combobox-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/combobox-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/combobox-background-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/combobox-background-hovered.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/combobox-background-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li open
+            \li \image imagine/images/combobox-background-open.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li editable
+            \li \image imagine/images/combobox-background-editable.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li editable, focused
+            \li \image imagine/images/combobox-background-editable-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li editable, disabled
+            \li \image imagine/images/combobox-background-editable-disabled.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li
+            \li \image imagine/images/combobox-indicator.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li disabled
+            \li \image imagine/images/combobox-indicator-disabled.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li editable
+            \li \image imagine/images/combobox-indicator-editable.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li editable, disabled
+            \li \image imagine/images/combobox-indicator-editable-disabled.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li editable, mirrored
+            \li \image imagine/images/combobox-indicator-editable-mirrored.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li editable, mirrored, disabled
+            \li \image imagine/images/combobox-indicator-editable-mirrored-disabled.png
+            \li
+        \row
+            \li
+            \li popup
+            \li
+            \li \image imagine/images/combobox-popup.9.png
+            \li
+        \row
+            \li \l DelayButton
+            \li background
+            \li
+            \li \image imagine/images/delaybutton-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/delaybutton-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled, checked
+            \li \image imagine/images/delaybutton-background-disabled-checked.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/delaybutton-background-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/delaybutton-background-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked
+            \li \image imagine/images/delaybutton-background-checked.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked, focused
+            \li \image imagine/images/delaybutton-background-checked-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked, hovered
+            \li \image imagine/images/delaybutton-background-checked-hovered.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/delaybutton-background-hovered.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li
+            \li \image imagine/images/delaybutton-progress.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li disabled
+            \li \image imagine/images/delaybutton-progress-disabled.9.png
+            \li
+        \row
+            \li
+            \li mask
+            \li
+            \li \image imagine/images/delaybutton-mask.9.png
+            \li
+        \row
+            \li \l Dial
+            \li background
+            \li
+            \li \image imagine/images/dial-background.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/dial-background-disabled.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/dial-background-focused.png
+            \li
+        \row
+            \li
+            \li handle
+            \li
+            \li \image imagine/images/dial-handle.png
+            \li
+        \row
+            \li
+            \li handle
+            \li disabled
+            \li \image imagine/images/dial-handle-disabled.png
+            \li
+        \row
+            \li
+            \li handle
+            \li focused
+            \li \image imagine/images/dial-handle-focused.png
+            \li
+        \row
+            \li
+            \li handle
+            \li focused, pressed
+            \li \image imagine/images/dial-handle-focused-pressed.png
+            \li
+        \row
+            \li
+            \li handle
+            \li focused, hovered
+            \li \image imagine/images/dial-handle-focused-hovered.png
+            \li
+        \row
+            \li
+            \li handle
+            \li pressed
+            \li \image imagine/images/dial-handle-pressed.png
+            \li
+        \row
+            \li
+            \li handle
+            \li hovered
+            \li \image imagine/images/dial-handle-hovered.png
+            \li
+        \row
+            \li \l Dialog
+            \li background
+            \li
+            \li \image imagine/images/dialog-background.9.png
+            \li
+        \row
+            \li
+            \li overlay
+            \li
+            \li \image imagine/images/dialog-overlay.png
+            \li \l {sup1}{See footnote} \sup 1
+        \row
+            \li
+            \li overlay
+            \li modal
+            \li \image imagine/images/dialog-overlay-modal.png
+            \li \l {sup1}{See footnote} \sup 1
+        \row
+            \li \l DialogButtonBox
+            \li background
+            \li
+            \li \image imagine/images/dialogbuttonbox-background.9.png
+            \li
+        \row
+            \li \l Drawer
+            \li background
+            \li left
+            \li \image imagine/images/drawer-background-left.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li right
+            \li \image imagine/images/drawer-background-right.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li top
+            \li \image imagine/images/drawer-background-top.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li bottom
+            \li \image imagine/images/drawer-background-bottom.9.png
+            \li
+        \row
+            \li
+            \li overlay
+            \li
+            \li \image imagine/images/drawer-overlay.png
+            \li \l {sup1}{See footnote} \sup 1
+        \row
+            \li
+            \li overlay
+            \li modal
+            \li \image imagine/images/drawer-overlay-modal.png
+            \li \l {sup1}{See footnote} \sup 1
+        \row
+            \li \l Frame
+            \li background
+            \li
+            \li \image imagine/images/frame-background.9.png
+            \li
+        \row
+            \li \l GroupBox
+            \li background
+            \li
+            \li \image imagine/images/groupbox-background.9.png
+            \li
+        \row
+            \li
+            \li title
+            \li
+            \li \image imagine/images/groupbox-title.9.png
+            \li
+        \row
+            \li \l ItemDelegate
+            \li background
+            \li
+            \li \image imagine/images/itemdelegate-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/itemdelegate-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/itemdelegate-background-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/itemdelegate-background-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/itemdelegate-background-hovered.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted
+            \li \image imagine/images/itemdelegate-background-highlighted.9.png
+            \li
+        \row
+            \li \l Menu
+            \li background
+            \li
+            \li \image imagine/images/menu-background.9.png
+            \li
+        \row
+            \li \l MenuItem
+            \li background
+            \li
+            \li \image imagine/images/menuitem-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted
+            \li \image imagine/images/menuitem-background-highlighted.9.png
+            \li
+        \row
+            \li
+            \li arrow
+            \li
+            \li \image imagine/images/menuitem-arrow.png
+            \li
+        \row
+            \li
+            \li arrow
+            \li mirrored
+            \li \image imagine/images/menuitem-arrow-mirrored.png
+            \li
+        \row
+            \li
+            \li arrow
+            \li disabled
+            \li \image imagine/images/menuitem-arrow-disabled.png
+            \li
+        \row
+            \li
+            \li arrow
+            \li mirrored, disabled
+            \li \image imagine/images/menuitem-arrow-mirrored-disabled.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li
+            \li \image imagine/images/menuitem-indicator.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li disabled
+            \li \image imagine/images/menuitem-indicator-disabled.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li pressed
+            \li \image imagine/images/menuitem-indicator-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked
+            \li \image imagine/images/menuitem-indicator-checked.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, pressed
+            \li \image imagine/images/menuitem-indicator-checked-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, focused
+            \li \image imagine/images/menuitem-indicator-checked-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, hovered
+            \li \image imagine/images/menuitem-indicator-checked-hovered.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li focused
+            \li \image imagine/images/menuitem-indicator-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li hovered
+            \li \image imagine/images/menuitem-indicator-hovered.png
+            \li
+        \row
+            \li \l MenuSeparator
+            \li separator
+            \li
+            \li \image imagine/images/menuseparator-separator.9.png
+            \li
+        \row
+            \li \l Page
+            \li background
+            \li
+            \li \image imagine/images/page-background.png
+            \li \l {sup1}{See footnote} \sup 1
+        \row
+            \li \l PageIndicator
+            \li delegate
+            \li
+            \li \image imagine/images/pageindicator-delegate.png
+            \li
+        \row
+            \li
+            \li delegate
+            \li disabled
+            \li \image imagine/images/pageindicator-delegate-disabled.png
+            \li
+        \row
+            \li
+            \li delegate
+            \li disabled, current
+            \li \image imagine/images/pageindicator-delegate-disabled-current.png
+            \li
+        \row
+            \li
+            \li delegate
+            \li pressed
+            \li \image imagine/images/pageindicator-delegate-pressed.png
+            \li
+        \row
+            \li
+            \li delegate
+            \li current
+            \li \image imagine/images/pageindicator-delegate-current.png
+            \li
+        \row
+            \li \l Pane
+            \li background
+            \li
+            \li \image imagine/images/pane-background.9.png
+            \li
+        \row
+            \li \l Popup
+            \li background
+            \li
+            \li \image imagine/images/popup-background.9.png
+            \li \l {sup1}{See footnote} \sup 1
+        \row
+            \li
+            \li overlay
+            \li
+            \li \image imagine/images/popup-overlay.png
+            \li \l {sup1}{See footnote} \sup 1
+        \row
+            \li
+            \li overlay
+            \li modal
+            \li \image imagine/images/popup-overlay-modal.png
+            \li
+        \row
+            \li \l ProgressBar
+            \li background
+            \li
+            \li \image imagine/images/progressbar-background.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li
+            \li \image imagine/images/progressbar-progress.png
+            \li
+        \row
+            \li
+            \li mask
+            \li
+            \li \image imagine/images/progressbar-mask.9.png
+            \li
+        \row
+            \li \l RadioButton
+            \li indicator
+            \li
+            \li \image imagine/images/radiobutton-indicator.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li disabled
+            \li \image imagine/images/radiobutton-indicator-disabled.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li pressed
+            \li \image imagine/images/radiobutton-indicator-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked
+            \li \image imagine/images/radiobutton-indicator-checked.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, focused
+            \li \image imagine/images/radiobutton-indicator-checked-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, hovered
+            \li \image imagine/images/radiobutton-indicator-checked-hovered.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, pressed
+            \li \image imagine/images/radiobutton-indicator-checked-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li focused
+            \li \image imagine/images/radiobutton-indicator-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li hovered
+            \li \image imagine/images/radiobutton-indicator-hovered.png
+            \li
+        \row
+            \li \l RadioDelegate
+            \li background
+            \li
+            \li \image imagine/images/radiodelegate-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/radiodelegate-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/radiodelegate-background-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/radiodelegate-background-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/radiodelegate-background-hovered.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li
+            \li \image imagine/images/radiodelegate-indicator.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li disabled
+            \li \image imagine/images/radiodelegate-indicator-disabled.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li pressed
+            \li \image imagine/images/radiodelegate-indicator-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked
+            \li \image imagine/images/radiodelegate-indicator-checked.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, focused
+            \li \image imagine/images/radiodelegate-indicator-checked-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, hovered
+            \li \image imagine/images/radiodelegate-indicator-checked-hovered.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, pressed
+            \li \image imagine/images/radiodelegate-indicator-checked-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li focused
+            \li \image imagine/images/radiodelegate-indicator-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li hovered
+            \li \image imagine/images/radiodelegate-indicator-hovered.png
+            \li
+        \row
+            \li \l RangeSlider
+            \li background
+            \li vertical
+            \li \image imagine/images/rangeslider-background-vertical.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li horizontal
+            \li \image imagine/images/rangeslider-background-horizontal.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li vertical
+            \li \image imagine/images/rangeslider-progress-vertical.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li vertical, disabled
+            \li \image imagine/images/rangeslider-progress-vertical-disabled.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li horizontal
+            \li \image imagine/images/rangeslider-progress-horizontal.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li horizontal, disabled
+            \li \image imagine/images/rangeslider-progress-horizontal-disabled.9.png
+            \li
+        \row
+            \li
+            \li handle
+            \li
+            \li \image imagine/images/rangeslider-handle.png
+            \li
+        \row
+            \li
+            \li handle
+            \li disabled
+            \li \image imagine/images/rangeslider-handle-disabled.png
+            \li
+        \row
+            \li
+            \li handle
+            \li focused
+            \li \image imagine/images/rangeslider-handle-focused.png
+            \li
+        \row
+            \li
+            \li handle
+            \li focused, hovered
+            \li \image imagine/images/rangeslider-handle-focused-hovered.png
+            \li
+        \row
+            \li
+            \li handle
+            \li focused, pressed
+            \li \image imagine/images/rangeslider-handle-focused-pressed.png
+            \li
+        \row
+            \li
+            \li handle
+            \li hovered
+            \li \image imagine/images/rangeslider-handle-hovered.png
+            \li
+        \row
+            \li
+            \li handle
+            \li pressed
+            \li \image imagine/images/rangeslider-handle-pressed.png
+            \li
+        \row
+            \li \l RoundButton
+            \li background
+            \li
+            \li \image imagine/images/roundbutton-background.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/roundbutton-background-disabled.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled, checked
+            \li \image imagine/images/roundbutton-background-disabled-checked.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/roundbutton-background-focused.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/roundbutton-background-pressed.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked
+            \li \image imagine/images/roundbutton-background-checked.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked, focused
+            \li \image imagine/images/roundbutton-background-checked-focused.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked, hovered
+            \li \image imagine/images/roundbutton-background-checked-hovered.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted
+            \li \image imagine/images/roundbutton-background-highlighted.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted, pressed
+            \li \image imagine/images/roundbutton-background-highlighted-pressed.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted, focused
+            \li \image imagine/images/roundbutton-background-highlighted-focused.png
+            \li
+        \row
+            \li
+            \li background
+            \li highlighted, hovered
+            \li \image imagine/images/roundbutton-background-highlighted-hovered.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/roundbutton-background-hovered.png
+            \li
+        \row
+            \li \l ScrollBar
+            \li handle
+            \li
+            \li \image imagine/images/scrollbar-handle.png
+            \li
+        \row
+            \li
+            \li handle
+            \li disabled
+            \li \image imagine/images/scrollbar-handle-disabled.png
+            \li
+        \row
+            \li
+            \li handle
+            \li interactive
+            \li \image imagine/images/scrollbar-handle-interactive.png
+            \li
+        \row
+            \li
+            \li handle
+            \li interactive, disabled
+            \li \image imagine/images/scrollbar-handle-interactive-disabled.png
+            \li
+        \row
+            \li
+            \li handle
+            \li interactive, pressed
+            \li \image imagine/images/scrollbar-handle-interactive-pressed.png
+            \li
+        \row
+            \li
+            \li handle
+            \li interactive, hovered
+            \li \image imagine/images/scrollbar-handle-interactive-hovered.png
+            \li
+        \row
+            \li \l ScrollIndicator
+            \li handle
+            \li
+            \li \image imagine/images/scrollindicator-handle.png
+            \li
+        \row
+            \li \l Slider
+            \li background
+            \li vertical
+            \li \image imagine/images/slider-background-vertical.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li horizontal
+            \li \image imagine/images/slider-background-horizontal.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li vertical
+            \li \image imagine/images/slider-progress-vertical.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li vertical, disabled
+            \li \image imagine/images/slider-progress-vertical-disabled.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li horizontal
+            \li \image imagine/images/slider-progress-horizontal.9.png
+            \li
+        \row
+            \li
+            \li progress
+            \li horizontal, disabled
+            \li \image imagine/images/slider-progress-horizontal-disabled.9.png
+            \li
+        \row
+            \li
+            \li handle
+            \li
+            \li \image imagine/images/slider-handle.png
+            \li
+        \row
+            \li
+            \li handle
+            \li disabled
+            \li \image imagine/images/slider-handle-disabled.png
+            \li
+        \row
+            \li
+            \li handle
+            \li focused
+            \li \image imagine/images/slider-handle-focused.png
+            \li
+        \row
+            \li
+            \li handle
+            \li focused, hovered
+            \li \image imagine/images/slider-handle-focused-hovered.png
+            \li
+        \row
+            \li
+            \li handle
+            \li focused, pressed
+            \li \image imagine/images/slider-handle-focused-pressed.png
+            \li
+        \row
+            \li
+            \li handle
+            \li hovered
+            \li \image imagine/images/slider-handle-hovered.png
+            \li
+        \row
+            \li
+            \li handle
+            \li pressed
+            \li \image imagine/images/slider-handle-pressed.png
+            \li
+        \row
+            \li \l SpinBox
+            \li background
+            \li
+            \li \image imagine/images/spinbox-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/spinbox-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/spinbox-background-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li editable
+            \li \image imagine/images/spinbox-background-editable.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up
+            \li \image imagine/images/spinbox-indicator-up.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up, disabled
+            \li \image imagine/images/spinbox-indicator-up-disabled.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up, pressed
+            \li \image imagine/images/spinbox-indicator-up-pressed.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up, focused
+            \li \image imagine/images/spinbox-indicator-up-focused.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up, mirrored
+            \li \image imagine/images/spinbox-indicator-up-mirrored.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up, hovered
+            \li \image imagine/images/spinbox-indicator-up-hovered.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up, editable
+            \li \image imagine/images/spinbox-indicator-up-editable.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up, editable, pressed
+            \li \image imagine/images/spinbox-indicator-up-editable-pressed.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up, editable, focused
+            \li \image imagine/images/spinbox-indicator-up-editable-focused.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up, editable, mirrored
+            \li \image imagine/images/spinbox-indicator-up-editable-mirrored.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li up, editable, hovered
+            \li \image imagine/images/spinbox-indicator-up-editable-hovered.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down
+            \li \image imagine/images/spinbox-indicator-down.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down, disabled
+            \li \image imagine/images/spinbox-indicator-down-disabled.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down, pressed
+            \li \image imagine/images/spinbox-indicator-down-pressed.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down, focused
+            \li \image imagine/images/spinbox-indicator-down-focused.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down, mirrored
+            \li \image imagine/images/spinbox-indicator-down-mirrored.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down, hovered
+            \li \image imagine/images/spinbox-indicator-down-hovered.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down, editable
+            \li \image imagine/images/spinbox-indicator-down-editable.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down, editable, pressed
+            \li \image imagine/images/spinbox-indicator-down-editable-pressed.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down, editable, focused
+            \li \image imagine/images/spinbox-indicator-down-editable-focused.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down, editable, mirrored
+            \li \image imagine/images/spinbox-indicator-down-editable-mirrored.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li down, editable, hovered
+            \li \image imagine/images/spinbox-indicator-down-editable-hovered.9.png
+            \li
+        \row
+            \li \l SwipeDelegate
+            \li background
+            \li
+            \li \image imagine/images/swipedelegate-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/swipedelegate-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/swipedelegate-background-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/swipedelegate-background-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/swipedelegate-background-hovered.9.png
+            \li
+        \row
+            \li \l Switch
+            \li indicator
+            \li
+            \li \image imagine/images/switch-indicator.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li disabled
+            \li \image imagine/images/switch-indicator-disabled.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li pressed
+            \li \image imagine/images/switch-indicator-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked
+            \li \image imagine/images/switch-indicator-checked.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, focused
+            \li \image imagine/images/switch-indicator-checked-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, hovered
+            \li \image imagine/images/switch-indicator-checked-hovered.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, pressed
+            \li \image imagine/images/switch-indicator-checked-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li focused
+            \li \image imagine/images/switch-indicator-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li hovered
+            \li \image imagine/images/switch-indicator-hovered.png
+            \li
+        \row
+            \li
+            \li handle
+            \li
+            \li \image imagine/images/switch-handle.png
+            \li
+        \row
+            \li
+            \li handle
+            \li disabled
+            \li \image imagine/images/switch-handle-disabled.png
+            \li
+        \row
+            \li
+            \li handle
+            \li pressed
+            \li \image imagine/images/switch-handle-pressed.png
+            \li
+        \row
+            \li \l SwitchDelegate
+            \li background
+            \li
+            \li \image imagine/images/switchdelegate-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/switchdelegate-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/switchdelegate-background-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/switchdelegate-background-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/switchdelegate-background-hovered.9.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li
+            \li \image imagine/images/switchdelegate-indicator.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li disabled
+            \li \image imagine/images/switchdelegate-indicator-disabled.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li pressed
+            \li \image imagine/images/switchdelegate-indicator-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked
+            \li \image imagine/images/switchdelegate-indicator-checked.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, focused
+            \li \image imagine/images/switchdelegate-indicator-checked-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, hovered
+            \li \image imagine/images/switchdelegate-indicator-checked-hovered.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li checked, pressed
+            \li \image imagine/images/switchdelegate-indicator-checked-pressed.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li focused
+            \li \image imagine/images/switchdelegate-indicator-focused.png
+            \li
+        \row
+            \li
+            \li indicator
+            \li hovered
+            \li \image imagine/images/switchdelegate-indicator-hovered.png
+            \li
+        \row
+            \li
+            \li handle
+            \li
+            \li \image imagine/images/switchdelegate-handle.png
+            \li
+        \row
+            \li
+            \li handle
+            \li disabled
+            \li \image imagine/images/switchdelegate-handle-disabled.png
+            \li
+        \row
+            \li \l TabBar
+            \li background
+            \li
+            \li \image imagine/images/tabbar-background.png
+            \li
+        \row
+            \li \l TabButton
+            \li background
+            \li
+            \li \image imagine/images/tabbutton-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/tabbutton-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/tabbutton-background-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked
+            \li \image imagine/images/tabbutton-background-checked.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/tabbutton-background-hovered.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled, checked
+            \li \image imagine/images/tabbutton-background-disabled-checked.9.png
+            \li
+        \row
+            \li \l TextArea
+            \li background
+            \li
+            \li \image imagine/images/textarea-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/textarea-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/textarea-background-focused.9.png
+            \li
+        \row
+            \li \l TextField
+            \li background
+            \li
+            \li \image imagine/images/textfield-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled
+            \li \image imagine/images/textfield-background-disabled.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/textfield-background-focused.9.png
+            \li
+        \row
+            \li \l ToolBar
+            \li background
+            \li
+            \li \image imagine/images/toolbar-background.png
+            \li
+        \row
+            \li \l ToolButton
+            \li background
+            \li
+            \li \image imagine/images/toolbutton-background.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li disabled, checked
+            \li \image imagine/images/toolbutton-background-disabled-checked.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li focused
+            \li \image imagine/images/toolbutton-background-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li pressed
+            \li \image imagine/images/toolbutton-background-pressed.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked
+            \li \image imagine/images/toolbutton-background-checked.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked, focused
+            \li \image imagine/images/toolbutton-background-checked-focused.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li checked, hovered
+            \li \image imagine/images/toolbutton-background-checked-hovered.9.png
+            \li
+        \row
+            \li
+            \li background
+            \li hovered
+            \li \image imagine/images/toolbutton-background-hovered.9.png
+            \li
+        \row
+            \li \l ToolSeparator
+            \li separator
+            \li horizontal
+            \li \image imagine/images/toolseparator-separator-horizontal.9.png
+            \li
+        \row
+            \li
+            \li separator
+            \li vertical
+            \li \image imagine/images/toolseparator-separator-vertical.9.png
+            \li
+        \row
+            \li \l ToolTip
+            \li background
+            \li
+            \li \image imagine/images/tooltip-background.9.png
+            \li
+    \endtable
+
+    \target sup1
+    \sup 1 A 1x1 image containing one color, stretched to fill the control.
+
+    \section2 9-Patch Images
+
+    The Imagine style uses \l
+    {https://developer.android.com/guide/topics/graphics/2d-graphics.html#nine-patch}{9-patch
+    images} in order to give designers control over how a particular element
+    responds to being resized. Here is an example of a 9-patch image that
+    represents a \l {Button}'s \l {Control::}{background}, alongside a
+    magnified version (to make it easier to see the 9-patch lines):
+
+    \image qtquickcontrols2-imagine-9-patch-4x.png
+
+    The content of the image is 44 pixels wide by 32 pixels high. Every 9-patch
+    image needs a one pixel thick line (collectively referred to as
+    "9-patch lines") around every side, so the actual size of the image becomes
+    46 pixels wide by 34 pixels high. Note that the 9-patch lines must be one
+    pixel thick regardless of the target DPI of the image. For example,
+    the 9-patch lines for button-background.9.png and button-background@2x.9.png
+    must both be one pixel thick.
+
+    The 9-patch lines must be black, and the remaining areas must be transparent
+    or white:
+
+    \image qtquickcontrols2-imagine-9-patch-size.png
+
+    \section3 Stretchable Areas
+
+    The 9-patch lines on the top and left edges determine which parts of the
+    image are stretched when it is resized.
+
+    Below are examples of the 9-patch image being resized to one and a half
+    times its original size in various dimensions:
+
+    \image qtquickcontrols2-imagine-9-patch-resized-stretchable.png
+
+    Notice how the the rounded corners keep their original size, as they are
+    outside the range of the lines.
+
+    \section3 Padding Areas
+
+    The 9-patch lines on the right and bottom edges determine how much space
+    is available for the control's \l {Control::}{contentItem}, which means it
+    can also be thought of as controlling the \l {Control::}{padding}. For a
+    diagram that illustrates padding, see \l {Control Layout}.
+
+    Below are more examples of the 9-patch image being resized, but this time
+    demonstrating how the padding 9-patch lines work.
+
+    \image qtquickcontrols2-imagine-9-patch-resized-padding.png
+
+    The \c contentItem can take up as much space as it needs within the shaded
+    areas. If the padding lines are left out, the \c contentItem will take as
+    much space as it needs without exceeding the stretchable areas.
+
+    \section3 Inset Areas
+
+    In some cases it is necessary for a control to have a drop shadow, for
+    example. However, if we were to add a drop shadow to the button above, it
+    would affect its size, which presents problems for both layouting and
+    mouse/touch input boundaries.
+
+    Inset areas accounts for this by telling the control that a certain area of
+    the 9-patch image should go outside of the control:
+
+    \image qtquickcontrols2-imagine-9-patch-inset.png
+
+    In the image below, the dashed line represents the button's clickable area,
+    as well as the space that it will take up in a layout. The shadow is marked
+    by the striped area behind it:
+
+    \image qtquickcontrols2-imagine-9-patch-inset-boundaries.png
+
+    \section3 Exporting 9-Patch Images
+
+    Various vector and bitmap editors can be used to create 9-patch images
+    suitable for use with the Imagine style. The following sections briefly
+    explain the export process for each editor, and the last section explains
+    how to ensure the exported images are 9-patch-conformant.
+
+    \section4 Affinity Designer
+
+    See Affinity's \l {https://affinity.help/publisher/en-US.lproj/pages/Publishing/exportSettings.html}
+    {Export Settings} documentation.
+
+    \section4 Adobe Illustrator
+
+    See Adobe's
+    \l {https://helpx.adobe.com/in/illustrator/using/collect-assets-export-for-screens.html#panel}
+    {Asset Export panel} documentation.
+
+    \section4 Adobe Photoshop
+
+    See Adobe's
+    \l {https://helpx.adobe.com/photoshop/using/generate-assets-layers.html}
+    {Generate image assets from layers} documentation.
+
+    \section4 Inkscape
+
+    The \l {https://github.com/mitchcurtis/inkscape-9-patch-export}
+    {Inkscape 9-Patch Export Extension} can be used to export assets with
+    Inkscape.
+
+    \section4 Sketch
+
+    See Sketch's \l {https://sketchapp.com/docs/exporting/}{Exporting} documentation.
+
+    Qt Quick Controls also provides a
+    \l {http://code.qt.io/cgit/qt/qtdeclarative.git/tree/src/quickcontrols/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,
+    the plugin will automatically process images when they are exported.
+
+    \section4 Fixing 9-Patch Lines
+
+    When exporting 9-patch images in several DPI variants (\c {@2x}, \c {@3x},
+    etc.), the 9-patch lines will typically be scaled up along with the image.
+    There are several ways to fix this, but perhaps the simplest approach is
+    to use \l {https://www.imagemagick.org/script/mogrify.php}{ImageMagick's mogrify}
+    tool. The tool has a \c -shave feature that can be used to crop the image
+    to reduce the thickness of the 9-patch lines:
+
+    \badcode
+    mogrify -shave 1x1 -path path/to/images *@2x.9.png
+    mogrify -shave 2x2 -path path/to/images *@3x.9.png
+    mogrify -shave 3x3 -path path/to/images *@4x.9.png
+    \endcode
+
+    Regular DPI images (those without the \c @Nx prefix) are not affected, so it
+    is only necessary to run the command on images intended for high DPI displays.
+
+    \section2 Animated Images
+
+    The \l {https://developers.google.com/speed/webp/}{WebP} and GIF animated
+    image formats are supported by the Imagine style.
+
+    \section2 Customization
+
+    \section3 Path
+
+    The Imagine style allows customizing the \l {imagine-path-attached-prop}{path}
+    that is used to do the image asset selection. The path can be specified for any
+    window or item, and it automatically propagates to children in the same manner as
+    \l {Control::font}{fonts}. In the following example, the window and all three radio
+    buttons appear with dark image assets (files that are located in "qrc:/themes/dark").
+
+    \table
+        \row
+            \li
+                \qml
+                import QtQuick 2.12
+                import QtQuick.Controls 2.12
+                import QtQuick.Controls.Imagine 2.12
+
+                ApplicationWindow {
+                    visible: true
+
+                    Imagine.path: "qrc:/themes/dark"
+
+                    Column {
+                        anchors.centerIn: parent
+
+                        RadioButton { text: qsTr("Small") }
+                        RadioButton { text: qsTr("Medium"); checked: true }
+                        RadioButton { text: qsTr("Large") }
+                    }
+                }
+                \endqml
+            \li
+                \image qtquickcontrols2-imagine-customization-dark.png
+    \endtable
+
+    In addition to specifying the path in QML, it is also possible to specify
+    it via an \l {imagine-customization-environment-variable}{environment variable}
+    or in a \l {imagine-customization-configuration-file}{configuration file}.
+    Attributes specified in QML take precedence over all other methods.
+
+    \section4 Configuration File
+    \target imagine-customization-configuration-file
+
+    \include qquickimaginestyle.qdocinc conf
+
+    See \l {Qt Quick Controls Configuration File} for more details about the
+    configuration file.
+
+    \section4 Environment Variables
+    \target imagine-customization-environment-variable
+
+    \include qquickimaginestyle.qdocinc env
+
+    See \l {Supported Environment Variables in Qt Quick Controls} for the full
+    list of supported environment variables.
+
+    \section3 Palette
+
+    The Imagine style supports palette customization via the \l {Item::}{palette}
+    property and the \l {Palette Configuration}{qtquickcontrols2.conf} file.
+    As with other styles, the exact \l[QML]{Palette}{palette roles}
+    that the Imagine style uses are style-dependent. However, as most of the visual
+    appearance of controls (for example: backgrounds) are managed through image assets,
+    only the roles that are typically used for text will have an effect.
+
+    \section3 Font
+
+    Custom fonts can be set via the \l {Control::}{font} property and the
+    \l {Font Configuration}{configuration} file.
+
+    \section2 Dependency
+
+    The Imagine style must be separately imported to gain access to the
+    attributes that are specific to the Imagine style. It should be noted
+    that regardless of the references to the Imagine style, the same
+    application code runs with any other style. Imagine-specific attributes
+    only have an effect when the application is run with the Imagine style.
+
+    If the Imagine style is imported in a QML file that is always loaded, the
+    Imagine style must be deployed with the application in order to be able
+    to run the application regardless of which style the application is run with.
+    By using \l {Using File Selectors with Qt Quick Controls}{file selectors},
+    style-specific tweaks can be applied without creating a hard dependency to
+    a style.
+
+    \b {See also} \l {Styling Qt Quick Controls}
+
+    \section1 Attached Property Documentation
+
+    \styleproperty {Imagine.path} {string} {imagine-path-attached-prop}
+    \target imagine-path-attached-prop
+    This attached property holds the path to the image assets...
+
+    \code
+    Button {
+        Imagine.path: "qrc:/themes/dark"
+    }
+    \endcode
+
+    \endstyleproperty
+
+    \section1 Related Information
+
+    \list
+      \li \l{Styling Qt Quick Controls}
+      \li \l{Qt Quick Controls - Imagine Style Example: Automotive}{Automotive Example}
+      \li \l{Qt Quick Controls - Imagine Style Example: Music Player}{Music Player Example}
+    \endlist
+*/
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-index.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-index.qdoc
index ea148e8568..ea148e8568 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-index.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-indicators.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-indicators.qdoc
index 1526ec1b80..1526ec1b80 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-indicators.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-indicators.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-input.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-input.qdoc
index 580438e8ac..580438e8ac 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-input.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-input.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-ios.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-ios.qdoc
index 3ac7d51710..3ac7d51710 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-ios.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-ios.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-macos.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-macos.qdoc
index 911baf6c20..911baf6c20 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-macos.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-macos.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-material.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-material.qdoc
index 8b9c74eabb..8b9c74eabb 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-material.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-menus.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-menus.qdoc
index 7d54b4f027..7d54b4f027 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-menus.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-menus.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-navigation.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-navigation.qdoc
index 2013fc8dfd..2013fc8dfd 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-navigation.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-navigation.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-popups.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-popups.qdoc
index 388443e24f..388443e24f 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-popups.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-popups.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-qmltypes.qdoc
index f1ff074b57..f1ff074b57 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-qmltypes.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-separators.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-separators.qdoc
index 1105a5bf5f..1105a5bf5f 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-separators.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-separators.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-styles.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-styles.qdoc
index df79e08e3f..df79e08e3f 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-styles.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-universal.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-universal.qdoc
index 4dfdebb963..4dfdebb963 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-universal.qdoc
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-windows.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-windows.qdoc
index e068f3c86d..e068f3c86d 100644
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-windows.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-windows.qdoc
diff --git a/src/quickcontrols2/fusion/ApplicationWindow.qml b/src/quickcontrols/fusion/ApplicationWindow.qml
index fbd1cc2e76..fbd1cc2e76 100644
--- a/src/quickcontrols2/fusion/ApplicationWindow.qml
+++ b/src/quickcontrols/fusion/ApplicationWindow.qml
diff --git a/src/quickcontrols2/fusion/BusyIndicator.qml b/src/quickcontrols/fusion/BusyIndicator.qml
index dcd2f23f49..dcd2f23f49 100644
--- a/src/quickcontrols2/fusion/BusyIndicator.qml
+++ b/src/quickcontrols/fusion/BusyIndicator.qml
diff --git a/src/quickcontrols2/fusion/Button.qml b/src/quickcontrols/fusion/Button.qml
index 2ee8e12373..2ee8e12373 100644
--- a/src/quickcontrols2/fusion/Button.qml
+++ b/src/quickcontrols/fusion/Button.qml
diff --git a/src/quickcontrols2/fusion/CMakeLists.txt b/src/quickcontrols/fusion/CMakeLists.txt
index 69f8f5f96d..69f8f5f96d 100644
--- a/src/quickcontrols2/fusion/CMakeLists.txt
+++ b/src/quickcontrols/fusion/CMakeLists.txt
diff --git a/src/quickcontrols2/fusion/CheckBox.qml b/src/quickcontrols/fusion/CheckBox.qml
index 414414804d..414414804d 100644
--- a/src/quickcontrols2/fusion/CheckBox.qml
+++ b/src/quickcontrols/fusion/CheckBox.qml
diff --git a/src/quickcontrols2/fusion/CheckDelegate.qml b/src/quickcontrols/fusion/CheckDelegate.qml
index f14deaa16a..f14deaa16a 100644
--- a/src/quickcontrols2/fusion/CheckDelegate.qml
+++ b/src/quickcontrols/fusion/CheckDelegate.qml
diff --git a/src/quickcontrols2/fusion/ComboBox.qml b/src/quickcontrols/fusion/ComboBox.qml
index 6caa7d3f94..6caa7d3f94 100644
--- a/src/quickcontrols2/fusion/ComboBox.qml
+++ b/src/quickcontrols/fusion/ComboBox.qml
diff --git a/src/quickcontrols2/fusion/DelayButton.qml b/src/quickcontrols/fusion/DelayButton.qml
index 8dde74f468..8dde74f468 100644
--- a/src/quickcontrols2/fusion/DelayButton.qml
+++ b/src/quickcontrols/fusion/DelayButton.qml
diff --git a/src/quickcontrols2/fusion/Dial.qml b/src/quickcontrols/fusion/Dial.qml
index 7fa0af3379..7fa0af3379 100644
--- a/src/quickcontrols2/fusion/Dial.qml
+++ b/src/quickcontrols/fusion/Dial.qml
diff --git a/src/quickcontrols2/fusion/Dialog.qml b/src/quickcontrols/fusion/Dialog.qml
index f17321bcc0..f17321bcc0 100644
--- a/src/quickcontrols2/fusion/Dialog.qml
+++ b/src/quickcontrols/fusion/Dialog.qml
diff --git a/src/quickcontrols2/fusion/DialogButtonBox.qml b/src/quickcontrols/fusion/DialogButtonBox.qml
index 566058fa73..566058fa73 100644
--- a/src/quickcontrols2/fusion/DialogButtonBox.qml
+++ b/src/quickcontrols/fusion/DialogButtonBox.qml
diff --git a/src/quickcontrols2/fusion/Drawer.qml b/src/quickcontrols/fusion/Drawer.qml
index 713ac0c076..713ac0c076 100644
--- a/src/quickcontrols2/fusion/Drawer.qml
+++ b/src/quickcontrols/fusion/Drawer.qml
diff --git a/src/quickcontrols2/fusion/Frame.qml b/src/quickcontrols/fusion/Frame.qml
index 0512639f4e..0512639f4e 100644
--- a/src/quickcontrols2/fusion/Frame.qml
+++ b/src/quickcontrols/fusion/Frame.qml
diff --git a/src/quickcontrols2/fusion/GroupBox.qml b/src/quickcontrols/fusion/GroupBox.qml
index 5e949dc5cb..5e949dc5cb 100644
--- a/src/quickcontrols2/fusion/GroupBox.qml
+++ b/src/quickcontrols/fusion/GroupBox.qml
diff --git a/src/quickcontrols2/fusion/HorizontalHeaderView.qml b/src/quickcontrols/fusion/HorizontalHeaderView.qml
index aafe0fb2fd..aafe0fb2fd 100644
--- a/src/quickcontrols2/fusion/HorizontalHeaderView.qml
+++ b/src/quickcontrols/fusion/HorizontalHeaderView.qml
diff --git a/src/quickcontrols2/fusion/ItemDelegate.qml b/src/quickcontrols/fusion/ItemDelegate.qml
index 5a3e9c45ea..5a3e9c45ea 100644
--- a/src/quickcontrols2/fusion/ItemDelegate.qml
+++ b/src/quickcontrols/fusion/ItemDelegate.qml
diff --git a/src/quickcontrols2/fusion/Label.qml b/src/quickcontrols/fusion/Label.qml
index 9a715d9ed8..9a715d9ed8 100644
--- a/src/quickcontrols2/fusion/Label.qml
+++ b/src/quickcontrols/fusion/Label.qml
diff --git a/src/quickcontrols2/fusion/Menu.qml b/src/quickcontrols/fusion/Menu.qml
index e0f565a69b..e0f565a69b 100644
--- a/src/quickcontrols2/fusion/Menu.qml
+++ b/src/quickcontrols/fusion/Menu.qml
diff --git a/src/quickcontrols2/fusion/MenuBar.qml b/src/quickcontrols/fusion/MenuBar.qml
index 6e039d8a3e..6e039d8a3e 100644
--- a/src/quickcontrols2/fusion/MenuBar.qml
+++ b/src/quickcontrols/fusion/MenuBar.qml
diff --git a/src/quickcontrols2/fusion/MenuBarItem.qml b/src/quickcontrols/fusion/MenuBarItem.qml
index 299c34416b..299c34416b 100644
--- a/src/quickcontrols2/fusion/MenuBarItem.qml
+++ b/src/quickcontrols/fusion/MenuBarItem.qml
diff --git a/src/quickcontrols2/fusion/MenuItem.qml b/src/quickcontrols/fusion/MenuItem.qml
index ce701b74f4..ce701b74f4 100644
--- a/src/quickcontrols2/fusion/MenuItem.qml
+++ b/src/quickcontrols/fusion/MenuItem.qml
diff --git a/src/quickcontrols2/fusion/MenuSeparator.qml b/src/quickcontrols/fusion/MenuSeparator.qml
index b27dcf4a59..b27dcf4a59 100644
--- a/src/quickcontrols2/fusion/MenuSeparator.qml
+++ b/src/quickcontrols/fusion/MenuSeparator.qml
diff --git a/src/quickcontrols2/fusion/Page.qml b/src/quickcontrols/fusion/Page.qml
index 65a752318d..65a752318d 100644
--- a/src/quickcontrols2/fusion/Page.qml
+++ b/src/quickcontrols/fusion/Page.qml
diff --git a/src/quickcontrols2/fusion/PageIndicator.qml b/src/quickcontrols/fusion/PageIndicator.qml
index c6f235a9da..c6f235a9da 100644
--- a/src/quickcontrols2/fusion/PageIndicator.qml
+++ b/src/quickcontrols/fusion/PageIndicator.qml
diff --git a/src/quickcontrols2/fusion/Pane.qml b/src/quickcontrols/fusion/Pane.qml
index 366c2fffe0..366c2fffe0 100644
--- a/src/quickcontrols2/fusion/Pane.qml
+++ b/src/quickcontrols/fusion/Pane.qml
diff --git a/src/quickcontrols2/fusion/Popup.qml b/src/quickcontrols/fusion/Popup.qml
index d669b5e758..d669b5e758 100644
--- a/src/quickcontrols2/fusion/Popup.qml
+++ b/src/quickcontrols/fusion/Popup.qml
diff --git a/src/quickcontrols2/fusion/ProgressBar.qml b/src/quickcontrols/fusion/ProgressBar.qml
index c05f1898db..c05f1898db 100644
--- a/src/quickcontrols2/fusion/ProgressBar.qml
+++ b/src/quickcontrols/fusion/ProgressBar.qml
diff --git a/src/quickcontrols2/fusion/RadioButton.qml b/src/quickcontrols/fusion/RadioButton.qml
index 2553679bc4..2553679bc4 100644
--- a/src/quickcontrols2/fusion/RadioButton.qml
+++ b/src/quickcontrols/fusion/RadioButton.qml
diff --git a/src/quickcontrols2/fusion/RadioDelegate.qml b/src/quickcontrols/fusion/RadioDelegate.qml
index f99cf81d21..f99cf81d21 100644
--- a/src/quickcontrols2/fusion/RadioDelegate.qml
+++ b/src/quickcontrols/fusion/RadioDelegate.qml
diff --git a/src/quickcontrols2/fusion/RangeSlider.qml b/src/quickcontrols/fusion/RangeSlider.qml
index b9052c04eb..b9052c04eb 100644
--- a/src/quickcontrols2/fusion/RangeSlider.qml
+++ b/src/quickcontrols/fusion/RangeSlider.qml
diff --git a/src/quickcontrols2/fusion/RoundButton.qml b/src/quickcontrols/fusion/RoundButton.qml
index 1952e2ccac..1952e2ccac 100644
--- a/src/quickcontrols2/fusion/RoundButton.qml
+++ b/src/quickcontrols/fusion/RoundButton.qml
diff --git a/src/quickcontrols2/fusion/ScrollBar.qml b/src/quickcontrols/fusion/ScrollBar.qml
index 616050df69..616050df69 100644
--- a/src/quickcontrols2/fusion/ScrollBar.qml
+++ b/src/quickcontrols/fusion/ScrollBar.qml
diff --git a/src/quickcontrols2/fusion/ScrollIndicator.qml b/src/quickcontrols/fusion/ScrollIndicator.qml
index a324c049e3..a324c049e3 100644
--- a/src/quickcontrols2/fusion/ScrollIndicator.qml
+++ b/src/quickcontrols/fusion/ScrollIndicator.qml
diff --git a/src/quickcontrols2/fusion/ScrollView.qml b/src/quickcontrols/fusion/ScrollView.qml
index 60789313c9..60789313c9 100644
--- a/src/quickcontrols2/fusion/ScrollView.qml
+++ b/src/quickcontrols/fusion/ScrollView.qml
diff --git a/src/quickcontrols2/fusion/SelectionRectangle.qml b/src/quickcontrols/fusion/SelectionRectangle.qml
index 762fec30c8..762fec30c8 100644
--- a/src/quickcontrols2/fusion/SelectionRectangle.qml
+++ b/src/quickcontrols/fusion/SelectionRectangle.qml
diff --git a/src/quickcontrols2/fusion/Slider.qml b/src/quickcontrols/fusion/Slider.qml
index c78dbed468..c78dbed468 100644
--- a/src/quickcontrols2/fusion/Slider.qml
+++ b/src/quickcontrols/fusion/Slider.qml
diff --git a/src/quickcontrols2/fusion/SpinBox.qml b/src/quickcontrols/fusion/SpinBox.qml
index 03fa470a32..03fa470a32 100644
--- a/src/quickcontrols2/fusion/SpinBox.qml
+++ b/src/quickcontrols/fusion/SpinBox.qml
diff --git a/src/quickcontrols2/fusion/SplitView.qml b/src/quickcontrols/fusion/SplitView.qml
index 1046d800eb..1046d800eb 100644
--- a/src/quickcontrols2/fusion/SplitView.qml
+++ b/src/quickcontrols/fusion/SplitView.qml
diff --git a/src/quickcontrols2/fusion/SwipeDelegate.qml b/src/quickcontrols/fusion/SwipeDelegate.qml
index 1c47433bba..1c47433bba 100644
--- a/src/quickcontrols2/fusion/SwipeDelegate.qml
+++ b/src/quickcontrols/fusion/SwipeDelegate.qml
diff --git a/src/quickcontrols2/fusion/Switch.qml b/src/quickcontrols/fusion/Switch.qml
index 3965b29c36..3965b29c36 100644
--- a/src/quickcontrols2/fusion/Switch.qml
+++ b/src/quickcontrols/fusion/Switch.qml
diff --git a/src/quickcontrols2/fusion/SwitchDelegate.qml b/src/quickcontrols/fusion/SwitchDelegate.qml
index b7c4278c71..b7c4278c71 100644
--- a/src/quickcontrols2/fusion/SwitchDelegate.qml
+++ b/src/quickcontrols/fusion/SwitchDelegate.qml
diff --git a/src/quickcontrols2/fusion/TabBar.qml b/src/quickcontrols/fusion/TabBar.qml
index 275bcf5a2a..275bcf5a2a 100644
--- a/src/quickcontrols2/fusion/TabBar.qml
+++ b/src/quickcontrols/fusion/TabBar.qml
diff --git a/src/quickcontrols2/fusion/TabButton.qml b/src/quickcontrols/fusion/TabButton.qml
index add96a8fa3..add96a8fa3 100644
--- a/src/quickcontrols2/fusion/TabButton.qml
+++ b/src/quickcontrols/fusion/TabButton.qml
diff --git a/src/quickcontrols2/fusion/TextArea.qml b/src/quickcontrols/fusion/TextArea.qml
index 5e1ecfa905..5e1ecfa905 100644
--- a/src/quickcontrols2/fusion/TextArea.qml
+++ b/src/quickcontrols/fusion/TextArea.qml
diff --git a/src/quickcontrols2/fusion/TextField.qml b/src/quickcontrols/fusion/TextField.qml
index b358c668d8..b358c668d8 100644
--- a/src/quickcontrols2/fusion/TextField.qml
+++ b/src/quickcontrols/fusion/TextField.qml
diff --git a/src/quickcontrols2/fusion/ToolBar.qml b/src/quickcontrols/fusion/ToolBar.qml
index 13b269e9df..13b269e9df 100644
--- a/src/quickcontrols2/fusion/ToolBar.qml
+++ b/src/quickcontrols/fusion/ToolBar.qml
diff --git a/src/quickcontrols2/fusion/ToolButton.qml b/src/quickcontrols/fusion/ToolButton.qml
index dd9b628261..dd9b628261 100644
--- a/src/quickcontrols2/fusion/ToolButton.qml
+++ b/src/quickcontrols/fusion/ToolButton.qml
diff --git a/src/quickcontrols2/fusion/ToolSeparator.qml b/src/quickcontrols/fusion/ToolSeparator.qml
index 569ee66ec5..569ee66ec5 100644
--- a/src/quickcontrols2/fusion/ToolSeparator.qml
+++ b/src/quickcontrols/fusion/ToolSeparator.qml
diff --git a/src/quickcontrols2/fusion/ToolTip.qml b/src/quickcontrols/fusion/ToolTip.qml
index 5166d2b8b6..5166d2b8b6 100644
--- a/src/quickcontrols2/fusion/ToolTip.qml
+++ b/src/quickcontrols/fusion/ToolTip.qml
diff --git a/src/quickcontrols2/fusion/TreeViewDelegate.qml b/src/quickcontrols/fusion/TreeViewDelegate.qml
index 5223361872..5223361872 100644
--- a/src/quickcontrols2/fusion/TreeViewDelegate.qml
+++ b/src/quickcontrols/fusion/TreeViewDelegate.qml
diff --git a/src/quickcontrols2/fusion/Tumbler.qml b/src/quickcontrols/fusion/Tumbler.qml
index 447765dce7..447765dce7 100644
--- a/src/quickcontrols2/fusion/Tumbler.qml
+++ b/src/quickcontrols/fusion/Tumbler.qml
diff --git a/src/quickcontrols2/fusion/VerticalHeaderView.qml b/src/quickcontrols/fusion/VerticalHeaderView.qml
index 7ae2fcdd62..7ae2fcdd62 100644
--- a/src/quickcontrols2/fusion/VerticalHeaderView.qml
+++ b/src/quickcontrols/fusion/VerticalHeaderView.qml
diff --git a/src/quickcontrols2/fusion/images/arrow.png b/src/quickcontrols/fusion/images/arrow.png
index 97ef0238e5..97ef0238e5 100644
--- a/src/quickcontrols2/fusion/images/arrow.png
+++ b/src/quickcontrols/fusion/images/arrow.png
diff --git a/src/quickcontrols2/fusion/images/arrow.svg b/src/quickcontrols/fusion/images/arrow.svg
index 4438392495..4438392495 100644
--- a/src/quickcontrols2/fusion/images/arrow.svg
+++ b/src/quickcontrols/fusion/images/arrow.svg
diff --git a/src/quickcontrols2/fusion/images/arrow@2x.png b/src/quickcontrols/fusion/images/arrow@2x.png
index 9bfc4e6eed..9bfc4e6eed 100644
--- a/src/quickcontrols2/fusion/images/arrow@2x.png
+++ b/src/quickcontrols/fusion/images/arrow@2x.png
diff --git a/src/quickcontrols2/fusion/images/arrow@3x.png b/src/quickcontrols/fusion/images/arrow@3x.png
index 6fd9c988dc..6fd9c988dc 100644
--- a/src/quickcontrols2/fusion/images/arrow@3x.png
+++ b/src/quickcontrols/fusion/images/arrow@3x.png
diff --git a/src/quickcontrols2/fusion/images/arrow@4x.png b/src/quickcontrols/fusion/images/arrow@4x.png
index f5e1e66a1d..f5e1e66a1d 100644
--- a/src/quickcontrols2/fusion/images/arrow@4x.png
+++ b/src/quickcontrols/fusion/images/arrow@4x.png
diff --git a/src/quickcontrols2/fusion/images/checkmark.png b/src/quickcontrols/fusion/images/checkmark.png
index deb30419d0..deb30419d0 100644
--- a/src/quickcontrols2/fusion/images/checkmark.png
+++ b/src/quickcontrols/fusion/images/checkmark.png
diff --git a/src/quickcontrols2/fusion/images/checkmark.svg b/src/quickcontrols/fusion/images/checkmark.svg
index f1afdc4f9f..f1afdc4f9f 100644
--- a/src/quickcontrols2/fusion/images/checkmark.svg
+++ b/src/quickcontrols/fusion/images/checkmark.svg
diff --git a/src/quickcontrols2/fusion/images/checkmark@2x.png b/src/quickcontrols/fusion/images/checkmark@2x.png
index f80de0a425..f80de0a425 100644
--- a/src/quickcontrols2/fusion/images/checkmark@2x.png
+++ b/src/quickcontrols/fusion/images/checkmark@2x.png
diff --git a/src/quickcontrols2/fusion/images/checkmark@3x.png b/src/quickcontrols/fusion/images/checkmark@3x.png
index c095eed18a..c095eed18a 100644
--- a/src/quickcontrols2/fusion/images/checkmark@3x.png
+++ b/src/quickcontrols/fusion/images/checkmark@3x.png
diff --git a/src/quickcontrols2/fusion/images/checkmark@4x.png b/src/quickcontrols/fusion/images/checkmark@4x.png
index e58c7b4df4..e58c7b4df4 100644
--- a/src/quickcontrols2/fusion/images/checkmark@4x.png
+++ b/src/quickcontrols/fusion/images/checkmark@4x.png
diff --git a/src/quickcontrols2/fusion/images/progressmask.png b/src/quickcontrols/fusion/images/progressmask.png
index a354377c4a..a354377c4a 100644
--- a/src/quickcontrols2/fusion/images/progressmask.png
+++ b/src/quickcontrols/fusion/images/progressmask.png
diff --git a/src/quickcontrols2/fusion/images/progressmask.svg b/src/quickcontrols/fusion/images/progressmask.svg
index a0dfc4269d..a0dfc4269d 100644
--- a/src/quickcontrols2/fusion/images/progressmask.svg
+++ b/src/quickcontrols/fusion/images/progressmask.svg
diff --git a/src/quickcontrols2/fusion/images/progressmask@2x.png b/src/quickcontrols/fusion/images/progressmask@2x.png
index 69476bf4a0..69476bf4a0 100644
--- a/src/quickcontrols2/fusion/images/progressmask@2x.png
+++ b/src/quickcontrols/fusion/images/progressmask@2x.png
diff --git a/src/quickcontrols2/fusion/images/progressmask@3x.png b/src/quickcontrols/fusion/images/progressmask@3x.png
index 00a1c09d87..00a1c09d87 100644
--- a/src/quickcontrols2/fusion/images/progressmask@3x.png
+++ b/src/quickcontrols/fusion/images/progressmask@3x.png
diff --git a/src/quickcontrols2/fusion/images/progressmask@4x.png b/src/quickcontrols/fusion/images/progressmask@4x.png
index 263110d5fe..263110d5fe 100644
--- a/src/quickcontrols2/fusion/images/progressmask@4x.png
+++ b/src/quickcontrols/fusion/images/progressmask@4x.png
diff --git a/src/quickcontrols2/fusion/impl/ButtonPanel.qml b/src/quickcontrols/fusion/impl/ButtonPanel.qml
index b7fa6a7a8e..b7fa6a7a8e 100644
--- a/src/quickcontrols2/fusion/impl/ButtonPanel.qml
+++ b/src/quickcontrols/fusion/impl/ButtonPanel.qml
diff --git a/src/quickcontrols2/fusion/impl/CMakeLists.txt b/src/quickcontrols/fusion/impl/CMakeLists.txt
index e52f1ecc06..e52f1ecc06 100644
--- a/src/quickcontrols2/fusion/impl/CMakeLists.txt
+++ b/src/quickcontrols/fusion/impl/CMakeLists.txt
diff --git a/src/quickcontrols2/fusion/impl/CheckIndicator.qml b/src/quickcontrols/fusion/impl/CheckIndicator.qml
index 58de99654a..58de99654a 100644
--- a/src/quickcontrols2/fusion/impl/CheckIndicator.qml
+++ b/src/quickcontrols/fusion/impl/CheckIndicator.qml
diff --git a/src/quickcontrols2/fusion/impl/RadioIndicator.qml b/src/quickcontrols/fusion/impl/RadioIndicator.qml
index 0949b904a9..0949b904a9 100644
--- a/src/quickcontrols2/fusion/impl/RadioIndicator.qml
+++ b/src/quickcontrols/fusion/impl/RadioIndicator.qml
diff --git a/src/quickcontrols2/fusion/impl/SliderGroove.qml b/src/quickcontrols/fusion/impl/SliderGroove.qml
index 8cfdd836b3..8cfdd836b3 100644
--- a/src/quickcontrols2/fusion/impl/SliderGroove.qml
+++ b/src/quickcontrols/fusion/impl/SliderGroove.qml
diff --git a/src/quickcontrols2/fusion/impl/SliderHandle.qml b/src/quickcontrols/fusion/impl/SliderHandle.qml
index e12d4c0bb7..e12d4c0bb7 100644
--- a/src/quickcontrols2/fusion/impl/SliderHandle.qml
+++ b/src/quickcontrols/fusion/impl/SliderHandle.qml
diff --git a/src/quickcontrols2/fusion/impl/SwitchIndicator.qml b/src/quickcontrols/fusion/impl/SwitchIndicator.qml
index 8bc9238228..8bc9238228 100644
--- a/src/quickcontrols2/fusion/impl/SwitchIndicator.qml
+++ b/src/quickcontrols/fusion/impl/SwitchIndicator.qml
diff --git a/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator.cpp b/src/quickcontrols/fusion/impl/qquickfusionbusyindicator.cpp
index cce69b0e4b..cce69b0e4b 100644
--- a/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator.cpp
+++ b/src/quickcontrols/fusion/impl/qquickfusionbusyindicator.cpp
diff --git a/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator_p.h b/src/quickcontrols/fusion/impl/qquickfusionbusyindicator_p.h
index 22ff2af788..22ff2af788 100644
--- a/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator_p.h
+++ b/src/quickcontrols/fusion/impl/qquickfusionbusyindicator_p.h
diff --git a/src/quickcontrols2/fusion/impl/qquickfusiondial.cpp b/src/quickcontrols/fusion/impl/qquickfusiondial.cpp
index 99b022726c..99b022726c 100644
--- a/src/quickcontrols2/fusion/impl/qquickfusiondial.cpp
+++ b/src/quickcontrols/fusion/impl/qquickfusiondial.cpp
diff --git a/src/quickcontrols2/fusion/impl/qquickfusiondial_p.h b/src/quickcontrols/fusion/impl/qquickfusiondial_p.h
index 3167c81515..3167c81515 100644
--- a/src/quickcontrols2/fusion/impl/qquickfusiondial_p.h
+++ b/src/quickcontrols/fusion/impl/qquickfusiondial_p.h
diff --git a/src/quickcontrols2/fusion/impl/qquickfusionknob.cpp b/src/quickcontrols/fusion/impl/qquickfusionknob.cpp
index 00be4bd759..00be4bd759 100644
--- a/src/quickcontrols2/fusion/impl/qquickfusionknob.cpp
+++ b/src/quickcontrols/fusion/impl/qquickfusionknob.cpp
diff --git a/src/quickcontrols2/fusion/impl/qquickfusionknob_p.h b/src/quickcontrols/fusion/impl/qquickfusionknob_p.h
index 909aa4ffc6..909aa4ffc6 100644
--- a/src/quickcontrols2/fusion/impl/qquickfusionknob_p.h
+++ b/src/quickcontrols/fusion/impl/qquickfusionknob_p.h
diff --git a/src/quickcontrols2/fusion/qquickfusionstyle.cpp b/src/quickcontrols/fusion/qquickfusionstyle.cpp
index fec1a674bf..fec1a674bf 100644
--- a/src/quickcontrols2/fusion/qquickfusionstyle.cpp
+++ b/src/quickcontrols/fusion/qquickfusionstyle.cpp
diff --git a/src/quickcontrols2/fusion/qquickfusionstyle_p.h b/src/quickcontrols/fusion/qquickfusionstyle_p.h
index a264201211..a264201211 100644
--- a/src/quickcontrols2/fusion/qquickfusionstyle_p.h
+++ b/src/quickcontrols/fusion/qquickfusionstyle_p.h
diff --git a/src/quickcontrols2/fusion/qquickfusiontheme.cpp b/src/quickcontrols/fusion/qquickfusiontheme.cpp
index 335d3be73f..335d3be73f 100644
--- a/src/quickcontrols2/fusion/qquickfusiontheme.cpp
+++ b/src/quickcontrols/fusion/qquickfusiontheme.cpp
diff --git a/src/quickcontrols2/fusion/qquickfusiontheme_p.h b/src/quickcontrols/fusion/qquickfusiontheme_p.h
index a41c9d7315..a41c9d7315 100644
--- a/src/quickcontrols2/fusion/qquickfusiontheme_p.h
+++ b/src/quickcontrols/fusion/qquickfusiontheme_p.h
diff --git a/src/quickcontrols2/fusion/qtquickcontrols2fusionstyleplugin.cpp b/src/quickcontrols/fusion/qtquickcontrols2fusionstyleplugin.cpp
index 532d7597ce..532d7597ce 100644
--- a/src/quickcontrols2/fusion/qtquickcontrols2fusionstyleplugin.cpp
+++ b/src/quickcontrols/fusion/qtquickcontrols2fusionstyleplugin.cpp
diff --git a/src/quickcontrols2/imagine/ApplicationWindow.qml b/src/quickcontrols/imagine/ApplicationWindow.qml
index c0ea1037c1..c0ea1037c1 100644
--- a/src/quickcontrols2/imagine/ApplicationWindow.qml
+++ b/src/quickcontrols/imagine/ApplicationWindow.qml
diff --git a/src/quickcontrols2/imagine/BusyIndicator.qml b/src/quickcontrols/imagine/BusyIndicator.qml
index 6dc40dc4be..6dc40dc4be 100644
--- a/src/quickcontrols2/imagine/BusyIndicator.qml
+++ b/src/quickcontrols/imagine/BusyIndicator.qml
diff --git a/src/quickcontrols2/imagine/Button.qml b/src/quickcontrols/imagine/Button.qml
index 6526909587..6526909587 100644
--- a/src/quickcontrols2/imagine/Button.qml
+++ b/src/quickcontrols/imagine/Button.qml
diff --git a/src/quickcontrols2/imagine/CMakeLists.txt b/src/quickcontrols/imagine/CMakeLists.txt
index e4a164add2..e4a164add2 100644
--- a/src/quickcontrols2/imagine/CMakeLists.txt
+++ b/src/quickcontrols/imagine/CMakeLists.txt
diff --git a/src/quickcontrols2/imagine/CheckBox.qml b/src/quickcontrols/imagine/CheckBox.qml
index 11a2048e6f..11a2048e6f 100644
--- a/src/quickcontrols2/imagine/CheckBox.qml
+++ b/src/quickcontrols/imagine/CheckBox.qml
diff --git a/src/quickcontrols2/imagine/CheckDelegate.qml b/src/quickcontrols/imagine/CheckDelegate.qml
index ccae3c1b9f..ccae3c1b9f 100644
--- a/src/quickcontrols2/imagine/CheckDelegate.qml
+++ b/src/quickcontrols/imagine/CheckDelegate.qml
diff --git a/src/quickcontrols2/imagine/ComboBox.qml b/src/quickcontrols/imagine/ComboBox.qml
index 254313454c..254313454c 100644
--- a/src/quickcontrols2/imagine/ComboBox.qml
+++ b/src/quickcontrols/imagine/ComboBox.qml
diff --git a/src/quickcontrols2/imagine/DelayButton.qml b/src/quickcontrols/imagine/DelayButton.qml
index 73854cdd33..73854cdd33 100644
--- a/src/quickcontrols2/imagine/DelayButton.qml
+++ b/src/quickcontrols/imagine/DelayButton.qml
diff --git a/src/quickcontrols2/imagine/Dial.qml b/src/quickcontrols/imagine/Dial.qml
index 85eb0a8422..85eb0a8422 100644
--- a/src/quickcontrols2/imagine/Dial.qml
+++ b/src/quickcontrols/imagine/Dial.qml
diff --git a/src/quickcontrols2/imagine/Dialog.qml b/src/quickcontrols/imagine/Dialog.qml
index 4d3c29633e..4d3c29633e 100644
--- a/src/quickcontrols2/imagine/Dialog.qml
+++ b/src/quickcontrols/imagine/Dialog.qml
diff --git a/src/quickcontrols2/imagine/DialogButtonBox.qml b/src/quickcontrols/imagine/DialogButtonBox.qml
index 81d87b65df..81d87b65df 100644
--- a/src/quickcontrols2/imagine/DialogButtonBox.qml
+++ b/src/quickcontrols/imagine/DialogButtonBox.qml
diff --git a/src/quickcontrols2/imagine/Drawer.qml b/src/quickcontrols/imagine/Drawer.qml
index b6ecbb2b20..b6ecbb2b20 100644
--- a/src/quickcontrols2/imagine/Drawer.qml
+++ b/src/quickcontrols/imagine/Drawer.qml
diff --git a/src/quickcontrols2/imagine/Frame.qml b/src/quickcontrols/imagine/Frame.qml
index a3076171f5..a3076171f5 100644
--- a/src/quickcontrols2/imagine/Frame.qml
+++ b/src/quickcontrols/imagine/Frame.qml
diff --git a/src/quickcontrols2/imagine/GroupBox.qml b/src/quickcontrols/imagine/GroupBox.qml
index e833a92da1..e833a92da1 100644
--- a/src/quickcontrols2/imagine/GroupBox.qml
+++ b/src/quickcontrols/imagine/GroupBox.qml
diff --git a/src/quickcontrols2/imagine/HorizontalHeaderView.qml b/src/quickcontrols/imagine/HorizontalHeaderView.qml
index 140c9f3ae8..140c9f3ae8 100644
--- a/src/quickcontrols2/imagine/HorizontalHeaderView.qml
+++ b/src/quickcontrols/imagine/HorizontalHeaderView.qml
diff --git a/src/quickcontrols2/imagine/ItemDelegate.qml b/src/quickcontrols/imagine/ItemDelegate.qml
index 2a2b0bd796..2a2b0bd796 100644
--- a/src/quickcontrols2/imagine/ItemDelegate.qml
+++ b/src/quickcontrols/imagine/ItemDelegate.qml
diff --git a/src/quickcontrols2/imagine/Label.qml b/src/quickcontrols/imagine/Label.qml
index 9a612bcd35..9a612bcd35 100644
--- a/src/quickcontrols2/imagine/Label.qml
+++ b/src/quickcontrols/imagine/Label.qml
diff --git a/src/quickcontrols2/imagine/Menu.qml b/src/quickcontrols/imagine/Menu.qml
index 6c58ea7290..6c58ea7290 100644
--- a/src/quickcontrols2/imagine/Menu.qml
+++ b/src/quickcontrols/imagine/Menu.qml
diff --git a/src/quickcontrols2/imagine/MenuItem.qml b/src/quickcontrols/imagine/MenuItem.qml
index 5d8809d61a..5d8809d61a 100644
--- a/src/quickcontrols2/imagine/MenuItem.qml
+++ b/src/quickcontrols/imagine/MenuItem.qml
diff --git a/src/quickcontrols2/imagine/MenuSeparator.qml b/src/quickcontrols/imagine/MenuSeparator.qml
index 0ed3504dca..0ed3504dca 100644
--- a/src/quickcontrols2/imagine/MenuSeparator.qml
+++ b/src/quickcontrols/imagine/MenuSeparator.qml
diff --git a/src/quickcontrols2/imagine/Page.qml b/src/quickcontrols/imagine/Page.qml
index 9e32db27b7..9e32db27b7 100644
--- a/src/quickcontrols2/imagine/Page.qml
+++ b/src/quickcontrols/imagine/Page.qml
diff --git a/src/quickcontrols2/imagine/PageIndicator.qml b/src/quickcontrols/imagine/PageIndicator.qml
index 42afbda70a..42afbda70a 100644
--- a/src/quickcontrols2/imagine/PageIndicator.qml
+++ b/src/quickcontrols/imagine/PageIndicator.qml
diff --git a/src/quickcontrols2/imagine/Pane.qml b/src/quickcontrols/imagine/Pane.qml
index f74ea96d23..f74ea96d23 100644
--- a/src/quickcontrols2/imagine/Pane.qml
+++ b/src/quickcontrols/imagine/Pane.qml
diff --git a/src/quickcontrols2/imagine/Popup.qml b/src/quickcontrols/imagine/Popup.qml
index 185f2fabaf..185f2fabaf 100644
--- a/src/quickcontrols2/imagine/Popup.qml
+++ b/src/quickcontrols/imagine/Popup.qml
diff --git a/src/quickcontrols2/imagine/ProgressBar.qml b/src/quickcontrols/imagine/ProgressBar.qml
index 641320fab3..641320fab3 100644
--- a/src/quickcontrols2/imagine/ProgressBar.qml
+++ b/src/quickcontrols/imagine/ProgressBar.qml
diff --git a/src/quickcontrols2/imagine/RadioButton.qml b/src/quickcontrols/imagine/RadioButton.qml
index 2f9335eb7c..2f9335eb7c 100644
--- a/src/quickcontrols2/imagine/RadioButton.qml
+++ b/src/quickcontrols/imagine/RadioButton.qml
diff --git a/src/quickcontrols2/imagine/RadioDelegate.qml b/src/quickcontrols/imagine/RadioDelegate.qml
index f872798864..f872798864 100644
--- a/src/quickcontrols2/imagine/RadioDelegate.qml
+++ b/src/quickcontrols/imagine/RadioDelegate.qml
diff --git a/src/quickcontrols2/imagine/RangeSlider.qml b/src/quickcontrols/imagine/RangeSlider.qml
index e0559e65b3..e0559e65b3 100644
--- a/src/quickcontrols2/imagine/RangeSlider.qml
+++ b/src/quickcontrols/imagine/RangeSlider.qml
diff --git a/src/quickcontrols2/imagine/RoundButton.qml b/src/quickcontrols/imagine/RoundButton.qml
index 2000d92f85..2000d92f85 100644
--- a/src/quickcontrols2/imagine/RoundButton.qml
+++ b/src/quickcontrols/imagine/RoundButton.qml
diff --git a/src/quickcontrols2/imagine/ScrollBar.qml b/src/quickcontrols/imagine/ScrollBar.qml
index 09db8eea0b..09db8eea0b 100644
--- a/src/quickcontrols2/imagine/ScrollBar.qml
+++ b/src/quickcontrols/imagine/ScrollBar.qml
diff --git a/src/quickcontrols2/imagine/ScrollIndicator.qml b/src/quickcontrols/imagine/ScrollIndicator.qml
index 285379a307..285379a307 100644
--- a/src/quickcontrols2/imagine/ScrollIndicator.qml
+++ b/src/quickcontrols/imagine/ScrollIndicator.qml
diff --git a/src/quickcontrols2/imagine/ScrollView.qml b/src/quickcontrols/imagine/ScrollView.qml
index 4e7d1a8afe..4e7d1a8afe 100644
--- a/src/quickcontrols2/imagine/ScrollView.qml
+++ b/src/quickcontrols/imagine/ScrollView.qml
diff --git a/src/quickcontrols2/imagine/SelectionRectangle.qml b/src/quickcontrols/imagine/SelectionRectangle.qml
index 79940b6723..79940b6723 100644
--- a/src/quickcontrols2/imagine/SelectionRectangle.qml
+++ b/src/quickcontrols/imagine/SelectionRectangle.qml
diff --git a/src/quickcontrols2/imagine/Slider.qml b/src/quickcontrols/imagine/Slider.qml
index 01b5899fcb..01b5899fcb 100644
--- a/src/quickcontrols2/imagine/Slider.qml
+++ b/src/quickcontrols/imagine/Slider.qml
diff --git a/src/quickcontrols2/imagine/SpinBox.qml b/src/quickcontrols/imagine/SpinBox.qml
index 973cc1d1d6..973cc1d1d6 100644
--- a/src/quickcontrols2/imagine/SpinBox.qml
+++ b/src/quickcontrols/imagine/SpinBox.qml
diff --git a/src/quickcontrols2/imagine/SplitView.qml b/src/quickcontrols/imagine/SplitView.qml
index 8c4c6f4ee5..8c4c6f4ee5 100644
--- a/src/quickcontrols2/imagine/SplitView.qml
+++ b/src/quickcontrols/imagine/SplitView.qml
diff --git a/src/quickcontrols2/imagine/StackView.qml b/src/quickcontrols/imagine/StackView.qml
index 27b9d77b9a..27b9d77b9a 100644
--- a/src/quickcontrols2/imagine/StackView.qml
+++ b/src/quickcontrols/imagine/StackView.qml
diff --git a/src/quickcontrols2/imagine/SwipeDelegate.qml b/src/quickcontrols/imagine/SwipeDelegate.qml
index 24f550ce23..24f550ce23 100644
--- a/src/quickcontrols2/imagine/SwipeDelegate.qml
+++ b/src/quickcontrols/imagine/SwipeDelegate.qml
diff --git a/src/quickcontrols2/imagine/SwipeView.qml b/src/quickcontrols/imagine/SwipeView.qml
index c0bafd1233..c0bafd1233 100644
--- a/src/quickcontrols2/imagine/SwipeView.qml
+++ b/src/quickcontrols/imagine/SwipeView.qml
diff --git a/src/quickcontrols2/imagine/Switch.qml b/src/quickcontrols/imagine/Switch.qml
index c2d3f70f2c..c2d3f70f2c 100644
--- a/src/quickcontrols2/imagine/Switch.qml
+++ b/src/quickcontrols/imagine/Switch.qml
diff --git a/src/quickcontrols2/imagine/SwitchDelegate.qml b/src/quickcontrols/imagine/SwitchDelegate.qml
index ed8b93c2ba..ed8b93c2ba 100644
--- a/src/quickcontrols2/imagine/SwitchDelegate.qml
+++ b/src/quickcontrols/imagine/SwitchDelegate.qml
diff --git a/src/quickcontrols2/imagine/TabBar.qml b/src/quickcontrols/imagine/TabBar.qml
index a0086cb76f..a0086cb76f 100644
--- a/src/quickcontrols2/imagine/TabBar.qml
+++ b/src/quickcontrols/imagine/TabBar.qml
diff --git a/src/quickcontrols2/imagine/TabButton.qml b/src/quickcontrols/imagine/TabButton.qml
index 7b7a88c91b..7b7a88c91b 100644
--- a/src/quickcontrols2/imagine/TabButton.qml
+++ b/src/quickcontrols/imagine/TabButton.qml
diff --git a/src/quickcontrols2/imagine/TextArea.qml b/src/quickcontrols/imagine/TextArea.qml
index d47ffffbd7..d47ffffbd7 100644
--- a/src/quickcontrols2/imagine/TextArea.qml
+++ b/src/quickcontrols/imagine/TextArea.qml
diff --git a/src/quickcontrols2/imagine/TextField.qml b/src/quickcontrols/imagine/TextField.qml
index 9c0ddd1f25..9c0ddd1f25 100644
--- a/src/quickcontrols2/imagine/TextField.qml
+++ b/src/quickcontrols/imagine/TextField.qml
diff --git a/src/quickcontrols2/imagine/ToolBar.qml b/src/quickcontrols/imagine/ToolBar.qml
index 9e1467e90e..9e1467e90e 100644
--- a/src/quickcontrols2/imagine/ToolBar.qml
+++ b/src/quickcontrols/imagine/ToolBar.qml
diff --git a/src/quickcontrols2/imagine/ToolButton.qml b/src/quickcontrols/imagine/ToolButton.qml
index 13b4c9b111..13b4c9b111 100644
--- a/src/quickcontrols2/imagine/ToolButton.qml
+++ b/src/quickcontrols/imagine/ToolButton.qml
diff --git a/src/quickcontrols2/imagine/ToolSeparator.qml b/src/quickcontrols/imagine/ToolSeparator.qml
index 4861e26086..4861e26086 100644
--- a/src/quickcontrols2/imagine/ToolSeparator.qml
+++ b/src/quickcontrols/imagine/ToolSeparator.qml
diff --git a/src/quickcontrols2/imagine/ToolTip.qml b/src/quickcontrols/imagine/ToolTip.qml
index 841e5a3613..841e5a3613 100644
--- a/src/quickcontrols2/imagine/ToolTip.qml
+++ b/src/quickcontrols/imagine/ToolTip.qml
diff --git a/src/quickcontrols2/imagine/Tumbler.qml b/src/quickcontrols/imagine/Tumbler.qml
index 7052c6654c..7052c6654c 100644
--- a/src/quickcontrols2/imagine/Tumbler.qml
+++ b/src/quickcontrols/imagine/Tumbler.qml
diff --git a/src/quickcontrols2/imagine/VerticalHeaderView.qml b/src/quickcontrols/imagine/VerticalHeaderView.qml
index a59e228d20..a59e228d20 100644
--- a/src/quickcontrols2/imagine/VerticalHeaderView.qml
+++ b/src/quickcontrols/imagine/VerticalHeaderView.qml
diff --git a/src/quickcontrols2/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js b/src/quickcontrols/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js
index a7f9a4598d..a7f9a4598d 100644
--- a/src/quickcontrols2/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js
+++ b/src/quickcontrols/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js
diff --git a/src/quickcontrols2/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json b/src/quickcontrols/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json
index 40807aa3d5..40807aa3d5 100644
--- a/src/quickcontrols2/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json
+++ b/src/quickcontrols/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json
diff --git a/src/quickcontrols2/imagine/design/imagine.sketch b/src/quickcontrols/imagine/design/imagine.sketch
index f3535b372b..f3535b372b 100644
--- a/src/quickcontrols2/imagine/design/imagine.sketch
+++ b/src/quickcontrols/imagine/design/imagine.sketch
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-background.png b/src/quickcontrols/imagine/images/applicationwindow-background.png
index 2d8d70f288..2d8d70f288 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-background.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-background.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-background@2x.png b/src/quickcontrols/imagine/images/applicationwindow-background@2x.png
index 18fbaa4c63..18fbaa4c63 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-background@2x.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-background@2x.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-background@3x.png b/src/quickcontrols/imagine/images/applicationwindow-background@3x.png
index 241232b1e0..241232b1e0 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-background@3x.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-background@3x.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-background@4x.png b/src/quickcontrols/imagine/images/applicationwindow-background@4x.png
index 8eb1b1ecc1..8eb1b1ecc1 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-background@4x.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-background@4x.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal.png b/src/quickcontrols/imagine/images/applicationwindow-overlay-modal.png
index d4a43d1c70..d4a43d1c70 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-overlay-modal.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@2x.png b/src/quickcontrols/imagine/images/applicationwindow-overlay-modal@2x.png
index c9a8f4124b..c9a8f4124b 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@2x.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-overlay-modal@2x.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@3x.png b/src/quickcontrols/imagine/images/applicationwindow-overlay-modal@3x.png
index 4a1084a919..4a1084a919 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@3x.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-overlay-modal@3x.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@4x.png b/src/quickcontrols/imagine/images/applicationwindow-overlay-modal@4x.png
index b92e600dae..b92e600dae 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-overlay-modal@4x.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-overlay-modal@4x.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-overlay.png b/src/quickcontrols/imagine/images/applicationwindow-overlay.png
index b7da23c00f..b7da23c00f 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-overlay.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-overlay.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-overlay@2x.png b/src/quickcontrols/imagine/images/applicationwindow-overlay@2x.png
index 23828d5a1c..23828d5a1c 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-overlay@2x.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-overlay@2x.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-overlay@3x.png b/src/quickcontrols/imagine/images/applicationwindow-overlay@3x.png
index d9d5382867..d9d5382867 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-overlay@3x.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-overlay@3x.png
diff --git a/src/quickcontrols2/imagine/images/applicationwindow-overlay@4x.png b/src/quickcontrols/imagine/images/applicationwindow-overlay@4x.png
index a76c1a3a71..a76c1a3a71 100644
--- a/src/quickcontrols2/imagine/images/applicationwindow-overlay@4x.png
+++ b/src/quickcontrols/imagine/images/applicationwindow-overlay@4x.png
diff --git a/src/quickcontrols2/imagine/images/busyindicator-animation.webp b/src/quickcontrols/imagine/images/busyindicator-animation.webp
index ebf04c4a0c..ebf04c4a0c 100644
--- a/src/quickcontrols2/imagine/images/busyindicator-animation.webp
+++ b/src/quickcontrols/imagine/images/busyindicator-animation.webp
diff --git a/src/quickcontrols2/imagine/images/busyindicator-animation@2x.webp b/src/quickcontrols/imagine/images/busyindicator-animation@2x.webp
index 43805a0bdc..43805a0bdc 100644
--- a/src/quickcontrols2/imagine/images/busyindicator-animation@2x.webp
+++ b/src/quickcontrols/imagine/images/busyindicator-animation@2x.webp
diff --git a/src/quickcontrols2/imagine/images/busyindicator-animation@3x.webp b/src/quickcontrols/imagine/images/busyindicator-animation@3x.webp
index b700b81f83..b700b81f83 100644
--- a/src/quickcontrols2/imagine/images/busyindicator-animation@3x.webp
+++ b/src/quickcontrols/imagine/images/busyindicator-animation@3x.webp
diff --git a/src/quickcontrols2/imagine/images/busyindicator-animation@4x.webp b/src/quickcontrols/imagine/images/busyindicator-animation@4x.webp
index bfaa8df921..bfaa8df921 100644
--- a/src/quickcontrols2/imagine/images/busyindicator-animation@4x.webp
+++ b/src/quickcontrols/imagine/images/busyindicator-animation@4x.webp
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-disabled.9.png b/src/quickcontrols/imagine/images/button-background-checked-disabled.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-disabled.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-disabled@2x.9.png b/src/quickcontrols/imagine/images/button-background-checked-disabled@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-disabled@3x.9.png b/src/quickcontrols/imagine/images/button-background-checked-disabled@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-disabled@4x.9.png b/src/quickcontrols/imagine/images/button-background-checked-disabled@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-focused.9.png b/src/quickcontrols/imagine/images/button-background-checked-focused.9.png
index e3d14e9954..e3d14e9954 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-focused.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-focused@2x.9.png b/src/quickcontrols/imagine/images/button-background-checked-focused@2x.9.png
index ebc74b4a34..ebc74b4a34 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-focused@3x.9.png b/src/quickcontrols/imagine/images/button-background-checked-focused@3x.9.png
index 7583472304..7583472304 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-focused@4x.9.png b/src/quickcontrols/imagine/images/button-background-checked-focused@4x.9.png
index 9b570f4d15..9b570f4d15 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-hovered.9.png b/src/quickcontrols/imagine/images/button-background-checked-hovered.9.png
index e3d14e9954..e3d14e9954 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-hovered.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-hovered@2x.9.png b/src/quickcontrols/imagine/images/button-background-checked-hovered@2x.9.png
index ebc74b4a34..ebc74b4a34 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-hovered@3x.9.png b/src/quickcontrols/imagine/images/button-background-checked-hovered@3x.9.png
index 7583472304..7583472304 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked-hovered@4x.9.png b/src/quickcontrols/imagine/images/button-background-checked-hovered@4x.9.png
index 9b570f4d15..9b570f4d15 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked.9.png b/src/quickcontrols/imagine/images/button-background-checked.9.png
index d0942509f7..d0942509f7 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked@2x.9.png b/src/quickcontrols/imagine/images/button-background-checked@2x.9.png
index c38bcd026f..c38bcd026f 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked@3x.9.png b/src/quickcontrols/imagine/images/button-background-checked@3x.9.png
index 80889bf801..80889bf801 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-checked@4x.9.png b/src/quickcontrols/imagine/images/button-background-checked@4x.9.png
index 05de8377ef..05de8377ef 100644
--- a/src/quickcontrols2/imagine/images/button-background-checked@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-checked@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-disabled.9.png b/src/quickcontrols/imagine/images/button-background-disabled.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/button-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/button-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/button-background-disabled@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/button-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/button-background-disabled@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/button-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/button-background-disabled@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/button-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed.9.png b/src/quickcontrols/imagine/images/button-background-flat-checked-pressed.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-checked-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@2x.9.png b/src/quickcontrols/imagine/images/button-background-flat-checked-pressed@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-checked-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@3x.9.png b/src/quickcontrols/imagine/images/button-background-flat-checked-pressed@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-checked-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@4x.9.png b/src/quickcontrols/imagine/images/button-background-flat-checked-pressed@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-checked-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-checked-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-checked.9.png b/src/quickcontrols/imagine/images/button-background-flat-checked.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-checked.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-checked.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-checked@2x.9.png b/src/quickcontrols/imagine/images/button-background-flat-checked@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-checked@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-checked@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-checked@3x.9.png b/src/quickcontrols/imagine/images/button-background-flat-checked@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-checked@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-checked@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-checked@4x.9.png b/src/quickcontrols/imagine/images/button-background-flat-checked@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-checked@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-checked@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-disabled.9.png b/src/quickcontrols/imagine/images/button-background-flat-disabled.9.png
index 59907409c4..59907409c4 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-disabled.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-disabled@2x.9.png b/src/quickcontrols/imagine/images/button-background-flat-disabled@2x.9.png
index d66acd9c48..d66acd9c48 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-disabled@3x.9.png b/src/quickcontrols/imagine/images/button-background-flat-disabled@3x.9.png
index 89b8c35357..89b8c35357 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-disabled@4x.9.png b/src/quickcontrols/imagine/images/button-background-flat-disabled@4x.9.png
index d3a675cfe7..d3a675cfe7 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted-checked.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted-checked.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@2x.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted-checked@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted-checked@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@3x.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted-checked@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted-checked@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@4x.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted-checked@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-checked@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted-checked@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted-pressed.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@2x.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted-pressed@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@3x.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted-pressed@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@4x.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted-pressed@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted.9.png
index 59907409c4..59907409c4 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted@2x.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted@2x.9.png
index d66acd9c48..d66acd9c48 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted@3x.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted@3x.9.png
index 89b8c35357..89b8c35357 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-highlighted@4x.9.png b/src/quickcontrols/imagine/images/button-background-flat-highlighted@4x.9.png
index d3a675cfe7..d3a675cfe7 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-highlighted@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-highlighted@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-hovered.9.png b/src/quickcontrols/imagine/images/button-background-flat-hovered.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-hovered.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-hovered@2x.9.png b/src/quickcontrols/imagine/images/button-background-flat-hovered@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-hovered@3x.9.png b/src/quickcontrols/imagine/images/button-background-flat-hovered@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-hovered@4x.9.png b/src/quickcontrols/imagine/images/button-background-flat-hovered@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-pressed.9.png b/src/quickcontrols/imagine/images/button-background-flat-pressed.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-pressed.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-pressed@2x.9.png b/src/quickcontrols/imagine/images/button-background-flat-pressed@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-pressed@3x.9.png b/src/quickcontrols/imagine/images/button-background-flat-pressed@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat-pressed@4x.9.png b/src/quickcontrols/imagine/images/button-background-flat-pressed@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat.9.png b/src/quickcontrols/imagine/images/button-background-flat.9.png
index 59907409c4..59907409c4 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat@2x.9.png b/src/quickcontrols/imagine/images/button-background-flat@2x.9.png
index d66acd9c48..d66acd9c48 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat@3x.9.png b/src/quickcontrols/imagine/images/button-background-flat@3x.9.png
index 89b8c35357..89b8c35357 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-flat@4x.9.png b/src/quickcontrols/imagine/images/button-background-flat@4x.9.png
index d3a675cfe7..d3a675cfe7 100644
--- a/src/quickcontrols2/imagine/images/button-background-flat@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-flat@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-focused.9.png b/src/quickcontrols/imagine/images/button-background-focused.9.png
index 42e40e6082..42e40e6082 100644
--- a/src/quickcontrols2/imagine/images/button-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/button-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-focused@2x.9.png b/src/quickcontrols/imagine/images/button-background-focused@2x.9.png
index 90dc70bfe0..90dc70bfe0 100644
--- a/src/quickcontrols2/imagine/images/button-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-focused@3x.9.png b/src/quickcontrols/imagine/images/button-background-focused@3x.9.png
index 2ed2340cb0..2ed2340cb0 100644
--- a/src/quickcontrols2/imagine/images/button-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-focused@4x.9.png b/src/quickcontrols/imagine/images/button-background-focused@4x.9.png
index e1428e37eb..e1428e37eb 100644
--- a/src/quickcontrols2/imagine/images/button-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-checked.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-checked.9.png
index 7a2a401106..7a2a401106 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-checked.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-checked.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-checked@2x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-checked@2x.9.png
index 05b2f21423..05b2f21423 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-checked@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-checked@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-checked@3x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-checked@3x.9.png
index 8c22e1f32a..8c22e1f32a 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-checked@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-checked@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-checked@4x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-checked@4x.9.png
index c5617f0e0d..c5617f0e0d 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-checked@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-checked@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-disabled.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-disabled.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-disabled.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@2x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-disabled@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@3x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-disabled@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@4x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-disabled@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-focused.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-focused.9.png
index 3ea580e01f..3ea580e01f 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-focused.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-focused@2x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-focused@2x.9.png
index effcce1f42..effcce1f42 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-focused@3x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-focused@3x.9.png
index 502ac68999..502ac68999 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-focused@4x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-focused@4x.9.png
index 3243231ef7..3243231ef7 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-hovered.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-hovered.9.png
index 3ea580e01f..3ea580e01f 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-hovered.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@2x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-hovered@2x.9.png
index effcce1f42..effcce1f42 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@3x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-hovered@3x.9.png
index 502ac68999..502ac68999 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@4x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-hovered@4x.9.png
index 3243231ef7..3243231ef7 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-pressed.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-pressed.9.png
index 7a2a401106..7a2a401106 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-pressed.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@2x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-pressed@2x.9.png
index 05b2f21423..05b2f21423 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@3x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-pressed@3x.9.png
index 8c22e1f32a..8c22e1f32a 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@4x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted-pressed@4x.9.png
index c5617f0e0d..c5617f0e0d 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted.9.png b/src/quickcontrols/imagine/images/button-background-highlighted.9.png
index 7761595fcd..7761595fcd 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted@2x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted@2x.9.png
index 8bb42c45af..8bb42c45af 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted@3x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted@3x.9.png
index 8c23c021a5..8c23c021a5 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-highlighted@4x.9.png b/src/quickcontrols/imagine/images/button-background-highlighted@4x.9.png
index 365cd0489d..365cd0489d 100644
--- a/src/quickcontrols2/imagine/images/button-background-highlighted@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-highlighted@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-hovered.9.png b/src/quickcontrols/imagine/images/button-background-hovered.9.png
index 42e40e6082..42e40e6082 100644
--- a/src/quickcontrols2/imagine/images/button-background-hovered.9.png
+++ b/src/quickcontrols/imagine/images/button-background-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-hovered@2x.9.png b/src/quickcontrols/imagine/images/button-background-hovered@2x.9.png
index 90dc70bfe0..90dc70bfe0 100644
--- a/src/quickcontrols2/imagine/images/button-background-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-hovered@3x.9.png b/src/quickcontrols/imagine/images/button-background-hovered@3x.9.png
index 2ed2340cb0..2ed2340cb0 100644
--- a/src/quickcontrols2/imagine/images/button-background-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-hovered@4x.9.png b/src/quickcontrols/imagine/images/button-background-hovered@4x.9.png
index e1428e37eb..e1428e37eb 100644
--- a/src/quickcontrols2/imagine/images/button-background-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-pressed.9.png b/src/quickcontrols/imagine/images/button-background-pressed.9.png
index d0942509f7..d0942509f7 100644
--- a/src/quickcontrols2/imagine/images/button-background-pressed.9.png
+++ b/src/quickcontrols/imagine/images/button-background-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-pressed@2x.9.png b/src/quickcontrols/imagine/images/button-background-pressed@2x.9.png
index c38bcd026f..c38bcd026f 100644
--- a/src/quickcontrols2/imagine/images/button-background-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-pressed@3x.9.png b/src/quickcontrols/imagine/images/button-background-pressed@3x.9.png
index 80889bf801..80889bf801 100644
--- a/src/quickcontrols2/imagine/images/button-background-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background-pressed@4x.9.png b/src/quickcontrols/imagine/images/button-background-pressed@4x.9.png
index 05de8377ef..05de8377ef 100644
--- a/src/quickcontrols2/imagine/images/button-background-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background.9.png b/src/quickcontrols/imagine/images/button-background.9.png
index 6f1daed831..6f1daed831 100644
--- a/src/quickcontrols2/imagine/images/button-background.9.png
+++ b/src/quickcontrols/imagine/images/button-background.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background@2x.9.png b/src/quickcontrols/imagine/images/button-background@2x.9.png
index 4a2507f535..4a2507f535 100644
--- a/src/quickcontrols2/imagine/images/button-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/button-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background@3x.9.png b/src/quickcontrols/imagine/images/button-background@3x.9.png
index 4f13b4ef55..4f13b4ef55 100644
--- a/src/quickcontrols2/imagine/images/button-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/button-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/button-background@4x.9.png b/src/quickcontrols/imagine/images/button-background@4x.9.png
index 0e1ab4524e..0e1ab4524e 100644
--- a/src/quickcontrols2/imagine/images/button-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/button-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-focused.png
index d55a520426..d55a520426 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-focused.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-focused@2x.png
index 7289f63949..7289f63949 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-focused@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-focused@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-focused@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-hovered.png
index d55a520426..d55a520426 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-hovered.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-hovered@2x.png
index 7289f63949..7289f63949 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-hovered@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-hovered@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-pressed.png
index 9c03d096e4..9c03d096e4 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-pressed.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-pressed@2x.png
index 680ba3efca..680ba3efca 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-pressed@3x.png
index 974205de54..974205de54 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked-pressed@4x.png
index 2c8b6aabf4..2c8b6aabf4 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked.png
index 598b163aaa..598b163aaa 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked@2x.png
index 06382264f9..06382264f9 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked@3x.png
index 12a32dcd20..12a32dcd20 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-checked@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-checked@4x.png
index 4bc6701d65..4bc6701d65 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-checked@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-disabled.png b/src/quickcontrols/imagine/images/checkbox-indicator-disabled.png
index 0a499f8f2d..0a499f8f2d 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-disabled.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-disabled.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-disabled@2x.png
index db652c5ac9..db652c5ac9 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-disabled@3x.png
index 482f045d32..482f045d32 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-disabled@4x.png
index a386e27251..a386e27251 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-focused.png b/src/quickcontrols/imagine/images/checkbox-indicator-focused.png
index c5eb85276d..c5eb85276d 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-focused.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-focused.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-focused@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-focused@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-focused@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-focused@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-focused@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-focused@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-focused@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-focused@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-focused@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-hovered.png b/src/quickcontrols/imagine/images/checkbox-indicator-hovered.png
index c5eb85276d..c5eb85276d 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-hovered.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-hovered.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-hovered@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-hovered@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-hovered@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-focused.png
index cd07b1ccb3..cd07b1ccb3 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-focused.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-focused@2x.png
index acae6afffe..acae6afffe 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-focused@3x.png
index 1e8d2c4575..1e8d2c4575 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-focused@4x.png
index 577017c4c9..577017c4c9 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-focused@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-hovered.png
index cd07b1ccb3..cd07b1ccb3 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-hovered.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png
index acae6afffe..acae6afffe 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png
index 1e8d2c4575..1e8d2c4575 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png
index 577017c4c9..577017c4c9 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-pressed.png
index 928706ab27..928706ab27 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-pressed.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png
index 3645d78a21..3645d78a21 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png
index ade63bd04b..ade63bd04b 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png
index cd73617e3c..cd73617e3c 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked.png
index e404a4e3c8..e404a4e3c8 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked@2x.png
index 2d0f51767a..2d0f51767a 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked@3x.png
index 4b9777b7ea..4b9777b7ea 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked@4x.png
index e0f67e9894..e0f67e9894 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-partially-checked@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-partially-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-pressed.png b/src/quickcontrols/imagine/images/checkbox-indicator-pressed.png
index a1baaf903e..a1baaf903e 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-pressed.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-pressed.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator-pressed@2x.png
index 81a7c3647a..81a7c3647a 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator-pressed@3x.png
index 9325de38cb..9325de38cb 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator-pressed@4x.png
index c93b8fb8a3..c93b8fb8a3 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator.png b/src/quickcontrols/imagine/images/checkbox-indicator.png
index 2b3e2323d7..2b3e2323d7 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator@2x.png b/src/quickcontrols/imagine/images/checkbox-indicator@2x.png
index ce8985dbb1..ce8985dbb1 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator@2x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator@3x.png b/src/quickcontrols/imagine/images/checkbox-indicator@3x.png
index 2968731dd7..2968731dd7 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator@3x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkbox-indicator@4x.png b/src/quickcontrols/imagine/images/checkbox-indicator@4x.png
index ea8da28498..ea8da28498 100644
--- a/src/quickcontrols2/imagine/images/checkbox-indicator@4x.png
+++ b/src/quickcontrols/imagine/images/checkbox-indicator@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-disabled.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-disabled.9.png
index 23570729d6..23570729d6 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-focused.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-focused.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-focused@2x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-focused@3x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-focused@4x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-highlighted.9.png
index e79d8e1d01..e79d8e1d01 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-highlighted.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@2x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-highlighted@2x.9.png
index ea68d35fc4..ea68d35fc4 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@2x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-highlighted@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@3x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-highlighted@3x.9.png
index 6d61041599..6d61041599 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@3x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-highlighted@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@4x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-highlighted@4x.9.png
index 590cca96a1..590cca96a1 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-highlighted@4x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-highlighted@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-hovered.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-hovered.9.png
index b8749743d0..b8749743d0 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-hovered.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@2x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-hovered@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@3x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-hovered@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@4x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-hovered@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-pressed.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-pressed.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-pressed.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@2x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@3x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@4x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background.9.png b/src/quickcontrols/imagine/images/checkdelegate-background.9.png
index b8749743d0..b8749743d0 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background@2x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background@3x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-background@4x.9.png b/src/quickcontrols/imagine/images/checkdelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-focused.png
index d55a520426..d55a520426 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-focused.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-focused@2x.png
index 7289f63949..7289f63949 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-focused@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-focused@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-focused@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-hovered.png
index d55a520426..d55a520426 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-hovered.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-hovered@2x.png
index 7289f63949..7289f63949 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-hovered@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-hovered@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-pressed.png
index 9c03d096e4..9c03d096e4 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-pressed.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-pressed@2x.png
index 680ba3efca..680ba3efca 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-pressed@3x.png
index 974205de54..974205de54 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-pressed@4x.png
index 2c8b6aabf4..2c8b6aabf4 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked.png
index 598b163aaa..598b163aaa 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked@2x.png
index 06382264f9..06382264f9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked@3x.png
index 12a32dcd20..12a32dcd20 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked@4x.png
index 4bc6701d65..4bc6701d65 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-checked@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-disabled.png
index 0a499f8f2d..0a499f8f2d 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-disabled.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-disabled@2x.png
index db652c5ac9..db652c5ac9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-disabled@3x.png
index 482f045d32..482f045d32 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-disabled@4x.png
index a386e27251..a386e27251 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-focused.png
index c5eb85276d..c5eb85276d 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-focused.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-focused@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-focused@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-focused@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-focused@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-hovered.png
index c5eb85276d..c5eb85276d 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-hovered.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-hovered@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-hovered@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-hovered@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-focused.png
index cd07b1ccb3..cd07b1ccb3 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-focused.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png
index acae6afffe..acae6afffe 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png
index 1e8d2c4575..1e8d2c4575 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png
index 577017c4c9..577017c4c9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-hovered.png
index cd07b1ccb3..cd07b1ccb3 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-hovered.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png
index acae6afffe..acae6afffe 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png
index 1e8d2c4575..1e8d2c4575 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png
index 577017c4c9..577017c4c9 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-pressed.png
index 928706ab27..928706ab27 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-pressed.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png
index 3645d78a21..3645d78a21 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png
index ade63bd04b..ade63bd04b 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png
index cd73617e3c..cd73617e3c 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked.png
index e404a4e3c8..e404a4e3c8 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked@2x.png
index 2d0f51767a..2d0f51767a 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked@3x.png
index 4b9777b7ea..4b9777b7ea 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked@4x.png
index e0f67e9894..e0f67e9894 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-partially-checked@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-partially-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-pressed.png
index a1baaf903e..a1baaf903e 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-pressed.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-pressed@2x.png
index 81a7c3647a..81a7c3647a 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-pressed@3x.png
index 9325de38cb..9325de38cb 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator-pressed@4x.png
index c93b8fb8a3..c93b8fb8a3 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator.png b/src/quickcontrols/imagine/images/checkdelegate-indicator.png
index 2b3e2323d7..2b3e2323d7 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator@2x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator@2x.png
index ce8985dbb1..ce8985dbb1 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator@2x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator@2x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator@3x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator@3x.png
index 2968731dd7..2968731dd7 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator@3x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator@3x.png
diff --git a/src/quickcontrols2/imagine/images/checkdelegate-indicator@4x.png b/src/quickcontrols/imagine/images/checkdelegate-indicator@4x.png
index ea8da28498..ea8da28498 100644
--- a/src/quickcontrols2/imagine/images/checkdelegate-indicator@4x.png
+++ b/src/quickcontrols/imagine/images/checkdelegate-indicator@4x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-disabled.9.png b/src/quickcontrols/imagine/images/combobox-background-disabled.9.png
index a91b4b5519..a91b4b5519 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/combobox-background-disabled@2x.9.png
index 570b990c9b..570b990c9b 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/combobox-background-disabled@3x.9.png
index b0f9b9c4ce..b0f9b9c4ce 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/combobox-background-disabled@4x.9.png
index 6e810f7592..6e810f7592 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable-disabled.9.png b/src/quickcontrols/imagine/images/combobox-background-editable-disabled.9.png
index e192afb8a1..e192afb8a1 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable-disabled.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@2x.9.png b/src/quickcontrols/imagine/images/combobox-background-editable-disabled@2x.9.png
index 58a0f6e9a3..58a0f6e9a3 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@3x.9.png b/src/quickcontrols/imagine/images/combobox-background-editable-disabled@3x.9.png
index cd6f226b33..cd6f226b33 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@4x.9.png b/src/quickcontrols/imagine/images/combobox-background-editable-disabled@4x.9.png
index ff9103b091..ff9103b091 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable-focused.9.png b/src/quickcontrols/imagine/images/combobox-background-editable-focused.9.png
index a0f079bc47..a0f079bc47 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable-focused.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable-focused@2x.9.png b/src/quickcontrols/imagine/images/combobox-background-editable-focused@2x.9.png
index 83cb503f89..83cb503f89 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable-focused@3x.9.png b/src/quickcontrols/imagine/images/combobox-background-editable-focused@3x.9.png
index 4cf96edf90..4cf96edf90 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable-focused@4x.9.png b/src/quickcontrols/imagine/images/combobox-background-editable-focused@4x.9.png
index 5823de804f..5823de804f 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable.9.png b/src/quickcontrols/imagine/images/combobox-background-editable.9.png
index 8edac13208..8edac13208 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable@2x.9.png b/src/quickcontrols/imagine/images/combobox-background-editable@2x.9.png
index 15e465f12a..15e465f12a 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable@2x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable@3x.9.png b/src/quickcontrols/imagine/images/combobox-background-editable@3x.9.png
index 910b48d2c6..910b48d2c6 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable@3x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-editable@4x.9.png b/src/quickcontrols/imagine/images/combobox-background-editable@4x.9.png
index ff0f64118e..ff0f64118e 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-editable@4x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-editable@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-focused.9.png b/src/quickcontrols/imagine/images/combobox-background-focused.9.png
index a3865fa698..a3865fa698 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-focused@2x.9.png b/src/quickcontrols/imagine/images/combobox-background-focused@2x.9.png
index fc49f4b824..fc49f4b824 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-focused@3x.9.png b/src/quickcontrols/imagine/images/combobox-background-focused@3x.9.png
index b432b4ec54..b432b4ec54 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-focused@4x.9.png b/src/quickcontrols/imagine/images/combobox-background-focused@4x.9.png
index 1586205998..1586205998 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-hovered.9.png b/src/quickcontrols/imagine/images/combobox-background-hovered.9.png
index a3865fa698..a3865fa698 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-hovered.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-hovered@2x.9.png b/src/quickcontrols/imagine/images/combobox-background-hovered@2x.9.png
index fc49f4b824..fc49f4b824 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-hovered@3x.9.png b/src/quickcontrols/imagine/images/combobox-background-hovered@3x.9.png
index b432b4ec54..b432b4ec54 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-hovered@4x.9.png b/src/quickcontrols/imagine/images/combobox-background-hovered@4x.9.png
index 1586205998..1586205998 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-open.9.png b/src/quickcontrols/imagine/images/combobox-background-open.9.png
index 1be8440336..1be8440336 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-open.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-open.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-open@2x.9.png b/src/quickcontrols/imagine/images/combobox-background-open@2x.9.png
index 95f7cd6d8a..95f7cd6d8a 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-open@2x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-open@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-open@3x.9.png b/src/quickcontrols/imagine/images/combobox-background-open@3x.9.png
index 2f71271ce8..2f71271ce8 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-open@3x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-open@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-open@4x.9.png b/src/quickcontrols/imagine/images/combobox-background-open@4x.9.png
index 17f6f2ce11..17f6f2ce11 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-open@4x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-open@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-pressed.9.png b/src/quickcontrols/imagine/images/combobox-background-pressed.9.png
index 1be8440336..1be8440336 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-pressed.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-pressed@2x.9.png b/src/quickcontrols/imagine/images/combobox-background-pressed@2x.9.png
index 95f7cd6d8a..95f7cd6d8a 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-pressed@3x.9.png b/src/quickcontrols/imagine/images/combobox-background-pressed@3x.9.png
index 2f71271ce8..2f71271ce8 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background-pressed@4x.9.png b/src/quickcontrols/imagine/images/combobox-background-pressed@4x.9.png
index 17f6f2ce11..17f6f2ce11 100644
--- a/src/quickcontrols2/imagine/images/combobox-background-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background.9.png b/src/quickcontrols/imagine/images/combobox-background.9.png
index 4ed8ddc36f..4ed8ddc36f 100644
--- a/src/quickcontrols2/imagine/images/combobox-background.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background@2x.9.png b/src/quickcontrols/imagine/images/combobox-background@2x.9.png
index 1d7a88943a..1d7a88943a 100644
--- a/src/quickcontrols2/imagine/images/combobox-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background@3x.9.png b/src/quickcontrols/imagine/images/combobox-background@3x.9.png
index 313630f85c..313630f85c 100644
--- a/src/quickcontrols2/imagine/images/combobox-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-background@4x.9.png b/src/quickcontrols/imagine/images/combobox-background@4x.9.png
index be63d56ea0..be63d56ea0 100644
--- a/src/quickcontrols2/imagine/images/combobox-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-disabled.png b/src/quickcontrols/imagine/images/combobox-indicator-disabled.png
index 761537f9c4..761537f9c4 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-disabled.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-disabled.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-disabled@2x.png b/src/quickcontrols/imagine/images/combobox-indicator-disabled@2x.png
index 322b7b6837..322b7b6837 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-disabled@3x.png b/src/quickcontrols/imagine/images/combobox-indicator-disabled@3x.png
index 73feec349d..73feec349d 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-disabled@4x.png b/src/quickcontrols/imagine/images/combobox-indicator-disabled@4x.png
index 910c4d3d21..910c4d3d21 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-disabled.png
index 4399b6aab5..4399b6aab5 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-disabled.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@2x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-disabled@2x.png
index e45a2ad125..e45a2ad125 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@3x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-disabled@3x.png
index 23f74b10ea..23f74b10ea 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@4x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-disabled@4x.png
index db495899a8..db495899a8 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored-disabled.png
index 2e954ae99e..2e954ae99e 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored-disabled.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png
index 252a5e37d5..252a5e37d5 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png
index 6d939a93f6..6d939a93f6 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png
index 00a21ebdfb..00a21ebdfb 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored.png
index ad52991212..ad52991212 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@2x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored@2x.png
index 70b995c135..70b995c135 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@2x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored@2x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@3x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored@3x.png
index 9b86537727..9b86537727 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@3x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored@3x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@4x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored@4x.png
index b4f7ae25d3..b4f7ae25d3 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable-mirrored@4x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable-mirrored@4x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable.png b/src/quickcontrols/imagine/images/combobox-indicator-editable.png
index e053109f10..e053109f10 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable@2x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable@2x.png
index b8dfd6fe0e..b8dfd6fe0e 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable@2x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable@2x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable@3x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable@3x.png
index 2cdee7a8f8..2cdee7a8f8 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable@3x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable@3x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator-editable@4x.png b/src/quickcontrols/imagine/images/combobox-indicator-editable@4x.png
index 2569b4aef0..2569b4aef0 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator-editable@4x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator-editable@4x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator.png b/src/quickcontrols/imagine/images/combobox-indicator.png
index cc32f2a272..cc32f2a272 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator@2x.png b/src/quickcontrols/imagine/images/combobox-indicator@2x.png
index 57ea3f3082..57ea3f3082 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator@2x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator@2x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator@3x.png b/src/quickcontrols/imagine/images/combobox-indicator@3x.png
index 384f8152db..384f8152db 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator@3x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator@3x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-indicator@4x.png b/src/quickcontrols/imagine/images/combobox-indicator@4x.png
index f326c03b4b..f326c03b4b 100644
--- a/src/quickcontrols2/imagine/images/combobox-indicator@4x.png
+++ b/src/quickcontrols/imagine/images/combobox-indicator@4x.png
diff --git a/src/quickcontrols2/imagine/images/combobox-popup.9.png b/src/quickcontrols/imagine/images/combobox-popup.9.png
index 7344cdf6db..7344cdf6db 100644
--- a/src/quickcontrols2/imagine/images/combobox-popup.9.png
+++ b/src/quickcontrols/imagine/images/combobox-popup.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-popup@2x.9.png b/src/quickcontrols/imagine/images/combobox-popup@2x.9.png
index 00c88c7d59..00c88c7d59 100644
--- a/src/quickcontrols2/imagine/images/combobox-popup@2x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-popup@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-popup@3x.9.png b/src/quickcontrols/imagine/images/combobox-popup@3x.9.png
index 82d911ed66..82d911ed66 100644
--- a/src/quickcontrols2/imagine/images/combobox-popup@3x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-popup@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/combobox-popup@4x.9.png b/src/quickcontrols/imagine/images/combobox-popup@4x.9.png
index 98db30af66..98db30af66 100644
--- a/src/quickcontrols2/imagine/images/combobox-popup@4x.9.png
+++ b/src/quickcontrols/imagine/images/combobox-popup@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked-focused.9.png
index e3d14e9954..e3d14e9954 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked-focused@2x.9.png
index ebc74b4a34..ebc74b4a34 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked-focused@3x.9.png
index 7583472304..7583472304 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked-focused@4x.9.png
index 9b570f4d15..9b570f4d15 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked-hovered.9.png
index e3d14e9954..e3d14e9954 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked-hovered@2x.9.png
index ebc74b4a34..ebc74b4a34 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked-hovered@3x.9.png
index 7583472304..7583472304 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked-hovered@4x.9.png
index 9b570f4d15..9b570f4d15 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked.9.png
index d0942509f7..d0942509f7 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked@2x.9.png
index c38bcd026f..c38bcd026f 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked@3x.9.png
index 80889bf801..80889bf801 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-checked@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-checked@4x.9.png
index 05de8377ef..05de8377ef 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-checked@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-checked@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked.9.png b/src/quickcontrols/imagine/images/delaybutton-background-disabled-checked.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-disabled-checked.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-disabled-checked@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-disabled-checked@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-disabled-checked@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-disabled-checked@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-disabled-checked@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-disabled-checked@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-disabled-checked@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-disabled.9.png b/src/quickcontrols/imagine/images/delaybutton-background-disabled.9.png
index 8196289cc2..8196289cc2 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-disabled@2x.9.png
index 76cd44908b..76cd44908b 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-disabled@3x.9.png
index 8bd6259a47..8bd6259a47 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-disabled@4x.9.png
index 3e08152013..3e08152013 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-focused.9.png b/src/quickcontrols/imagine/images/delaybutton-background-focused.9.png
index 294ff8bda6..294ff8bda6 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-focused@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-focused@2x.9.png
index 48e2bbcb56..48e2bbcb56 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-focused@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-focused@3x.9.png
index 0981eb2ac5..0981eb2ac5 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-focused@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-focused@4x.9.png
index 4ae48bfa36..4ae48bfa36 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-hovered.9.png b/src/quickcontrols/imagine/images/delaybutton-background-hovered.9.png
index 42e40e6082..42e40e6082 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-hovered.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-hovered@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-hovered@2x.9.png
index 90dc70bfe0..90dc70bfe0 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-hovered@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-hovered@3x.9.png
index 2ed2340cb0..2ed2340cb0 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-hovered@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-hovered@4x.9.png
index e1428e37eb..e1428e37eb 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-pressed.9.png b/src/quickcontrols/imagine/images/delaybutton-background-pressed.9.png
index d0942509f7..d0942509f7 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-pressed.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-pressed@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-pressed@2x.9.png
index c38bcd026f..c38bcd026f 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-pressed@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-pressed@3x.9.png
index 80889bf801..80889bf801 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background-pressed@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-background-pressed@4x.9.png
index 05de8377ef..05de8377ef 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background.9.png b/src/quickcontrols/imagine/images/delaybutton-background.9.png
index 6f1daed831..6f1daed831 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-background@2x.9.png
index 4a2507f535..4a2507f535 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-background@3x.9.png
index 4f13b4ef55..4f13b4ef55 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-background@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-background@4x.9.png
index 0e1ab4524e..0e1ab4524e 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-mask.9.png b/src/quickcontrols/imagine/images/delaybutton-mask.9.png
index 76d3967d04..76d3967d04 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-mask.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-mask.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-mask@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-mask@2x.9.png
index b8db224cc2..b8db224cc2 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-mask@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-mask@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-mask@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-mask@3x.9.png
index 3bff2c15ae..3bff2c15ae 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-mask@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-mask@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-mask@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-mask@4x.9.png
index 045c7fac88..045c7fac88 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-mask@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-mask@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-progress-disabled.9.png b/src/quickcontrols/imagine/images/delaybutton-progress-disabled.9.png
index 5c209c9c6b..5c209c9c6b 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-progress-disabled.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-progress-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-progress-disabled@2x.9.png
index 0ef11a8d3c..0ef11a8d3c 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-progress-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-progress-disabled@3x.9.png
index f3f8e54796..f3f8e54796 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-progress-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-progress-disabled@4x.9.png
index b24f50e669..b24f50e669 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-progress-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-progress-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-progress.9.png b/src/quickcontrols/imagine/images/delaybutton-progress.9.png
index 4dd3aec5fe..4dd3aec5fe 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-progress.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-progress.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-progress@2x.9.png b/src/quickcontrols/imagine/images/delaybutton-progress@2x.9.png
index cd422076e3..cd422076e3 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-progress@2x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-progress@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-progress@3x.9.png b/src/quickcontrols/imagine/images/delaybutton-progress@3x.9.png
index 08610300be..08610300be 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-progress@3x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-progress@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/delaybutton-progress@4x.9.png b/src/quickcontrols/imagine/images/delaybutton-progress@4x.9.png
index 24cc19ba0a..24cc19ba0a 100644
--- a/src/quickcontrols2/imagine/images/delaybutton-progress@4x.9.png
+++ b/src/quickcontrols/imagine/images/delaybutton-progress@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/dial-background-disabled.png b/src/quickcontrols/imagine/images/dial-background-disabled.png
index d7c4f847ce..d7c4f847ce 100644
--- a/src/quickcontrols2/imagine/images/dial-background-disabled.png
+++ b/src/quickcontrols/imagine/images/dial-background-disabled.png
diff --git a/src/quickcontrols2/imagine/images/dial-background-disabled@2x.png b/src/quickcontrols/imagine/images/dial-background-disabled@2x.png
index 56b085df96..56b085df96 100644
--- a/src/quickcontrols2/imagine/images/dial-background-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/dial-background-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/dial-background-disabled@3x.png b/src/quickcontrols/imagine/images/dial-background-disabled@3x.png
index 4f1e17e7a9..4f1e17e7a9 100644
--- a/src/quickcontrols2/imagine/images/dial-background-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/dial-background-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/dial-background-disabled@4x.png b/src/quickcontrols/imagine/images/dial-background-disabled@4x.png
index 4aacbf8222..4aacbf8222 100644
--- a/src/quickcontrols2/imagine/images/dial-background-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/dial-background-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/dial-background-focused.png b/src/quickcontrols/imagine/images/dial-background-focused.png
index fc53d5c407..fc53d5c407 100644
--- a/src/quickcontrols2/imagine/images/dial-background-focused.png
+++ b/src/quickcontrols/imagine/images/dial-background-focused.png
diff --git a/src/quickcontrols2/imagine/images/dial-background-focused@2x.png b/src/quickcontrols/imagine/images/dial-background-focused@2x.png
index 6b547a172d..6b547a172d 100644
--- a/src/quickcontrols2/imagine/images/dial-background-focused@2x.png
+++ b/src/quickcontrols/imagine/images/dial-background-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/dial-background-focused@3x.png b/src/quickcontrols/imagine/images/dial-background-focused@3x.png
index 7b8a2582ad..7b8a2582ad 100644
--- a/src/quickcontrols2/imagine/images/dial-background-focused@3x.png
+++ b/src/quickcontrols/imagine/images/dial-background-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/dial-background-focused@4x.png b/src/quickcontrols/imagine/images/dial-background-focused@4x.png
index 406f46b591..406f46b591 100644
--- a/src/quickcontrols2/imagine/images/dial-background-focused@4x.png
+++ b/src/quickcontrols/imagine/images/dial-background-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/dial-background.png b/src/quickcontrols/imagine/images/dial-background.png
index 58aa09edb2..58aa09edb2 100644
--- a/src/quickcontrols2/imagine/images/dial-background.png
+++ b/src/quickcontrols/imagine/images/dial-background.png
diff --git a/src/quickcontrols2/imagine/images/dial-background@2x.png b/src/quickcontrols/imagine/images/dial-background@2x.png
index 87cd9a0f6b..87cd9a0f6b 100644
--- a/src/quickcontrols2/imagine/images/dial-background@2x.png
+++ b/src/quickcontrols/imagine/images/dial-background@2x.png
diff --git a/src/quickcontrols2/imagine/images/dial-background@3x.png b/src/quickcontrols/imagine/images/dial-background@3x.png
index 103fb46107..103fb46107 100644
--- a/src/quickcontrols2/imagine/images/dial-background@3x.png
+++ b/src/quickcontrols/imagine/images/dial-background@3x.png
diff --git a/src/quickcontrols2/imagine/images/dial-background@4x.png b/src/quickcontrols/imagine/images/dial-background@4x.png
index c290f84a8f..c290f84a8f 100644
--- a/src/quickcontrols2/imagine/images/dial-background@4x.png
+++ b/src/quickcontrols/imagine/images/dial-background@4x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-disabled.png b/src/quickcontrols/imagine/images/dial-handle-disabled.png
index a93fd0f2b6..a93fd0f2b6 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-disabled.png
+++ b/src/quickcontrols/imagine/images/dial-handle-disabled.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-disabled@2x.png b/src/quickcontrols/imagine/images/dial-handle-disabled@2x.png
index 2cd536be06..2cd536be06 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-disabled@3x.png b/src/quickcontrols/imagine/images/dial-handle-disabled@3x.png
index 56b9fe06db..56b9fe06db 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-disabled@4x.png b/src/quickcontrols/imagine/images/dial-handle-disabled@4x.png
index 5098d6887c..5098d6887c 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused-hovered.png b/src/quickcontrols/imagine/images/dial-handle-focused-hovered.png
index 2a143f2afb..2a143f2afb 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused-hovered.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused-hovered.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@2x.png b/src/quickcontrols/imagine/images/dial-handle-focused-hovered@2x.png
index 24dfee8284..24dfee8284 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@3x.png b/src/quickcontrols/imagine/images/dial-handle-focused-hovered@3x.png
index 16e128d5cc..16e128d5cc 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@4x.png b/src/quickcontrols/imagine/images/dial-handle-focused-hovered@4x.png
index b4523acb70..b4523acb70 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused-pressed.png b/src/quickcontrols/imagine/images/dial-handle-focused-pressed.png
index d43971ff4d..d43971ff4d 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused-pressed.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused-pressed.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@2x.png b/src/quickcontrols/imagine/images/dial-handle-focused-pressed@2x.png
index caa2376e9b..caa2376e9b 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@3x.png b/src/quickcontrols/imagine/images/dial-handle-focused-pressed@3x.png
index c291388316..c291388316 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@4x.png b/src/quickcontrols/imagine/images/dial-handle-focused-pressed@4x.png
index 50ff1c8bf4..50ff1c8bf4 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused.png b/src/quickcontrols/imagine/images/dial-handle-focused.png
index d2733474b9..d2733474b9 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused@2x.png b/src/quickcontrols/imagine/images/dial-handle-focused@2x.png
index c7bc8f743b..c7bc8f743b 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused@2x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused@3x.png b/src/quickcontrols/imagine/images/dial-handle-focused@3x.png
index c0dcd94535..c0dcd94535 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused@3x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-focused@4x.png b/src/quickcontrols/imagine/images/dial-handle-focused@4x.png
index b9d2234c3f..b9d2234c3f 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-focused@4x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-hovered.png b/src/quickcontrols/imagine/images/dial-handle-hovered.png
index f5d0ac6f7f..f5d0ac6f7f 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-hovered.png
+++ b/src/quickcontrols/imagine/images/dial-handle-hovered.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-hovered@2x.png b/src/quickcontrols/imagine/images/dial-handle-hovered@2x.png
index da23baaa90..da23baaa90 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-hovered@3x.png b/src/quickcontrols/imagine/images/dial-handle-hovered@3x.png
index 7287a41923..7287a41923 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-hovered@4x.png b/src/quickcontrols/imagine/images/dial-handle-hovered@4x.png
index 9f6982dd56..9f6982dd56 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-pressed.png b/src/quickcontrols/imagine/images/dial-handle-pressed.png
index 3b98e1245c..3b98e1245c 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-pressed.png
+++ b/src/quickcontrols/imagine/images/dial-handle-pressed.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-pressed@2x.png b/src/quickcontrols/imagine/images/dial-handle-pressed@2x.png
index 454e73644d..454e73644d 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-pressed@3x.png b/src/quickcontrols/imagine/images/dial-handle-pressed@3x.png
index 794516da1e..794516da1e 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle-pressed@4x.png b/src/quickcontrols/imagine/images/dial-handle-pressed@4x.png
index 211b1135be..211b1135be 100644
--- a/src/quickcontrols2/imagine/images/dial-handle-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/dial-handle-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle.png b/src/quickcontrols/imagine/images/dial-handle.png
index 652b82d30e..652b82d30e 100644
--- a/src/quickcontrols2/imagine/images/dial-handle.png
+++ b/src/quickcontrols/imagine/images/dial-handle.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle@2x.png b/src/quickcontrols/imagine/images/dial-handle@2x.png
index 3c86a59bff..3c86a59bff 100644
--- a/src/quickcontrols2/imagine/images/dial-handle@2x.png
+++ b/src/quickcontrols/imagine/images/dial-handle@2x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle@3x.png b/src/quickcontrols/imagine/images/dial-handle@3x.png
index cbfcdbcdc6..cbfcdbcdc6 100644
--- a/src/quickcontrols2/imagine/images/dial-handle@3x.png
+++ b/src/quickcontrols/imagine/images/dial-handle@3x.png
diff --git a/src/quickcontrols2/imagine/images/dial-handle@4x.png b/src/quickcontrols/imagine/images/dial-handle@4x.png
index 2872e006fa..2872e006fa 100644
--- a/src/quickcontrols2/imagine/images/dial-handle@4x.png
+++ b/src/quickcontrols/imagine/images/dial-handle@4x.png
diff --git a/src/quickcontrols2/imagine/images/dialog-background.9.png b/src/quickcontrols/imagine/images/dialog-background.9.png
index c842b5ff58..c842b5ff58 100644
--- a/src/quickcontrols2/imagine/images/dialog-background.9.png
+++ b/src/quickcontrols/imagine/images/dialog-background.9.png
diff --git a/src/quickcontrols2/imagine/images/dialog-background@2x.9.png b/src/quickcontrols/imagine/images/dialog-background@2x.9.png
index ca23df1f0d..ca23df1f0d 100644
--- a/src/quickcontrols2/imagine/images/dialog-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/dialog-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/dialog-background@3x.9.png b/src/quickcontrols/imagine/images/dialog-background@3x.9.png
index 46cd406536..46cd406536 100644
--- a/src/quickcontrols2/imagine/images/dialog-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/dialog-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/dialog-background@4x.9.png b/src/quickcontrols/imagine/images/dialog-background@4x.9.png
index 3da74119cc..3da74119cc 100644
--- a/src/quickcontrols2/imagine/images/dialog-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/dialog-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/dialog-overlay-modal.png b/src/quickcontrols/imagine/images/dialog-overlay-modal.png
index d4a43d1c70..d4a43d1c70 100644
--- a/src/quickcontrols2/imagine/images/dialog-overlay-modal.png
+++ b/src/quickcontrols/imagine/images/dialog-overlay-modal.png
diff --git a/src/quickcontrols2/imagine/images/dialog-overlay-modal@2x.png b/src/quickcontrols/imagine/images/dialog-overlay-modal@2x.png
index c9a8f4124b..c9a8f4124b 100644
--- a/src/quickcontrols2/imagine/images/dialog-overlay-modal@2x.png
+++ b/src/quickcontrols/imagine/images/dialog-overlay-modal@2x.png
diff --git a/src/quickcontrols2/imagine/images/dialog-overlay-modal@3x.png b/src/quickcontrols/imagine/images/dialog-overlay-modal@3x.png
index 4a1084a919..4a1084a919 100644
--- a/src/quickcontrols2/imagine/images/dialog-overlay-modal@3x.png
+++ b/src/quickcontrols/imagine/images/dialog-overlay-modal@3x.png
diff --git a/src/quickcontrols2/imagine/images/dialog-overlay-modal@4x.png b/src/quickcontrols/imagine/images/dialog-overlay-modal@4x.png
index b92e600dae..b92e600dae 100644
--- a/src/quickcontrols2/imagine/images/dialog-overlay-modal@4x.png
+++ b/src/quickcontrols/imagine/images/dialog-overlay-modal@4x.png
diff --git a/src/quickcontrols2/imagine/images/dialog-overlay.png b/src/quickcontrols/imagine/images/dialog-overlay.png
index b7da23c00f..b7da23c00f 100644
--- a/src/quickcontrols2/imagine/images/dialog-overlay.png
+++ b/src/quickcontrols/imagine/images/dialog-overlay.png
diff --git a/src/quickcontrols2/imagine/images/dialog-overlay@2x.png b/src/quickcontrols/imagine/images/dialog-overlay@2x.png
index 23828d5a1c..23828d5a1c 100644
--- a/src/quickcontrols2/imagine/images/dialog-overlay@2x.png
+++ b/src/quickcontrols/imagine/images/dialog-overlay@2x.png
diff --git a/src/quickcontrols2/imagine/images/dialog-overlay@3x.png b/src/quickcontrols/imagine/images/dialog-overlay@3x.png
index d9d5382867..d9d5382867 100644
--- a/src/quickcontrols2/imagine/images/dialog-overlay@3x.png
+++ b/src/quickcontrols/imagine/images/dialog-overlay@3x.png
diff --git a/src/quickcontrols2/imagine/images/dialog-overlay@4x.png b/src/quickcontrols/imagine/images/dialog-overlay@4x.png
index a76c1a3a71..a76c1a3a71 100644
--- a/src/quickcontrols2/imagine/images/dialog-overlay@4x.png
+++ b/src/quickcontrols/imagine/images/dialog-overlay@4x.png
diff --git a/src/quickcontrols2/imagine/images/dialogbuttonbox-background.9.png b/src/quickcontrols/imagine/images/dialogbuttonbox-background.9.png
index 4b080c7f8b..4b080c7f8b 100644
--- a/src/quickcontrols2/imagine/images/dialogbuttonbox-background.9.png
+++ b/src/quickcontrols/imagine/images/dialogbuttonbox-background.9.png
diff --git a/src/quickcontrols2/imagine/images/dialogbuttonbox-background@2x.9.png b/src/quickcontrols/imagine/images/dialogbuttonbox-background@2x.9.png
index 38306bea93..38306bea93 100644
--- a/src/quickcontrols2/imagine/images/dialogbuttonbox-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/dialogbuttonbox-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/dialogbuttonbox-background@3x.9.png b/src/quickcontrols/imagine/images/dialogbuttonbox-background@3x.9.png
index 66afaabe22..66afaabe22 100644
--- a/src/quickcontrols2/imagine/images/dialogbuttonbox-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/dialogbuttonbox-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/dialogbuttonbox-background@4x.9.png b/src/quickcontrols/imagine/images/dialogbuttonbox-background@4x.9.png
index 7d0db539c1..7d0db539c1 100644
--- a/src/quickcontrols2/imagine/images/dialogbuttonbox-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/dialogbuttonbox-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-bottom.9.png b/src/quickcontrols/imagine/images/drawer-background-bottom.9.png
index 023d8bf806..023d8bf806 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-bottom.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-bottom.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-bottom@2x.9.png b/src/quickcontrols/imagine/images/drawer-background-bottom@2x.9.png
index 6b229ce9e7..6b229ce9e7 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-bottom@2x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-bottom@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-bottom@3x.9.png b/src/quickcontrols/imagine/images/drawer-background-bottom@3x.9.png
index c61118b651..c61118b651 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-bottom@3x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-bottom@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-bottom@4x.9.png b/src/quickcontrols/imagine/images/drawer-background-bottom@4x.9.png
index 08b2e25f30..08b2e25f30 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-bottom@4x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-bottom@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-left.9.png b/src/quickcontrols/imagine/images/drawer-background-left.9.png
index 5145a3a3f9..5145a3a3f9 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-left.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-left.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-left@2x.9.png b/src/quickcontrols/imagine/images/drawer-background-left@2x.9.png
index 95a80ab530..95a80ab530 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-left@2x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-left@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-left@3x.9.png b/src/quickcontrols/imagine/images/drawer-background-left@3x.9.png
index bd330b7f8e..bd330b7f8e 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-left@3x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-left@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-left@4x.9.png b/src/quickcontrols/imagine/images/drawer-background-left@4x.9.png
index 10f0702a11..10f0702a11 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-left@4x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-left@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-right.9.png b/src/quickcontrols/imagine/images/drawer-background-right.9.png
index 37afb73465..37afb73465 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-right.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-right.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-right@2x.9.png b/src/quickcontrols/imagine/images/drawer-background-right@2x.9.png
index cfbc8f35a2..cfbc8f35a2 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-right@2x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-right@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-right@3x.9.png b/src/quickcontrols/imagine/images/drawer-background-right@3x.9.png
index 9a49b6d530..9a49b6d530 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-right@3x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-right@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-right@4x.9.png b/src/quickcontrols/imagine/images/drawer-background-right@4x.9.png
index 564057760a..564057760a 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-right@4x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-right@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-top.9.png b/src/quickcontrols/imagine/images/drawer-background-top.9.png
index 56da059ff9..56da059ff9 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-top.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-top.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-top@2x.9.png b/src/quickcontrols/imagine/images/drawer-background-top@2x.9.png
index 976671ce59..976671ce59 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-top@2x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-top@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-top@3x.9.png b/src/quickcontrols/imagine/images/drawer-background-top@3x.9.png
index 7c07deba34..7c07deba34 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-top@3x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-top@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-background-top@4x.9.png b/src/quickcontrols/imagine/images/drawer-background-top@4x.9.png
index e3b1edf7c2..e3b1edf7c2 100644
--- a/src/quickcontrols2/imagine/images/drawer-background-top@4x.9.png
+++ b/src/quickcontrols/imagine/images/drawer-background-top@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/drawer-overlay-modal.png b/src/quickcontrols/imagine/images/drawer-overlay-modal.png
index d4a43d1c70..d4a43d1c70 100644
--- a/src/quickcontrols2/imagine/images/drawer-overlay-modal.png
+++ b/src/quickcontrols/imagine/images/drawer-overlay-modal.png
diff --git a/src/quickcontrols2/imagine/images/drawer-overlay-modal@2x.png b/src/quickcontrols/imagine/images/drawer-overlay-modal@2x.png
index c9a8f4124b..c9a8f4124b 100644
--- a/src/quickcontrols2/imagine/images/drawer-overlay-modal@2x.png
+++ b/src/quickcontrols/imagine/images/drawer-overlay-modal@2x.png
diff --git a/src/quickcontrols2/imagine/images/drawer-overlay-modal@3x.png b/src/quickcontrols/imagine/images/drawer-overlay-modal@3x.png
index 4a1084a919..4a1084a919 100644
--- a/src/quickcontrols2/imagine/images/drawer-overlay-modal@3x.png
+++ b/src/quickcontrols/imagine/images/drawer-overlay-modal@3x.png
diff --git a/src/quickcontrols2/imagine/images/drawer-overlay-modal@4x.png b/src/quickcontrols/imagine/images/drawer-overlay-modal@4x.png
index b92e600dae..b92e600dae 100644
--- a/src/quickcontrols2/imagine/images/drawer-overlay-modal@4x.png
+++ b/src/quickcontrols/imagine/images/drawer-overlay-modal@4x.png
diff --git a/src/quickcontrols2/imagine/images/drawer-overlay.png b/src/quickcontrols/imagine/images/drawer-overlay.png
index b7da23c00f..b7da23c00f 100644
--- a/src/quickcontrols2/imagine/images/drawer-overlay.png
+++ b/src/quickcontrols/imagine/images/drawer-overlay.png
diff --git a/src/quickcontrols2/imagine/images/drawer-overlay@2x.png b/src/quickcontrols/imagine/images/drawer-overlay@2x.png
index 23828d5a1c..23828d5a1c 100644
--- a/src/quickcontrols2/imagine/images/drawer-overlay@2x.png
+++ b/src/quickcontrols/imagine/images/drawer-overlay@2x.png
diff --git a/src/quickcontrols2/imagine/images/drawer-overlay@3x.png b/src/quickcontrols/imagine/images/drawer-overlay@3x.png
index d9d5382867..d9d5382867 100644
--- a/src/quickcontrols2/imagine/images/drawer-overlay@3x.png
+++ b/src/quickcontrols/imagine/images/drawer-overlay@3x.png
diff --git a/src/quickcontrols2/imagine/images/drawer-overlay@4x.png b/src/quickcontrols/imagine/images/drawer-overlay@4x.png
index a76c1a3a71..a76c1a3a71 100644
--- a/src/quickcontrols2/imagine/images/drawer-overlay@4x.png
+++ b/src/quickcontrols/imagine/images/drawer-overlay@4x.png
diff --git a/src/quickcontrols2/imagine/images/frame-background.9.png b/src/quickcontrols/imagine/images/frame-background.9.png
index 8674059de8..8674059de8 100644
--- a/src/quickcontrols2/imagine/images/frame-background.9.png
+++ b/src/quickcontrols/imagine/images/frame-background.9.png
diff --git a/src/quickcontrols2/imagine/images/frame-background@2x.9.png b/src/quickcontrols/imagine/images/frame-background@2x.9.png
index 196614964a..196614964a 100644
--- a/src/quickcontrols2/imagine/images/frame-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/frame-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/frame-background@3x.9.png b/src/quickcontrols/imagine/images/frame-background@3x.9.png
index 07d644be96..07d644be96 100644
--- a/src/quickcontrols2/imagine/images/frame-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/frame-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/frame-background@4x.9.png b/src/quickcontrols/imagine/images/frame-background@4x.9.png
index 8bf47d2a88..8bf47d2a88 100644
--- a/src/quickcontrols2/imagine/images/frame-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/frame-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/groupbox-background.9.png b/src/quickcontrols/imagine/images/groupbox-background.9.png
index 8674059de8..8674059de8 100644
--- a/src/quickcontrols2/imagine/images/groupbox-background.9.png
+++ b/src/quickcontrols/imagine/images/groupbox-background.9.png
diff --git a/src/quickcontrols2/imagine/images/groupbox-background@2x.9.png b/src/quickcontrols/imagine/images/groupbox-background@2x.9.png
index 196614964a..196614964a 100644
--- a/src/quickcontrols2/imagine/images/groupbox-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/groupbox-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/groupbox-background@3x.9.png b/src/quickcontrols/imagine/images/groupbox-background@3x.9.png
index 07d644be96..07d644be96 100644
--- a/src/quickcontrols2/imagine/images/groupbox-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/groupbox-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/groupbox-background@4x.9.png b/src/quickcontrols/imagine/images/groupbox-background@4x.9.png
index 8bf47d2a88..8bf47d2a88 100644
--- a/src/quickcontrols2/imagine/images/groupbox-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/groupbox-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/groupbox-title.9.png b/src/quickcontrols/imagine/images/groupbox-title.9.png
index e85e0cb135..e85e0cb135 100644
--- a/src/quickcontrols2/imagine/images/groupbox-title.9.png
+++ b/src/quickcontrols/imagine/images/groupbox-title.9.png
diff --git a/src/quickcontrols2/imagine/images/groupbox-title@2x.9.png b/src/quickcontrols/imagine/images/groupbox-title@2x.9.png
index d5359d857d..d5359d857d 100644
--- a/src/quickcontrols2/imagine/images/groupbox-title@2x.9.png
+++ b/src/quickcontrols/imagine/images/groupbox-title@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/groupbox-title@3x.9.png b/src/quickcontrols/imagine/images/groupbox-title@3x.9.png
index 0e4b5c9f9f..0e4b5c9f9f 100644
--- a/src/quickcontrols2/imagine/images/groupbox-title@3x.9.png
+++ b/src/quickcontrols/imagine/images/groupbox-title@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/groupbox-title@4x.9.png b/src/quickcontrols/imagine/images/groupbox-title@4x.9.png
index 908dfe6b90..908dfe6b90 100644
--- a/src/quickcontrols2/imagine/images/groupbox-title@4x.9.png
+++ b/src/quickcontrols/imagine/images/groupbox-title@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-disabled.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-disabled.9.png
index 23570729d6..23570729d6 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-focused.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-focused.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-focused@2x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-focused@3x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-focused@4x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-highlighted.9.png
index e79d8e1d01..e79d8e1d01 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-highlighted.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@2x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-highlighted@2x.9.png
index ea68d35fc4..ea68d35fc4 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@2x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-highlighted@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@3x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-highlighted@3x.9.png
index 6d61041599..6d61041599 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@3x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-highlighted@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@4x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-highlighted@4x.9.png
index 590cca96a1..590cca96a1 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-highlighted@4x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-highlighted@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-hovered.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-hovered.9.png
index b8749743d0..b8749743d0 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-hovered.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@2x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-hovered@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@3x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-hovered@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@4x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-hovered@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-pressed.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-pressed.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-pressed.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@2x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@3x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@4x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background.9.png b/src/quickcontrols/imagine/images/itemdelegate-background.9.png
index b8749743d0..b8749743d0 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background@2x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background@3x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/itemdelegate-background@4x.9.png b/src/quickcontrols/imagine/images/itemdelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickcontrols2/imagine/images/itemdelegate-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/itemdelegate-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/menu-background.9.png b/src/quickcontrols/imagine/images/menu-background.9.png
index 3195fbc336..3195fbc336 100644
--- a/src/quickcontrols2/imagine/images/menu-background.9.png
+++ b/src/quickcontrols/imagine/images/menu-background.9.png
diff --git a/src/quickcontrols2/imagine/images/menu-background@2x.9.png b/src/quickcontrols/imagine/images/menu-background@2x.9.png
index 454c347ced..454c347ced 100644
--- a/src/quickcontrols2/imagine/images/menu-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/menu-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/menu-background@3x.9.png b/src/quickcontrols/imagine/images/menu-background@3x.9.png
index 32ed60860f..32ed60860f 100644
--- a/src/quickcontrols2/imagine/images/menu-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/menu-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/menu-background@4x.9.png b/src/quickcontrols/imagine/images/menu-background@4x.9.png
index 948cc3e95f..948cc3e95f 100644
--- a/src/quickcontrols2/imagine/images/menu-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/menu-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-disabled.png b/src/quickcontrols/imagine/images/menuitem-arrow-disabled.png
index 6cad53f6c8..6cad53f6c8 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-disabled.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-disabled.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@2x.png b/src/quickcontrols/imagine/images/menuitem-arrow-disabled@2x.png
index bad6fe8c0f..bad6fe8c0f 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@3x.png b/src/quickcontrols/imagine/images/menuitem-arrow-disabled@3x.png
index da420091a9..da420091a9 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@4x.png b/src/quickcontrols/imagine/images/menuitem-arrow-disabled@4x.png
index 2d8e44e2f6..2d8e44e2f6 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled.png b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored-disabled.png
index 44ac277145..44ac277145 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored-disabled.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@2x.png b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored-disabled@2x.png
index 71a9b88a80..71a9b88a80 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@3x.png b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored-disabled@3x.png
index 1e03f2156e..1e03f2156e 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@4x.png b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored-disabled@4x.png
index 0f85b409d9..0f85b409d9 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored.png b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored.png
index 4ac1160bf2..4ac1160bf2 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@2x.png b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored@2x.png
index 79b089b654..79b089b654 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@3x.png b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored@3x.png
index aeb191fdd5..aeb191fdd5 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@4x.png b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored@4x.png
index 139fab35e0..139fab35e0 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow-mirrored@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow-mirrored@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow.png b/src/quickcontrols/imagine/images/menuitem-arrow.png
index edf1f6bd1a..edf1f6bd1a 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow@2x.png b/src/quickcontrols/imagine/images/menuitem-arrow@2x.png
index 8e6292653e..8e6292653e 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow@3x.png b/src/quickcontrols/imagine/images/menuitem-arrow@3x.png
index 0cef53acf5..0cef53acf5 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-arrow@4x.png b/src/quickcontrols/imagine/images/menuitem-arrow@4x.png
index dbdc83bc16..dbdc83bc16 100644
--- a/src/quickcontrols2/imagine/images/menuitem-arrow@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-arrow@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-background-highlighted.9.png b/src/quickcontrols/imagine/images/menuitem-background-highlighted.9.png
index 7b8fa0f42f..7b8fa0f42f 100644
--- a/src/quickcontrols2/imagine/images/menuitem-background-highlighted.9.png
+++ b/src/quickcontrols/imagine/images/menuitem-background-highlighted.9.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-background-highlighted@2x.9.png b/src/quickcontrols/imagine/images/menuitem-background-highlighted@2x.9.png
index 9edc30793b..9edc30793b 100644
--- a/src/quickcontrols2/imagine/images/menuitem-background-highlighted@2x.9.png
+++ b/src/quickcontrols/imagine/images/menuitem-background-highlighted@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-background-highlighted@3x.9.png b/src/quickcontrols/imagine/images/menuitem-background-highlighted@3x.9.png
index 183f6194ba..183f6194ba 100644
--- a/src/quickcontrols2/imagine/images/menuitem-background-highlighted@3x.9.png
+++ b/src/quickcontrols/imagine/images/menuitem-background-highlighted@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-background-highlighted@4x.9.png b/src/quickcontrols/imagine/images/menuitem-background-highlighted@4x.9.png
index 0a1ab8637d..0a1ab8637d 100644
--- a/src/quickcontrols2/imagine/images/menuitem-background-highlighted@4x.9.png
+++ b/src/quickcontrols/imagine/images/menuitem-background-highlighted@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-background.9.png b/src/quickcontrols/imagine/images/menuitem-background.9.png
index aab131eddf..aab131eddf 100644
--- a/src/quickcontrols2/imagine/images/menuitem-background.9.png
+++ b/src/quickcontrols/imagine/images/menuitem-background.9.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-background@2x.9.png b/src/quickcontrols/imagine/images/menuitem-background@2x.9.png
index c46938c4d8..c46938c4d8 100644
--- a/src/quickcontrols2/imagine/images/menuitem-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/menuitem-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-background@3x.9.png b/src/quickcontrols/imagine/images/menuitem-background@3x.9.png
index bac1a83f7f..bac1a83f7f 100644
--- a/src/quickcontrols2/imagine/images/menuitem-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/menuitem-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-background@4x.9.png b/src/quickcontrols/imagine/images/menuitem-background@4x.9.png
index ba77504c27..ba77504c27 100644
--- a/src/quickcontrols2/imagine/images/menuitem-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/menuitem-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-focused.png
index d55a520426..d55a520426 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-focused.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@2x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-focused@2x.png
index 7289f63949..7289f63949 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@3x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-focused@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@4x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-focused@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-focused@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-hovered.png
index d55a520426..d55a520426 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-hovered.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@2x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-hovered@2x.png
index 7289f63949..7289f63949 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@3x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-hovered@3x.png
index 02d6cdf205..02d6cdf205 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@4x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-hovered@4x.png
index 3f074dbfa9..3f074dbfa9 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-pressed.png
index 9c03d096e4..9c03d096e4 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-pressed.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@2x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-pressed@2x.png
index 680ba3efca..680ba3efca 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@3x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-pressed@3x.png
index 974205de54..974205de54 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@4x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked-pressed@4x.png
index 2c8b6aabf4..2c8b6aabf4 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked.png
index 598b163aaa..598b163aaa 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked@2x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked@2x.png
index 06382264f9..06382264f9 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked@3x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked@3x.png
index 12a32dcd20..12a32dcd20 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-checked@4x.png b/src/quickcontrols/imagine/images/menuitem-indicator-checked@4x.png
index 4bc6701d65..4bc6701d65 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-checked@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-disabled.png b/src/quickcontrols/imagine/images/menuitem-indicator-disabled.png
index 0a499f8f2d..0a499f8f2d 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-disabled.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-disabled.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@2x.png b/src/quickcontrols/imagine/images/menuitem-indicator-disabled@2x.png
index db652c5ac9..db652c5ac9 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@3x.png b/src/quickcontrols/imagine/images/menuitem-indicator-disabled@3x.png
index 482f045d32..482f045d32 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@4x.png b/src/quickcontrols/imagine/images/menuitem-indicator-disabled@4x.png
index a386e27251..a386e27251 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-focused.png b/src/quickcontrols/imagine/images/menuitem-indicator-focused.png
index c5eb85276d..c5eb85276d 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-focused.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-focused.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-focused@2x.png b/src/quickcontrols/imagine/images/menuitem-indicator-focused@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-focused@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-focused@3x.png b/src/quickcontrols/imagine/images/menuitem-indicator-focused@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-focused@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-focused@4x.png b/src/quickcontrols/imagine/images/menuitem-indicator-focused@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-focused@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-hovered.png b/src/quickcontrols/imagine/images/menuitem-indicator-hovered.png
index c5eb85276d..c5eb85276d 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-hovered.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-hovered.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@2x.png b/src/quickcontrols/imagine/images/menuitem-indicator-hovered@2x.png
index 8496fb1a88..8496fb1a88 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@3x.png b/src/quickcontrols/imagine/images/menuitem-indicator-hovered@3x.png
index 30849fd0f0..30849fd0f0 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@4x.png b/src/quickcontrols/imagine/images/menuitem-indicator-hovered@4x.png
index 55ce7c0c1b..55ce7c0c1b 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-pressed.png b/src/quickcontrols/imagine/images/menuitem-indicator-pressed.png
index a1baaf903e..a1baaf903e 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-pressed.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-pressed.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@2x.png b/src/quickcontrols/imagine/images/menuitem-indicator-pressed@2x.png
index 81a7c3647a..81a7c3647a 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@3x.png b/src/quickcontrols/imagine/images/menuitem-indicator-pressed@3x.png
index 9325de38cb..9325de38cb 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@4x.png b/src/quickcontrols/imagine/images/menuitem-indicator-pressed@4x.png
index c93b8fb8a3..c93b8fb8a3 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator.png b/src/quickcontrols/imagine/images/menuitem-indicator.png
index 2b3e2323d7..2b3e2323d7 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator@2x.png b/src/quickcontrols/imagine/images/menuitem-indicator@2x.png
index ce8985dbb1..ce8985dbb1 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator@2x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator@2x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator@3x.png b/src/quickcontrols/imagine/images/menuitem-indicator@3x.png
index 2968731dd7..2968731dd7 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator@3x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator@3x.png
diff --git a/src/quickcontrols2/imagine/images/menuitem-indicator@4x.png b/src/quickcontrols/imagine/images/menuitem-indicator@4x.png
index ea8da28498..ea8da28498 100644
--- a/src/quickcontrols2/imagine/images/menuitem-indicator@4x.png
+++ b/src/quickcontrols/imagine/images/menuitem-indicator@4x.png
diff --git a/src/quickcontrols2/imagine/images/menuseparator-separator.9.png b/src/quickcontrols/imagine/images/menuseparator-separator.9.png
index b8825b99ca..b8825b99ca 100644
--- a/src/quickcontrols2/imagine/images/menuseparator-separator.9.png
+++ b/src/quickcontrols/imagine/images/menuseparator-separator.9.png
diff --git a/src/quickcontrols2/imagine/images/menuseparator-separator@2x.9.png b/src/quickcontrols/imagine/images/menuseparator-separator@2x.9.png
index 3e5a023d76..3e5a023d76 100644
--- a/src/quickcontrols2/imagine/images/menuseparator-separator@2x.9.png
+++ b/src/quickcontrols/imagine/images/menuseparator-separator@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/menuseparator-separator@3x.9.png b/src/quickcontrols/imagine/images/menuseparator-separator@3x.9.png
index abe775c7a3..abe775c7a3 100644
--- a/src/quickcontrols2/imagine/images/menuseparator-separator@3x.9.png
+++ b/src/quickcontrols/imagine/images/menuseparator-separator@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/menuseparator-separator@4x.9.png b/src/quickcontrols/imagine/images/menuseparator-separator@4x.9.png
index 164c8e3e22..164c8e3e22 100644
--- a/src/quickcontrols2/imagine/images/menuseparator-separator@4x.9.png
+++ b/src/quickcontrols/imagine/images/menuseparator-separator@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/page-background.png b/src/quickcontrols/imagine/images/page-background.png
index 2d8d70f288..2d8d70f288 100644
--- a/src/quickcontrols2/imagine/images/page-background.png
+++ b/src/quickcontrols/imagine/images/page-background.png
diff --git a/src/quickcontrols2/imagine/images/page-background@2x.png b/src/quickcontrols/imagine/images/page-background@2x.png
index 18fbaa4c63..18fbaa4c63 100644
--- a/src/quickcontrols2/imagine/images/page-background@2x.png
+++ b/src/quickcontrols/imagine/images/page-background@2x.png
diff --git a/src/quickcontrols2/imagine/images/page-background@3x.png b/src/quickcontrols/imagine/images/page-background@3x.png
index 241232b1e0..241232b1e0 100644
--- a/src/quickcontrols2/imagine/images/page-background@3x.png
+++ b/src/quickcontrols/imagine/images/page-background@3x.png
diff --git a/src/quickcontrols2/imagine/images/page-background@4x.png b/src/quickcontrols/imagine/images/page-background@4x.png
index 8eb1b1ecc1..8eb1b1ecc1 100644
--- a/src/quickcontrols2/imagine/images/page-background@4x.png
+++ b/src/quickcontrols/imagine/images/page-background@4x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-current.png b/src/quickcontrols/imagine/images/pageindicator-delegate-current.png
index dc96d72326..dc96d72326 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-current.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-current.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-current@2x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-current@2x.png
index 3e0d794fd5..3e0d794fd5 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-current@2x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-current@2x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-current@3x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-current@3x.png
index 397501a7db..397501a7db 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-current@3x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-current@3x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-current@4x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-current@4x.png
index f741a8963b..f741a8963b 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-current@4x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-current@4x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current.png b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled-current.png
index 848d4351a3..848d4351a3 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled-current.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@2x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled-current@2x.png
index 65b5a9d42f..65b5a9d42f 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@2x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled-current@2x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@3x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled-current@3x.png
index 99e3b644aa..99e3b644aa 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@3x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled-current@3x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@4x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled-current@4x.png
index f1801fffef..f1801fffef 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled-current@4x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled-current@4x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled.png b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled.png
index 848d4351a3..848d4351a3 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@2x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled@2x.png
index 65b5a9d42f..65b5a9d42f 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@3x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled@3x.png
index 99e3b644aa..99e3b644aa 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@4x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled@4x.png
index f1801fffef..f1801fffef 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed.png b/src/quickcontrols/imagine/images/pageindicator-delegate-pressed.png
index dc96d72326..dc96d72326 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-pressed.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@2x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-pressed@2x.png
index 3e0d794fd5..3e0d794fd5 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@3x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-pressed@3x.png
index 397501a7db..397501a7db 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@4x.png b/src/quickcontrols/imagine/images/pageindicator-delegate-pressed@4x.png
index f741a8963b..f741a8963b 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate.png b/src/quickcontrols/imagine/images/pageindicator-delegate.png
index 84d23cd1ae..84d23cd1ae 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate@2x.png b/src/quickcontrols/imagine/images/pageindicator-delegate@2x.png
index 0e706372c2..0e706372c2 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate@2x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate@2x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate@3x.png b/src/quickcontrols/imagine/images/pageindicator-delegate@3x.png
index 85af5a4e4b..85af5a4e4b 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate@3x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate@3x.png
diff --git a/src/quickcontrols2/imagine/images/pageindicator-delegate@4x.png b/src/quickcontrols/imagine/images/pageindicator-delegate@4x.png
index 0aacbab1a9..0aacbab1a9 100644
--- a/src/quickcontrols2/imagine/images/pageindicator-delegate@4x.png
+++ b/src/quickcontrols/imagine/images/pageindicator-delegate@4x.png
diff --git a/src/quickcontrols2/imagine/images/pane-background.9.png b/src/quickcontrols/imagine/images/pane-background.9.png
index 658f4863ea..658f4863ea 100644
--- a/src/quickcontrols2/imagine/images/pane-background.9.png
+++ b/src/quickcontrols/imagine/images/pane-background.9.png
diff --git a/src/quickcontrols2/imagine/images/pane-background@2x.9.png b/src/quickcontrols/imagine/images/pane-background@2x.9.png
index a84ac04a1f..a84ac04a1f 100644
--- a/src/quickcontrols2/imagine/images/pane-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/pane-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/pane-background@3x.9.png b/src/quickcontrols/imagine/images/pane-background@3x.9.png
index 2b1c4da9de..2b1c4da9de 100644
--- a/src/quickcontrols2/imagine/images/pane-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/pane-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/pane-background@4x.9.png b/src/quickcontrols/imagine/images/pane-background@4x.9.png
index 90295db412..90295db412 100644
--- a/src/quickcontrols2/imagine/images/pane-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/pane-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/popup-background.9.png b/src/quickcontrols/imagine/images/popup-background.9.png
index c842b5ff58..c842b5ff58 100644
--- a/src/quickcontrols2/imagine/images/popup-background.9.png
+++ b/src/quickcontrols/imagine/images/popup-background.9.png
diff --git a/src/quickcontrols2/imagine/images/popup-background@2x.9.png b/src/quickcontrols/imagine/images/popup-background@2x.9.png
index ca23df1f0d..ca23df1f0d 100644
--- a/src/quickcontrols2/imagine/images/popup-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/popup-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/popup-background@3x.9.png b/src/quickcontrols/imagine/images/popup-background@3x.9.png
index 46cd406536..46cd406536 100644
--- a/src/quickcontrols2/imagine/images/popup-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/popup-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/popup-background@4x.9.png b/src/quickcontrols/imagine/images/popup-background@4x.9.png
index 3da74119cc..3da74119cc 100644
--- a/src/quickcontrols2/imagine/images/popup-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/popup-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/popup-overlay-modal.png b/src/quickcontrols/imagine/images/popup-overlay-modal.png
index d4a43d1c70..d4a43d1c70 100644
--- a/src/quickcontrols2/imagine/images/popup-overlay-modal.png
+++ b/src/quickcontrols/imagine/images/popup-overlay-modal.png
diff --git a/src/quickcontrols2/imagine/images/popup-overlay-modal@2x.png b/src/quickcontrols/imagine/images/popup-overlay-modal@2x.png
index c9a8f4124b..c9a8f4124b 100644
--- a/src/quickcontrols2/imagine/images/popup-overlay-modal@2x.png
+++ b/src/quickcontrols/imagine/images/popup-overlay-modal@2x.png
diff --git a/src/quickcontrols2/imagine/images/popup-overlay-modal@3x.png b/src/quickcontrols/imagine/images/popup-overlay-modal@3x.png
index 4a1084a919..4a1084a919 100644
--- a/src/quickcontrols2/imagine/images/popup-overlay-modal@3x.png
+++ b/src/quickcontrols/imagine/images/popup-overlay-modal@3x.png
diff --git a/src/quickcontrols2/imagine/images/popup-overlay-modal@4x.png b/src/quickcontrols/imagine/images/popup-overlay-modal@4x.png
index b92e600dae..b92e600dae 100644
--- a/src/quickcontrols2/imagine/images/popup-overlay-modal@4x.png
+++ b/src/quickcontrols/imagine/images/popup-overlay-modal@4x.png
diff --git a/src/quickcontrols2/imagine/images/popup-overlay.png b/src/quickcontrols/imagine/images/popup-overlay.png
index b7da23c00f..b7da23c00f 100644
--- a/src/quickcontrols2/imagine/images/popup-overlay.png
+++ b/src/quickcontrols/imagine/images/popup-overlay.png
diff --git a/src/quickcontrols2/imagine/images/popup-overlay@2x.png b/src/quickcontrols/imagine/images/popup-overlay@2x.png
index 23828d5a1c..23828d5a1c 100644
--- a/src/quickcontrols2/imagine/images/popup-overlay@2x.png
+++ b/src/quickcontrols/imagine/images/popup-overlay@2x.png
diff --git a/src/quickcontrols2/imagine/images/popup-overlay@3x.png b/src/quickcontrols/imagine/images/popup-overlay@3x.png
index d9d5382867..d9d5382867 100644
--- a/src/quickcontrols2/imagine/images/popup-overlay@3x.png
+++ b/src/quickcontrols/imagine/images/popup-overlay@3x.png
diff --git a/src/quickcontrols2/imagine/images/popup-overlay@4x.png b/src/quickcontrols/imagine/images/popup-overlay@4x.png
index a76c1a3a71..a76c1a3a71 100644
--- a/src/quickcontrols2/imagine/images/popup-overlay@4x.png
+++ b/src/quickcontrols/imagine/images/popup-overlay@4x.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-animation.webp b/src/quickcontrols/imagine/images/progressbar-animation.webp
index 51c35c8823..51c35c8823 100644
--- a/src/quickcontrols2/imagine/images/progressbar-animation.webp
+++ b/src/quickcontrols/imagine/images/progressbar-animation.webp
diff --git a/src/quickcontrols2/imagine/images/progressbar-animation@2x.webp b/src/quickcontrols/imagine/images/progressbar-animation@2x.webp
index ee1206302a..ee1206302a 100644
--- a/src/quickcontrols2/imagine/images/progressbar-animation@2x.webp
+++ b/src/quickcontrols/imagine/images/progressbar-animation@2x.webp
diff --git a/src/quickcontrols2/imagine/images/progressbar-animation@3x.webp b/src/quickcontrols/imagine/images/progressbar-animation@3x.webp
index c2f94a74a1..c2f94a74a1 100644
--- a/src/quickcontrols2/imagine/images/progressbar-animation@3x.webp
+++ b/src/quickcontrols/imagine/images/progressbar-animation@3x.webp
diff --git a/src/quickcontrols2/imagine/images/progressbar-animation@4x.webp b/src/quickcontrols/imagine/images/progressbar-animation@4x.webp
index d49657e934..d49657e934 100644
--- a/src/quickcontrols2/imagine/images/progressbar-animation@4x.webp
+++ b/src/quickcontrols/imagine/images/progressbar-animation@4x.webp
diff --git a/src/quickcontrols2/imagine/images/progressbar-background.9.png b/src/quickcontrols/imagine/images/progressbar-background.9.png
index e1760070b3..e1760070b3 100644
--- a/src/quickcontrols2/imagine/images/progressbar-background.9.png
+++ b/src/quickcontrols/imagine/images/progressbar-background.9.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-background@2x.9.png b/src/quickcontrols/imagine/images/progressbar-background@2x.9.png
index e69922d57e..e69922d57e 100644
--- a/src/quickcontrols2/imagine/images/progressbar-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/progressbar-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-background@3x.9.png b/src/quickcontrols/imagine/images/progressbar-background@3x.9.png
index b3c43205c3..b3c43205c3 100644
--- a/src/quickcontrols2/imagine/images/progressbar-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/progressbar-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-background@4x.9.png b/src/quickcontrols/imagine/images/progressbar-background@4x.9.png
index 905bdc328f..905bdc328f 100644
--- a/src/quickcontrols2/imagine/images/progressbar-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/progressbar-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-mask.9.png b/src/quickcontrols/imagine/images/progressbar-mask.9.png
index 35a47dc807..35a47dc807 100644
--- a/src/quickcontrols2/imagine/images/progressbar-mask.9.png
+++ b/src/quickcontrols/imagine/images/progressbar-mask.9.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-mask@2x.9.png b/src/quickcontrols/imagine/images/progressbar-mask@2x.9.png
index 23ed1a8cf1..23ed1a8cf1 100644
--- a/src/quickcontrols2/imagine/images/progressbar-mask@2x.9.png
+++ b/src/quickcontrols/imagine/images/progressbar-mask@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-mask@3x.9.png b/src/quickcontrols/imagine/images/progressbar-mask@3x.9.png
index 25bc843e3a..25bc843e3a 100644
--- a/src/quickcontrols2/imagine/images/progressbar-mask@3x.9.png
+++ b/src/quickcontrols/imagine/images/progressbar-mask@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-mask@4x.9.png b/src/quickcontrols/imagine/images/progressbar-mask@4x.9.png
index 645ff20179..645ff20179 100644
--- a/src/quickcontrols2/imagine/images/progressbar-mask@4x.9.png
+++ b/src/quickcontrols/imagine/images/progressbar-mask@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-progress.png b/src/quickcontrols/imagine/images/progressbar-progress.png
index bb31dc9b14..bb31dc9b14 100644
--- a/src/quickcontrols2/imagine/images/progressbar-progress.png
+++ b/src/quickcontrols/imagine/images/progressbar-progress.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-progress@2x.png b/src/quickcontrols/imagine/images/progressbar-progress@2x.png
index 6bb464c90b..6bb464c90b 100644
--- a/src/quickcontrols2/imagine/images/progressbar-progress@2x.png
+++ b/src/quickcontrols/imagine/images/progressbar-progress@2x.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-progress@3x.png b/src/quickcontrols/imagine/images/progressbar-progress@3x.png
index d514c72772..d514c72772 100644
--- a/src/quickcontrols2/imagine/images/progressbar-progress@3x.png
+++ b/src/quickcontrols/imagine/images/progressbar-progress@3x.png
diff --git a/src/quickcontrols2/imagine/images/progressbar-progress@4x.png b/src/quickcontrols/imagine/images/progressbar-progress@4x.png
index abc8fa6753..abc8fa6753 100644
--- a/src/quickcontrols2/imagine/images/progressbar-progress@4x.png
+++ b/src/quickcontrols/imagine/images/progressbar-progress@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-focused.png
index 2f9e5e18e9..2f9e5e18e9 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-focused.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@2x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-focused@2x.png
index 47ec553423..47ec553423 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@2x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@3x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-focused@3x.png
index 26cdebf817..26cdebf817 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@3x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@4x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-focused@4x.png
index 708e286ea7..708e286ea7 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-focused@4x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-hovered.png
index 2f9e5e18e9..2f9e5e18e9 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-hovered.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@2x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-hovered@2x.png
index 47ec553423..47ec553423 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@3x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-hovered@3x.png
index 26cdebf817..26cdebf817 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@4x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-hovered@4x.png
index 708e286ea7..708e286ea7 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-pressed.png
index 1e5ebca46a..1e5ebca46a 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-pressed.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@2x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-pressed@2x.png
index 6eaae9bf3e..6eaae9bf3e 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@3x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-pressed@3x.png
index e54a1624d9..e54a1624d9 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@4x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-pressed@4x.png
index 7a7850bada..7a7850bada 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked.png
index 83c8562379..83c8562379 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@2x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked@2x.png
index 4bdeb4566e..4bdeb4566e 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@2x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@3x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked@3x.png
index 2230a8ce09..2230a8ce09 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@3x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@4x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-checked@4x.png
index e3dce04e56..e3dce04e56 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-checked@4x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled.png b/src/quickcontrols/imagine/images/radiobutton-indicator-disabled.png
index 05b8bfcadb..05b8bfcadb 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-disabled.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@2x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-disabled@2x.png
index e26fa5de81..e26fa5de81 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@3x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-disabled@3x.png
index c47e8c7d13..c47e8c7d13 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@4x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-disabled@4x.png
index bc66dde78d..bc66dde78d 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-focused.png b/src/quickcontrols/imagine/images/radiobutton-indicator-focused.png
index 3001638d37..3001638d37 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-focused.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-focused.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@2x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-focused@2x.png
index b98907149e..b98907149e 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@2x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@3x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-focused@3x.png
index b6221277d9..b6221277d9 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@3x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@4x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-focused@4x.png
index 49ae2206ba..49ae2206ba 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-focused@4x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered.png b/src/quickcontrols/imagine/images/radiobutton-indicator-hovered.png
index 3001638d37..3001638d37 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-hovered.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@2x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-hovered@2x.png
index b98907149e..b98907149e 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@3x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-hovered@3x.png
index b6221277d9..b6221277d9 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@4x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-hovered@4x.png
index 49ae2206ba..49ae2206ba 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed.png b/src/quickcontrols/imagine/images/radiobutton-indicator-pressed.png
index 76c7b4ed7b..76c7b4ed7b 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-pressed.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@2x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-pressed@2x.png
index d5d4cac6d1..d5d4cac6d1 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@3x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-pressed@3x.png
index ca2a1ed169..ca2a1ed169 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@4x.png b/src/quickcontrols/imagine/images/radiobutton-indicator-pressed@4x.png
index 1cb753d72f..1cb753d72f 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator.png b/src/quickcontrols/imagine/images/radiobutton-indicator.png
index c05d4bfc05..c05d4bfc05 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator@2x.png b/src/quickcontrols/imagine/images/radiobutton-indicator@2x.png
index 62744d2726..62744d2726 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator@2x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator@3x.png b/src/quickcontrols/imagine/images/radiobutton-indicator@3x.png
index fa5d241e70..fa5d241e70 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator@3x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiobutton-indicator@4x.png b/src/quickcontrols/imagine/images/radiobutton-indicator@4x.png
index 7db85e9432..7db85e9432 100644
--- a/src/quickcontrols2/imagine/images/radiobutton-indicator@4x.png
+++ b/src/quickcontrols/imagine/images/radiobutton-indicator@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-disabled.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-disabled.9.png
index 23570729d6..23570729d6 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-focused.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-focused.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-focused@2x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-focused@3x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-focused@4x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-highlighted.9.png
index e79d8e1d01..e79d8e1d01 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-highlighted.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@2x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-highlighted@2x.9.png
index ea68d35fc4..ea68d35fc4 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@2x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-highlighted@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@3x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-highlighted@3x.9.png
index 6d61041599..6d61041599 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@3x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-highlighted@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@4x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-highlighted@4x.9.png
index 590cca96a1..590cca96a1 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-highlighted@4x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-highlighted@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-hovered.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-hovered.9.png
index b8749743d0..b8749743d0 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-hovered.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@2x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-hovered@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@3x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-hovered@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@4x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-hovered@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-pressed.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-pressed.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-pressed.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@2x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@3x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@4x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background.9.png b/src/quickcontrols/imagine/images/radiodelegate-background.9.png
index b8749743d0..b8749743d0 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background@2x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background@3x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-background@4x.9.png b/src/quickcontrols/imagine/images/radiodelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-focused.png
index 2f9e5e18e9..2f9e5e18e9 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-focused.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@2x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-focused@2x.png
index 47ec553423..47ec553423 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@2x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@3x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-focused@3x.png
index 26cdebf817..26cdebf817 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@3x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@4x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-focused@4x.png
index 708e286ea7..708e286ea7 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-focused@4x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-hovered.png
index 2f9e5e18e9..2f9e5e18e9 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-hovered.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@2x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-hovered@2x.png
index 47ec553423..47ec553423 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@3x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-hovered@3x.png
index 26cdebf817..26cdebf817 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@4x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-hovered@4x.png
index 708e286ea7..708e286ea7 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-pressed.png
index 1e5ebca46a..1e5ebca46a 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-pressed.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@2x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-pressed@2x.png
index 6eaae9bf3e..6eaae9bf3e 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@3x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-pressed@3x.png
index e54a1624d9..e54a1624d9 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@4x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-pressed@4x.png
index 7a7850bada..7a7850bada 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked.png
index 83c8562379..83c8562379 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@2x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked@2x.png
index 4bdeb4566e..4bdeb4566e 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@2x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@3x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked@3x.png
index 2230a8ce09..2230a8ce09 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@3x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@4x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked@4x.png
index e3dce04e56..e3dce04e56 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-checked@4x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-disabled.png
index 05b8bfcadb..05b8bfcadb 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-disabled.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@2x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-disabled@2x.png
index e26fa5de81..e26fa5de81 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@3x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-disabled@3x.png
index c47e8c7d13..c47e8c7d13 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@4x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-disabled@4x.png
index bc66dde78d..bc66dde78d 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-focused.png
index 3001638d37..3001638d37 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-focused.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@2x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-focused@2x.png
index b98907149e..b98907149e 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@2x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@3x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-focused@3x.png
index b6221277d9..b6221277d9 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@3x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@4x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-focused@4x.png
index 49ae2206ba..49ae2206ba 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-focused@4x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-hovered.png
index 3001638d37..3001638d37 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-hovered.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@2x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-hovered@2x.png
index b98907149e..b98907149e 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@3x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-hovered@3x.png
index b6221277d9..b6221277d9 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@4x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-hovered@4x.png
index 49ae2206ba..49ae2206ba 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-pressed.png
index 76c7b4ed7b..76c7b4ed7b 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-pressed.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@2x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-pressed@2x.png
index d5d4cac6d1..d5d4cac6d1 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@3x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-pressed@3x.png
index ca2a1ed169..ca2a1ed169 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@4x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator-pressed@4x.png
index 1cb753d72f..1cb753d72f 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator.png b/src/quickcontrols/imagine/images/radiodelegate-indicator.png
index c05d4bfc05..c05d4bfc05 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator@2x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator@2x.png
index 62744d2726..62744d2726 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator@2x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator@2x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator@3x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator@3x.png
index fa5d241e70..fa5d241e70 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator@3x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator@3x.png
diff --git a/src/quickcontrols2/imagine/images/radiodelegate-indicator@4x.png b/src/quickcontrols/imagine/images/radiodelegate-indicator@4x.png
index 7db85e9432..7db85e9432 100644
--- a/src/quickcontrols2/imagine/images/radiodelegate-indicator@4x.png
+++ b/src/quickcontrols/imagine/images/radiodelegate-indicator@4x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-background-horizontal.9.png b/src/quickcontrols/imagine/images/rangeslider-background-horizontal.9.png
index c4e957ad1b..c4e957ad1b 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-background-horizontal.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-background-horizontal.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@2x.9.png b/src/quickcontrols/imagine/images/rangeslider-background-horizontal@2x.9.png
index 6d8391130b..6d8391130b 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@2x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-background-horizontal@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@3x.9.png b/src/quickcontrols/imagine/images/rangeslider-background-horizontal@3x.9.png
index 6b2e634c97..6b2e634c97 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@3x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-background-horizontal@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@4x.9.png b/src/quickcontrols/imagine/images/rangeslider-background-horizontal@4x.9.png
index 969c791a38..969c791a38 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-background-horizontal@4x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-background-horizontal@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-background-vertical.9.png b/src/quickcontrols/imagine/images/rangeslider-background-vertical.9.png
index f76e0b21f2..f76e0b21f2 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-background-vertical.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-background-vertical.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-background-vertical@2x.9.png b/src/quickcontrols/imagine/images/rangeslider-background-vertical@2x.9.png
index fecd0ab2ba..fecd0ab2ba 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-background-vertical@2x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-background-vertical@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-background-vertical@3x.9.png b/src/quickcontrols/imagine/images/rangeslider-background-vertical@3x.9.png
index 77a9c830a5..77a9c830a5 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-background-vertical@3x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-background-vertical@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-background-vertical@4x.9.png b/src/quickcontrols/imagine/images/rangeslider-background-vertical@4x.9.png
index f1613684c0..f1613684c0 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-background-vertical@4x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-background-vertical@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-disabled.png b/src/quickcontrols/imagine/images/rangeslider-handle-disabled.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-disabled.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-disabled.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@2x.png b/src/quickcontrols/imagine/images/rangeslider-handle-disabled@2x.png
index 451b719e60..451b719e60 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@3x.png b/src/quickcontrols/imagine/images/rangeslider-handle-disabled@3x.png
index 1daffca729..1daffca729 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@4x.png b/src/quickcontrols/imagine/images/rangeslider-handle-disabled@4x.png
index 6483070710..6483070710 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused-hovered.png
index c2958f1b3d..c2958f1b3d 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused-hovered.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@2x.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused-hovered@2x.png
index 12a4d1f83f..12a4d1f83f 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@3x.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused-hovered@3x.png
index 1696ac9507..1696ac9507 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@4x.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused-hovered@4x.png
index e1d1305623..e1d1305623 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused-pressed.png
index c2958f1b3d..c2958f1b3d 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused-pressed.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@2x.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused-pressed@2x.png
index 12a4d1f83f..12a4d1f83f 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@3x.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused-pressed@3x.png
index 1696ac9507..1696ac9507 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@4x.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused-pressed@4x.png
index e1d1305623..e1d1305623 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused.png
index bdf8239a46..bdf8239a46 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused@2x.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused@2x.png
index 9f887c5ea1..9f887c5ea1 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused@2x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused@3x.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused@3x.png
index 8042d4c2a2..8042d4c2a2 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused@3x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-focused@4x.png b/src/quickcontrols/imagine/images/rangeslider-handle-focused@4x.png
index e7e68c47e3..e7e68c47e3 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-focused@4x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-hovered.png b/src/quickcontrols/imagine/images/rangeslider-handle-hovered.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-hovered.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-hovered.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@2x.png b/src/quickcontrols/imagine/images/rangeslider-handle-hovered@2x.png
index 451b719e60..451b719e60 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@3x.png b/src/quickcontrols/imagine/images/rangeslider-handle-hovered@3x.png
index 1daffca729..1daffca729 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@4x.png b/src/quickcontrols/imagine/images/rangeslider-handle-hovered@4x.png
index 6483070710..6483070710 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-pressed.png b/src/quickcontrols/imagine/images/rangeslider-handle-pressed.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-pressed.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-pressed.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@2x.png b/src/quickcontrols/imagine/images/rangeslider-handle-pressed@2x.png
index 451b719e60..451b719e60 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@3x.png b/src/quickcontrols/imagine/images/rangeslider-handle-pressed@3x.png
index 1daffca729..1daffca729 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@4x.png b/src/quickcontrols/imagine/images/rangeslider-handle-pressed@4x.png
index 6483070710..6483070710 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle.png b/src/quickcontrols/imagine/images/rangeslider-handle.png
index fd72dedfb0..fd72dedfb0 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle@2x.png b/src/quickcontrols/imagine/images/rangeslider-handle@2x.png
index 57eed9f8ae..57eed9f8ae 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle@2x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle@2x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle@3x.png b/src/quickcontrols/imagine/images/rangeslider-handle@3x.png
index e217a6444f..e217a6444f 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle@3x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle@3x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-handle@4x.png b/src/quickcontrols/imagine/images/rangeslider-handle@4x.png
index c212b59f55..c212b59f55 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-handle@4x.png
+++ b/src/quickcontrols/imagine/images/rangeslider-handle@4x.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal-disabled.9.png
index 7f7e6b935a..7f7e6b935a 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png
index cbf6fb6352..cbf6fb6352 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png
index 643776b8c9..643776b8c9 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png
index d64acb904d..d64acb904d 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal.9.png
index 43192f5416..43192f5416 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@2x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal@2x.9.png
index ebbbbf82f8..ebbbbf82f8 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@2x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@3x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal@3x.9.png
index 0a029b53e4..0a029b53e4 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@3x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@4x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal@4x.9.png
index a13541691a..a13541691a 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-horizontal@4x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-horizontal@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-vertical-disabled.9.png
index a4edafc971..a4edafc971 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-vertical-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png
index 8c38226e61..8c38226e61 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png
index a939bffde8..a939bffde8 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png
index 9f653770e2..9f653770e2 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-vertical.9.png
index d3e877fc34..d3e877fc34 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-vertical.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@2x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-vertical@2x.9.png
index 7790050e64..7790050e64 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@2x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-vertical@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@3x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-vertical@3x.9.png
index 039d198751..039d198751 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@3x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-vertical@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@4x.9.png b/src/quickcontrols/imagine/images/rangeslider-progress-vertical@4x.9.png
index b3051d1f46..b3051d1f46 100644
--- a/src/quickcontrols2/imagine/images/rangeslider-progress-vertical@4x.9.png
+++ b/src/quickcontrols/imagine/images/rangeslider-progress-vertical@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused.png b/src/quickcontrols/imagine/images/roundbutton-background-checked-focused.png
index 032a7caa65..032a7caa65 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked-focused.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-checked-focused@2x.png
index a2944b6ac8..a2944b6ac8 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-checked-focused@3x.png
index ffd4d210c4..ffd4d210c4 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-checked-focused@4x.png
index 35a41fc502..35a41fc502 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked-focused@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered.png b/src/quickcontrols/imagine/images/roundbutton-background-checked-hovered.png
index 032a7caa65..032a7caa65 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked-hovered.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-checked-hovered@2x.png
index a2944b6ac8..a2944b6ac8 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-checked-hovered@3x.png
index ffd4d210c4..ffd4d210c4 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-checked-hovered@4x.png
index 35a41fc502..35a41fc502 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked.png b/src/quickcontrols/imagine/images/roundbutton-background-checked.png
index d57d3894fa..d57d3894fa 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-checked@2x.png
index 7c37452818..7c37452818 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-checked@3x.png
index b0e0b9bebd..b0e0b9bebd 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-checked@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-checked@4x.png
index 748864efb3..748864efb3 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-checked@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked.png b/src/quickcontrols/imagine/images/roundbutton-background-disabled-checked.png
index e26fa5de81..e26fa5de81 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-disabled-checked.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-disabled-checked@2x.png
index bc66dde78d..bc66dde78d 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-disabled-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-disabled-checked@3x.png
index a0c5f9ad4f..a0c5f9ad4f 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-disabled-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-disabled-checked@4x.png
index 190210c8f8..190210c8f8 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-disabled-checked@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-disabled-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-disabled.png b/src/quickcontrols/imagine/images/roundbutton-background-disabled.png
index e26fa5de81..e26fa5de81 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-disabled.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-disabled.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-disabled@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-disabled@2x.png
index bc66dde78d..bc66dde78d 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-disabled@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-disabled@3x.png
index a0c5f9ad4f..a0c5f9ad4f 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-disabled@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-disabled@4x.png
index 190210c8f8..190210c8f8 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-focused.png b/src/quickcontrols/imagine/images/roundbutton-background-focused.png
index 832955c4e1..832955c4e1 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-focused.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-focused.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-focused@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-focused@2x.png
index bb1ed2ac4b..bb1ed2ac4b 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-focused@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-focused@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-focused@3x.png
index cbf0291321..cbf0291321 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-focused@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-focused@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-focused@4x.png
index 1c765dee15..1c765dee15 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-focused@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-focused.png
index 269a9d52d5..269a9d52d5 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-focused.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-focused@2x.png
index bd79565126..bd79565126 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-focused@3x.png
index 5ed0f662b4..5ed0f662b4 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-focused@4x.png
index 5bbb8e7afb..5bbb8e7afb 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-focused@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-hovered.png
index 269a9d52d5..269a9d52d5 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-hovered.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-hovered@2x.png
index bd79565126..bd79565126 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-hovered@3x.png
index 5ed0f662b4..5ed0f662b4 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-hovered@4x.png
index 5bbb8e7afb..5bbb8e7afb 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-pressed.png
index a0fa8df033..a0fa8df033 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-pressed.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-pressed@2x.png
index 3082a1d9c6..3082a1d9c6 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-pressed@3x.png
index d32e8af040..d32e8af040 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-pressed@4x.png
index f4916e0bca..f4916e0bca 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted.png
index f90e29f9cf..f90e29f9cf 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted@2x.png
index 7dce11b40d..7dce11b40d 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted@3x.png
index 436abbddce..436abbddce 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-highlighted@4x.png
index e728d6fa1c..e728d6fa1c 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-highlighted@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-highlighted@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-hovered.png b/src/quickcontrols/imagine/images/roundbutton-background-hovered.png
index 832955c4e1..832955c4e1 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-hovered.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-hovered.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-hovered@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-hovered@2x.png
index bb1ed2ac4b..bb1ed2ac4b 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-hovered@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-hovered@3x.png
index cbf0291321..cbf0291321 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-hovered@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-hovered@4x.png
index 1c765dee15..1c765dee15 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-pressed.png b/src/quickcontrols/imagine/images/roundbutton-background-pressed.png
index d57d3894fa..d57d3894fa 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-pressed.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-pressed.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-pressed@2x.png b/src/quickcontrols/imagine/images/roundbutton-background-pressed@2x.png
index 7c37452818..7c37452818 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-pressed@3x.png b/src/quickcontrols/imagine/images/roundbutton-background-pressed@3x.png
index b0e0b9bebd..b0e0b9bebd 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background-pressed@4x.png b/src/quickcontrols/imagine/images/roundbutton-background-pressed@4x.png
index 748864efb3..748864efb3 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background.png b/src/quickcontrols/imagine/images/roundbutton-background.png
index d5d4cac6d1..d5d4cac6d1 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background@2x.png b/src/quickcontrols/imagine/images/roundbutton-background@2x.png
index 1cb753d72f..1cb753d72f 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background@2x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background@2x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background@3x.png b/src/quickcontrols/imagine/images/roundbutton-background@3x.png
index 6cc304bf42..6cc304bf42 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background@3x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background@3x.png
diff --git a/src/quickcontrols2/imagine/images/roundbutton-background@4x.png b/src/quickcontrols/imagine/images/roundbutton-background@4x.png
index 56ea82f6de..56ea82f6de 100644
--- a/src/quickcontrols2/imagine/images/roundbutton-background@4x.png
+++ b/src/quickcontrols/imagine/images/roundbutton-background@4x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-disabled.png b/src/quickcontrols/imagine/images/scrollbar-handle-disabled.png
index b0b95bed99..b0b95bed99 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-disabled.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-disabled.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@2x.png b/src/quickcontrols/imagine/images/scrollbar-handle-disabled@2x.png
index 8ab854b0a3..8ab854b0a3 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@3x.png b/src/quickcontrols/imagine/images/scrollbar-handle-disabled@3x.png
index f3c97231f5..f3c97231f5 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@4x.png b/src/quickcontrols/imagine/images/scrollbar-handle-disabled@4x.png
index 325469b8d8..325469b8d8 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-disabled.png
index 236002fff6..236002fff6 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-disabled.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@2x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-disabled@2x.png
index abc3d2c05c..abc3d2c05c 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@3x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-disabled@3x.png
index e215cf5b7a..e215cf5b7a 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@4x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-disabled@4x.png
index c6ec0520bd..c6ec0520bd 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-hovered.png
index 19b48f1d49..19b48f1d49 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-hovered.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@2x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-hovered@2x.png
index 8f5abb8494..8f5abb8494 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@3x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-hovered@3x.png
index 73963d754c..73963d754c 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@4x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-hovered@4x.png
index 04d6131ec9..04d6131ec9 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-pressed.png
index f48f514df2..f48f514df2 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-pressed.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@2x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-pressed@2x.png
index e31820add9..e31820add9 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@3x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-pressed@3x.png
index 278ba90007..278ba90007 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@4x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-pressed@4x.png
index 01e4e5c85b..01e4e5c85b 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive.png
index fd7832a6aa..fd7832a6aa 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@2x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive@2x.png
index bd63a1b1e8..bd63a1b1e8 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@2x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive@2x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@3x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive@3x.png
index 3145295446..3145295446 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@3x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive@3x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@4x.png b/src/quickcontrols/imagine/images/scrollbar-handle-interactive@4x.png
index 6db4d81da9..6db4d81da9 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle-interactive@4x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle-interactive@4x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle.png b/src/quickcontrols/imagine/images/scrollbar-handle.png
index 255f6c4d60..255f6c4d60 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle@2x.png b/src/quickcontrols/imagine/images/scrollbar-handle@2x.png
index 2b69cef6a3..2b69cef6a3 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle@2x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle@2x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle@3x.png b/src/quickcontrols/imagine/images/scrollbar-handle@3x.png
index 6fdfa487d0..6fdfa487d0 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle@3x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle@3x.png
diff --git a/src/quickcontrols2/imagine/images/scrollbar-handle@4x.png b/src/quickcontrols/imagine/images/scrollbar-handle@4x.png
index cc3205f125..cc3205f125 100644
--- a/src/quickcontrols2/imagine/images/scrollbar-handle@4x.png
+++ b/src/quickcontrols/imagine/images/scrollbar-handle@4x.png
diff --git a/src/quickcontrols2/imagine/images/scrollindicator-handle.png b/src/quickcontrols/imagine/images/scrollindicator-handle.png
index 255f6c4d60..255f6c4d60 100644
--- a/src/quickcontrols2/imagine/images/scrollindicator-handle.png
+++ b/src/quickcontrols/imagine/images/scrollindicator-handle.png
diff --git a/src/quickcontrols2/imagine/images/scrollindicator-handle@2x.png b/src/quickcontrols/imagine/images/scrollindicator-handle@2x.png
index 2b69cef6a3..2b69cef6a3 100644
--- a/src/quickcontrols2/imagine/images/scrollindicator-handle@2x.png
+++ b/src/quickcontrols/imagine/images/scrollindicator-handle@2x.png
diff --git a/src/quickcontrols2/imagine/images/scrollindicator-handle@3x.png b/src/quickcontrols/imagine/images/scrollindicator-handle@3x.png
index 6fdfa487d0..6fdfa487d0 100644
--- a/src/quickcontrols2/imagine/images/scrollindicator-handle@3x.png
+++ b/src/quickcontrols/imagine/images/scrollindicator-handle@3x.png
diff --git a/src/quickcontrols2/imagine/images/scrollindicator-handle@4x.png b/src/quickcontrols/imagine/images/scrollindicator-handle@4x.png
index cc3205f125..cc3205f125 100644
--- a/src/quickcontrols2/imagine/images/scrollindicator-handle@4x.png
+++ b/src/quickcontrols/imagine/images/scrollindicator-handle@4x.png
diff --git a/src/quickcontrols2/imagine/images/slider-background-horizontal.9.png b/src/quickcontrols/imagine/images/slider-background-horizontal.9.png
index c4e957ad1b..c4e957ad1b 100644
--- a/src/quickcontrols2/imagine/images/slider-background-horizontal.9.png
+++ b/src/quickcontrols/imagine/images/slider-background-horizontal.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-background-horizontal@2x.9.png b/src/quickcontrols/imagine/images/slider-background-horizontal@2x.9.png
index 6d8391130b..6d8391130b 100644
--- a/src/quickcontrols2/imagine/images/slider-background-horizontal@2x.9.png
+++ b/src/quickcontrols/imagine/images/slider-background-horizontal@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-background-horizontal@3x.9.png b/src/quickcontrols/imagine/images/slider-background-horizontal@3x.9.png
index 6b2e634c97..6b2e634c97 100644
--- a/src/quickcontrols2/imagine/images/slider-background-horizontal@3x.9.png
+++ b/src/quickcontrols/imagine/images/slider-background-horizontal@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-background-horizontal@4x.9.png b/src/quickcontrols/imagine/images/slider-background-horizontal@4x.9.png
index 969c791a38..969c791a38 100644
--- a/src/quickcontrols2/imagine/images/slider-background-horizontal@4x.9.png
+++ b/src/quickcontrols/imagine/images/slider-background-horizontal@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-background-vertical.9.png b/src/quickcontrols/imagine/images/slider-background-vertical.9.png
index f76e0b21f2..f76e0b21f2 100644
--- a/src/quickcontrols2/imagine/images/slider-background-vertical.9.png
+++ b/src/quickcontrols/imagine/images/slider-background-vertical.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-background-vertical@2x.9.png b/src/quickcontrols/imagine/images/slider-background-vertical@2x.9.png
index fecd0ab2ba..fecd0ab2ba 100644
--- a/src/quickcontrols2/imagine/images/slider-background-vertical@2x.9.png
+++ b/src/quickcontrols/imagine/images/slider-background-vertical@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-background-vertical@3x.9.png b/src/quickcontrols/imagine/images/slider-background-vertical@3x.9.png
index 77a9c830a5..77a9c830a5 100644
--- a/src/quickcontrols2/imagine/images/slider-background-vertical@3x.9.png
+++ b/src/quickcontrols/imagine/images/slider-background-vertical@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-background-vertical@4x.9.png b/src/quickcontrols/imagine/images/slider-background-vertical@4x.9.png
index f1613684c0..f1613684c0 100644
--- a/src/quickcontrols2/imagine/images/slider-background-vertical@4x.9.png
+++ b/src/quickcontrols/imagine/images/slider-background-vertical@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-disabled.png b/src/quickcontrols/imagine/images/slider-handle-disabled.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-disabled.png
+++ b/src/quickcontrols/imagine/images/slider-handle-disabled.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-disabled@2x.png b/src/quickcontrols/imagine/images/slider-handle-disabled@2x.png
index 451b719e60..451b719e60 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-disabled@3x.png b/src/quickcontrols/imagine/images/slider-handle-disabled@3x.png
index 1daffca729..1daffca729 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-disabled@4x.png b/src/quickcontrols/imagine/images/slider-handle-disabled@4x.png
index 6483070710..6483070710 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused-hovered.png b/src/quickcontrols/imagine/images/slider-handle-focused-hovered.png
index c2958f1b3d..c2958f1b3d 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused-hovered.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused-hovered.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@2x.png b/src/quickcontrols/imagine/images/slider-handle-focused-hovered@2x.png
index 12a4d1f83f..12a4d1f83f 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@3x.png b/src/quickcontrols/imagine/images/slider-handle-focused-hovered@3x.png
index 1696ac9507..1696ac9507 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@4x.png b/src/quickcontrols/imagine/images/slider-handle-focused-hovered@4x.png
index e1d1305623..e1d1305623 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused-pressed.png b/src/quickcontrols/imagine/images/slider-handle-focused-pressed.png
index c2958f1b3d..c2958f1b3d 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused-pressed.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused-pressed.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@2x.png b/src/quickcontrols/imagine/images/slider-handle-focused-pressed@2x.png
index 12a4d1f83f..12a4d1f83f 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@3x.png b/src/quickcontrols/imagine/images/slider-handle-focused-pressed@3x.png
index 1696ac9507..1696ac9507 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@4x.png b/src/quickcontrols/imagine/images/slider-handle-focused-pressed@4x.png
index e1d1305623..e1d1305623 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused.png b/src/quickcontrols/imagine/images/slider-handle-focused.png
index bdf8239a46..bdf8239a46 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused@2x.png b/src/quickcontrols/imagine/images/slider-handle-focused@2x.png
index 9f887c5ea1..9f887c5ea1 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused@2x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused@3x.png b/src/quickcontrols/imagine/images/slider-handle-focused@3x.png
index 8042d4c2a2..8042d4c2a2 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused@3x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-focused@4x.png b/src/quickcontrols/imagine/images/slider-handle-focused@4x.png
index e7e68c47e3..e7e68c47e3 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-focused@4x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-hovered.png b/src/quickcontrols/imagine/images/slider-handle-hovered.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-hovered.png
+++ b/src/quickcontrols/imagine/images/slider-handle-hovered.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-hovered@2x.png b/src/quickcontrols/imagine/images/slider-handle-hovered@2x.png
index 451b719e60..451b719e60 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-hovered@3x.png b/src/quickcontrols/imagine/images/slider-handle-hovered@3x.png
index 1daffca729..1daffca729 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-hovered@4x.png b/src/quickcontrols/imagine/images/slider-handle-hovered@4x.png
index 6483070710..6483070710 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-pressed.png b/src/quickcontrols/imagine/images/slider-handle-pressed.png
index 4934fb77c5..4934fb77c5 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-pressed.png
+++ b/src/quickcontrols/imagine/images/slider-handle-pressed.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-pressed@2x.png b/src/quickcontrols/imagine/images/slider-handle-pressed@2x.png
index 451b719e60..451b719e60 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-pressed@3x.png b/src/quickcontrols/imagine/images/slider-handle-pressed@3x.png
index 1daffca729..1daffca729 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle-pressed@4x.png b/src/quickcontrols/imagine/images/slider-handle-pressed@4x.png
index 6483070710..6483070710 100644
--- a/src/quickcontrols2/imagine/images/slider-handle-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/slider-handle-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle.png b/src/quickcontrols/imagine/images/slider-handle.png
index fd72dedfb0..fd72dedfb0 100644
--- a/src/quickcontrols2/imagine/images/slider-handle.png
+++ b/src/quickcontrols/imagine/images/slider-handle.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle@2x.png b/src/quickcontrols/imagine/images/slider-handle@2x.png
index 57eed9f8ae..57eed9f8ae 100644
--- a/src/quickcontrols2/imagine/images/slider-handle@2x.png
+++ b/src/quickcontrols/imagine/images/slider-handle@2x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle@3x.png b/src/quickcontrols/imagine/images/slider-handle@3x.png
index e217a6444f..e217a6444f 100644
--- a/src/quickcontrols2/imagine/images/slider-handle@3x.png
+++ b/src/quickcontrols/imagine/images/slider-handle@3x.png
diff --git a/src/quickcontrols2/imagine/images/slider-handle@4x.png b/src/quickcontrols/imagine/images/slider-handle@4x.png
index c212b59f55..c212b59f55 100644
--- a/src/quickcontrols2/imagine/images/slider-handle@4x.png
+++ b/src/quickcontrols/imagine/images/slider-handle@4x.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled.9.png b/src/quickcontrols/imagine/images/slider-progress-horizontal-disabled.9.png
index 7f7e6b935a..7f7e6b935a 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-horizontal-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@2x.9.png b/src/quickcontrols/imagine/images/slider-progress-horizontal-disabled@2x.9.png
index cbf6fb6352..cbf6fb6352 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-horizontal-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@3x.9.png b/src/quickcontrols/imagine/images/slider-progress-horizontal-disabled@3x.9.png
index 643776b8c9..643776b8c9 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-horizontal-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@4x.9.png b/src/quickcontrols/imagine/images/slider-progress-horizontal-disabled@4x.9.png
index d64acb904d..d64acb904d 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-horizontal-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-horizontal-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-horizontal.9.png b/src/quickcontrols/imagine/images/slider-progress-horizontal.9.png
index 43192f5416..43192f5416 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-horizontal.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-horizontal.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-horizontal@2x.9.png b/src/quickcontrols/imagine/images/slider-progress-horizontal@2x.9.png
index ebbbbf82f8..ebbbbf82f8 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-horizontal@2x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-horizontal@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-horizontal@3x.9.png b/src/quickcontrols/imagine/images/slider-progress-horizontal@3x.9.png
index 0a029b53e4..0a029b53e4 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-horizontal@3x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-horizontal@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-horizontal@4x.9.png b/src/quickcontrols/imagine/images/slider-progress-horizontal@4x.9.png
index a13541691a..a13541691a 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-horizontal@4x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-horizontal@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled.9.png b/src/quickcontrols/imagine/images/slider-progress-vertical-disabled.9.png
index a4edafc971..a4edafc971 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-vertical-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@2x.9.png b/src/quickcontrols/imagine/images/slider-progress-vertical-disabled@2x.9.png
index 8c38226e61..8c38226e61 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-vertical-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@3x.9.png b/src/quickcontrols/imagine/images/slider-progress-vertical-disabled@3x.9.png
index a939bffde8..a939bffde8 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-vertical-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@4x.9.png b/src/quickcontrols/imagine/images/slider-progress-vertical-disabled@4x.9.png
index 9f653770e2..9f653770e2 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-vertical-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-vertical-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-vertical.9.png b/src/quickcontrols/imagine/images/slider-progress-vertical.9.png
index d3e877fc34..d3e877fc34 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-vertical.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-vertical.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-vertical@2x.9.png b/src/quickcontrols/imagine/images/slider-progress-vertical@2x.9.png
index 7790050e64..7790050e64 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-vertical@2x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-vertical@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-vertical@3x.9.png b/src/quickcontrols/imagine/images/slider-progress-vertical@3x.9.png
index 039d198751..039d198751 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-vertical@3x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-vertical@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/slider-progress-vertical@4x.9.png b/src/quickcontrols/imagine/images/slider-progress-vertical@4x.9.png
index b3051d1f46..b3051d1f46 100644
--- a/src/quickcontrols2/imagine/images/slider-progress-vertical@4x.9.png
+++ b/src/quickcontrols/imagine/images/slider-progress-vertical@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-disabled.9.png b/src/quickcontrols/imagine/images/spinbox-background-disabled.9.png
index 7baaeec525..7baaeec525 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/spinbox-background-disabled@2x.9.png
index e0d5907034..e0d5907034 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/spinbox-background-disabled@3x.9.png
index 24b3054ded..24b3054ded 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/spinbox-background-disabled@4x.9.png
index 8ac4740a7b..8ac4740a7b 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-editable.9.png b/src/quickcontrols/imagine/images/spinbox-background-editable.9.png
index 995c827659..995c827659 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-editable.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-editable.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-editable@2x.9.png b/src/quickcontrols/imagine/images/spinbox-background-editable@2x.9.png
index 42c9dd6ba2..42c9dd6ba2 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-editable@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-editable@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-editable@3x.9.png b/src/quickcontrols/imagine/images/spinbox-background-editable@3x.9.png
index 4ee974a144..4ee974a144 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-editable@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-editable@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-editable@4x.9.png b/src/quickcontrols/imagine/images/spinbox-background-editable@4x.9.png
index 59b0091539..59b0091539 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-editable@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-editable@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-focused.9.png b/src/quickcontrols/imagine/images/spinbox-background-focused.9.png
index 27751eacc8..27751eacc8 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-focused@2x.9.png b/src/quickcontrols/imagine/images/spinbox-background-focused@2x.9.png
index 1692578f6c..1692578f6c 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-focused@3x.9.png b/src/quickcontrols/imagine/images/spinbox-background-focused@3x.9.png
index 4c44c1bbbc..4c44c1bbbc 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background-focused@4x.9.png b/src/quickcontrols/imagine/images/spinbox-background-focused@4x.9.png
index f8632bf2f8..f8632bf2f8 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background.9.png b/src/quickcontrols/imagine/images/spinbox-background.9.png
index ae8b043beb..ae8b043beb 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background@2x.9.png b/src/quickcontrols/imagine/images/spinbox-background@2x.9.png
index eaae097e2f..eaae097e2f 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background@3x.9.png b/src/quickcontrols/imagine/images/spinbox-background@3x.9.png
index d8add8117c..d8add8117c 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-background@4x.9.png b/src/quickcontrols/imagine/images/spinbox-background@4x.9.png
index d954febfc2..d954febfc2 100644
--- a/src/quickcontrols2/imagine/images/spinbox-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-disabled.9.png
index b3953398d8..b3953398d8 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-disabled@2x.9.png
index 18e2ca65d4..18e2ca65d4 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-disabled@3x.9.png
index ed6674b47b..ed6674b47b 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-disabled@4x.9.png
index 0da2cf93ff..0da2cf93ff 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-focused.9.png
index 46220a8ebe..46220a8ebe 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png
index b8ebb7b7eb..b8ebb7b7eb 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png
index 10561d8dbb..10561d8dbb 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png
index ccd09d69a5..ccd09d69a5 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-hovered.9.png
index 46220a8ebe..46220a8ebe 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png
index b8ebb7b7eb..b8ebb7b7eb 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png
index 10561d8dbb..10561d8dbb 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png
index ccd09d69a5..ccd09d69a5 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png
index 23842de4e6..23842de4e6 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png
index e50789323a..e50789323a 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png
index 7edec0c9b3..7edec0c9b3 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png
index f6e5ff8201..f6e5ff8201 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png
index 23842de4e6..23842de4e6 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png
index e50789323a..e50789323a 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png
index 7edec0c9b3..7edec0c9b3 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png
index f6e5ff8201..f6e5ff8201 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png
index b6917a036b..b6917a036b 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png
index 8999d3e441..8999d3e441 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png
index 77aa004465..77aa004465 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png
index 4f2fd261ab..4f2fd261ab 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored.9.png
index 3c3da5b1a1..3c3da5b1a1 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png
index e0760e07cd..e0760e07cd 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png
index c37080f5b8..c37080f5b8 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png
index bdc248231a..bdc248231a 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-pressed.9.png
index 65f2821bcd..65f2821bcd 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png
index 010dd9d0bb..010dd9d0bb 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png
index f647f489d2..f647f489d2 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png
index db0486d1fc..db0486d1fc 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable.9.png
index c3207f311b..c3207f311b 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable@2x.9.png
index c8c2630e83..c8c2630e83 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable@3x.9.png
index d0a6c81816..d0a6c81816 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable@4x.9.png
index 40e897623b..40e897623b 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-editable@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-editable@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-focused.9.png
index 6ad31bb0e2..6ad31bb0e2 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-focused@2x.9.png
index 6cc60b4b54..6cc60b4b54 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-focused@3x.9.png
index 722c7ec708..722c7ec708 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-focused@4x.9.png
index 64fa4ab6c0..64fa4ab6c0 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-hovered.9.png
index 6ad31bb0e2..6ad31bb0e2 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-hovered@2x.9.png
index 6cc60b4b54..6cc60b4b54 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-hovered@3x.9.png
index 722c7ec708..722c7ec708 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-hovered@4x.9.png
index 64fa4ab6c0..64fa4ab6c0 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png
index ac7da20e65..ac7da20e65 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png
index a12f361535..a12f361535 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png
index de11317bc1..de11317bc1 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png
index 8be41f3898..8be41f3898 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-focused.9.png
index 6b6e526436..6b6e526436 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png
index e0c36da35d..e0c36da35d 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png
index ca2389dac4..ca2389dac4 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png
index 7e6c547419..7e6c547419 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png
index 6b6e526436..6b6e526436 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png
index e0c36da35d..e0c36da35d 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png
index ca2389dac4..ca2389dac4 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png
index 7e6c547419..7e6c547419 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png
index d756679feb..d756679feb 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png
index e49c7e8985..e49c7e8985 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png
index 6041ffdcc0..6041ffdcc0 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png
index e23dda155e..e23dda155e 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored.9.png
index 58be212032..58be212032 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored@2x.9.png
index 709a1ab6c6..709a1ab6c6 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored@3x.9.png
index ee5b5b8225..ee5b5b8225 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored@4x.9.png
index 1e88d44dba..1e88d44dba 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-mirrored@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-mirrored@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-pressed.9.png
index 9703314b47..9703314b47 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-pressed@2x.9.png
index 173eccfbe3..173eccfbe3 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-pressed@3x.9.png
index 77737c7593..77737c7593 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down-pressed@4x.9.png
index 6a2bb865cb..6a2bb865cb 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down.9.png
index a6c9679a43..a6c9679a43 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down@2x.9.png
index bd14cdbbfc..bd14cdbbfc 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down@3x.9.png
index 02d18c1d8e..02d18c1d8e 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-down@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-down@4x.9.png
index 9ec1bf0459..9ec1bf0459 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-down@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-down@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-disabled.9.png
index 5fe5ab6ad5..5fe5ab6ad5 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-disabled@2x.9.png
index f7a2a5d56d..f7a2a5d56d 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-disabled@3x.9.png
index 3244c93f14..3244c93f14 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-disabled@4x.9.png
index 8248200559..8248200559 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-focused.9.png
index d291c50a76..d291c50a76 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png
index 06e27b1b8e..06e27b1b8e 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png
index 34b4373558..34b4373558 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png
index 4a95cca469..4a95cca469 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-hovered.9.png
index d291c50a76..d291c50a76 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png
index 06e27b1b8e..06e27b1b8e 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png
index 34b4373558..34b4373558 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png
index 4a95cca469..4a95cca469 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png
index a98d5a1d42..a98d5a1d42 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png
index 4b8458600a..4b8458600a 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png
index da241c07ae..da241c07ae 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png
index d1333671ff..d1333671ff 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png
index a98d5a1d42..a98d5a1d42 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png
index 4b8458600a..4b8458600a 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png
index da241c07ae..da241c07ae 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png
index d1333671ff..d1333671ff 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png
index 793e009d82..793e009d82 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png
index aca00c57c0..aca00c57c0 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png
index a49b95498c..a49b95498c 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png
index e0814f3be3..e0814f3be3 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored.9.png
index ac4c46d184..ac4c46d184 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png
index b1c335ee53..b1c335ee53 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png
index 3f0d9f2f25..3f0d9f2f25 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png
index cac6eca867..cac6eca867 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-pressed.9.png
index 87a1ae7a9a..87a1ae7a9a 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png
index 95c5ea063d..95c5ea063d 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png
index 3ed6cddfb8..3ed6cddfb8 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png
index 8f5e3f02bd..8f5e3f02bd 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable.9.png
index b3cc7bea02..b3cc7bea02 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable@2x.9.png
index 51313f5953..51313f5953 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable@3x.9.png
index 8db540f593..8db540f593 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable@4x.9.png
index 310400a2b5..310400a2b5 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-editable@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-editable@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-focused.9.png
index d88bd00d22..d88bd00d22 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-focused@2x.9.png
index 77dbb52a6a..77dbb52a6a 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-focused@3x.9.png
index 0739b1b173..0739b1b173 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-focused@4x.9.png
index d53ee543e3..d53ee543e3 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-hovered.9.png
index d88bd00d22..d88bd00d22 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-hovered@2x.9.png
index 77dbb52a6a..77dbb52a6a 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-hovered@3x.9.png
index 0739b1b173..0739b1b173 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-hovered@4x.9.png
index d53ee543e3..d53ee543e3 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png
index 53f6d7e59c..53f6d7e59c 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png
index 7c7bb214af..7c7bb214af 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png
index 5a69027cf3..5a69027cf3 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png
index fe2171a546..fe2171a546 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-focused.9.png
index cf31f93668..cf31f93668 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png
index 48b8861eac..48b8861eac 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png
index d6a417202b..d6a417202b 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png
index e0c7e374ad..e0c7e374ad 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png
index cf31f93668..cf31f93668 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png
index 48b8861eac..48b8861eac 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png
index d6a417202b..d6a417202b 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png
index e0c7e374ad..e0c7e374ad 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png
index 4548cddd91..4548cddd91 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png
index c5fb9d1b3d..c5fb9d1b3d 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png
index ffbe520a19..ffbe520a19 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png
index 784f9bee96..784f9bee96 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored.9.png
index f26794570d..f26794570d 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored@2x.9.png
index 7f07e625ad..7f07e625ad 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored@3x.9.png
index 0b060816ec..0b060816ec 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored@4x.9.png
index df76dfcec1..df76dfcec1 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-mirrored@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-mirrored@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-pressed.9.png
index cbba897fc4..cbba897fc4 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-pressed@2x.9.png
index a49e11fa4e..a49e11fa4e 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-pressed@3x.9.png
index 720e454326..720e454326 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up-pressed@4x.9.png
index 46333e3df8..46333e3df8 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up.9.png
index 67cbe4345b..67cbe4345b 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up@2x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up@2x.9.png
index 8e804b8735..8e804b8735 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up@2x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up@3x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up@3x.9.png
index 15baec74c8..15baec74c8 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up@3x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/spinbox-indicator-up@4x.9.png b/src/quickcontrols/imagine/images/spinbox-indicator-up@4x.9.png
index 7112de67e3..7112de67e3 100644
--- a/src/quickcontrols2/imagine/images/spinbox-indicator-up@4x.9.png
+++ b/src/quickcontrols/imagine/images/spinbox-indicator-up@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-disabled.png b/src/quickcontrols/imagine/images/splitview-handle-disabled.png
index 8ab854b0a3..8ab854b0a3 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-disabled.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-disabled.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-disabled@2x.png b/src/quickcontrols/imagine/images/splitview-handle-disabled@2x.png
index 325469b8d8..325469b8d8 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-disabled@3x.png b/src/quickcontrols/imagine/images/splitview-handle-disabled@3x.png
index 5357e84783..5357e84783 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-disabled@4x.png b/src/quickcontrols/imagine/images/splitview-handle-disabled@4x.png
index e215cf5b7a..e215cf5b7a 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-hovered.png b/src/quickcontrols/imagine/images/splitview-handle-hovered.png
index 429d55081f..429d55081f 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-hovered.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-hovered.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-hovered@2x.png b/src/quickcontrols/imagine/images/splitview-handle-hovered@2x.png
index 6f17b06ef3..6f17b06ef3 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-hovered@3x.png b/src/quickcontrols/imagine/images/splitview-handle-hovered@3x.png
index 11dcfa261c..11dcfa261c 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-hovered@4x.png b/src/quickcontrols/imagine/images/splitview-handle-hovered@4x.png
index 73963d754c..73963d754c 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-pressed.png b/src/quickcontrols/imagine/images/splitview-handle-pressed.png
index 6e00db20e6..6e00db20e6 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-pressed.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-pressed.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-pressed@2x.png b/src/quickcontrols/imagine/images/splitview-handle-pressed@2x.png
index e1392de62b..e1392de62b 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-pressed@3x.png b/src/quickcontrols/imagine/images/splitview-handle-pressed@3x.png
index ff6a397f69..ff6a397f69 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle-pressed@4x.png b/src/quickcontrols/imagine/images/splitview-handle-pressed@4x.png
index 278ba90007..278ba90007 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle.png b/src/quickcontrols/imagine/images/splitview-handle.png
index 2b69cef6a3..2b69cef6a3 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle.png
+++ b/src/quickcontrols/imagine/images/splitview-handle.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle@2x.png b/src/quickcontrols/imagine/images/splitview-handle@2x.png
index cc3205f125..cc3205f125 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle@2x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle@2x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle@3x.png b/src/quickcontrols/imagine/images/splitview-handle@3x.png
index b8be2b4d8f..b8be2b4d8f 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle@3x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle@3x.png
diff --git a/src/quickcontrols2/imagine/images/splitview-handle@4x.png b/src/quickcontrols/imagine/images/splitview-handle@4x.png
index 3145295446..3145295446 100644
--- a/src/quickcontrols2/imagine/images/splitview-handle@4x.png
+++ b/src/quickcontrols/imagine/images/splitview-handle@4x.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-disabled.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-disabled.9.png
index 23570729d6..23570729d6 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-focused.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-focused.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-focused@2x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-focused@3x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-focused@4x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-highlighted.9.png
index e79d8e1d01..e79d8e1d01 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-highlighted.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@2x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-highlighted@2x.9.png
index ea68d35fc4..ea68d35fc4 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@2x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-highlighted@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@3x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-highlighted@3x.9.png
index 6d61041599..6d61041599 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@3x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-highlighted@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@4x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-highlighted@4x.9.png
index 590cca96a1..590cca96a1 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-highlighted@4x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-highlighted@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-hovered.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-hovered.9.png
index b8749743d0..b8749743d0 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-hovered.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@2x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-hovered@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@3x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-hovered@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@4x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-hovered@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-pressed.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-pressed.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-pressed.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@2x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@3x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@4x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background.9.png b/src/quickcontrols/imagine/images/swipedelegate-background.9.png
index b8749743d0..b8749743d0 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background@2x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background@3x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/swipedelegate-background@4x.9.png b/src/quickcontrols/imagine/images/swipedelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickcontrols2/imagine/images/swipedelegate-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/swipedelegate-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle-disabled.png b/src/quickcontrols/imagine/images/switch-handle-disabled.png
index 595dd5465d..595dd5465d 100644
--- a/src/quickcontrols2/imagine/images/switch-handle-disabled.png
+++ b/src/quickcontrols/imagine/images/switch-handle-disabled.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle-disabled@2x.png b/src/quickcontrols/imagine/images/switch-handle-disabled@2x.png
index 5be736aafa..5be736aafa 100644
--- a/src/quickcontrols2/imagine/images/switch-handle-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/switch-handle-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle-disabled@3x.png b/src/quickcontrols/imagine/images/switch-handle-disabled@3x.png
index c8002ca3d9..c8002ca3d9 100644
--- a/src/quickcontrols2/imagine/images/switch-handle-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/switch-handle-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle-disabled@4x.png b/src/quickcontrols/imagine/images/switch-handle-disabled@4x.png
index 00e70c1ba5..00e70c1ba5 100644
--- a/src/quickcontrols2/imagine/images/switch-handle-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/switch-handle-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle-pressed.png b/src/quickcontrols/imagine/images/switch-handle-pressed.png
index 595dd5465d..595dd5465d 100644
--- a/src/quickcontrols2/imagine/images/switch-handle-pressed.png
+++ b/src/quickcontrols/imagine/images/switch-handle-pressed.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle-pressed@2x.png b/src/quickcontrols/imagine/images/switch-handle-pressed@2x.png
index 5be736aafa..5be736aafa 100644
--- a/src/quickcontrols2/imagine/images/switch-handle-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/switch-handle-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle-pressed@3x.png b/src/quickcontrols/imagine/images/switch-handle-pressed@3x.png
index c8002ca3d9..c8002ca3d9 100644
--- a/src/quickcontrols2/imagine/images/switch-handle-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/switch-handle-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle-pressed@4x.png b/src/quickcontrols/imagine/images/switch-handle-pressed@4x.png
index 00e70c1ba5..00e70c1ba5 100644
--- a/src/quickcontrols2/imagine/images/switch-handle-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/switch-handle-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle.png b/src/quickcontrols/imagine/images/switch-handle.png
index 15649c34c7..15649c34c7 100644
--- a/src/quickcontrols2/imagine/images/switch-handle.png
+++ b/src/quickcontrols/imagine/images/switch-handle.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle@2x.png b/src/quickcontrols/imagine/images/switch-handle@2x.png
index 04f84ed920..04f84ed920 100644
--- a/src/quickcontrols2/imagine/images/switch-handle@2x.png
+++ b/src/quickcontrols/imagine/images/switch-handle@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle@3x.png b/src/quickcontrols/imagine/images/switch-handle@3x.png
index e0cfb63718..e0cfb63718 100644
--- a/src/quickcontrols2/imagine/images/switch-handle@3x.png
+++ b/src/quickcontrols/imagine/images/switch-handle@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-handle@4x.png b/src/quickcontrols/imagine/images/switch-handle@4x.png
index 73fa381a4a..73fa381a4a 100644
--- a/src/quickcontrols2/imagine/images/switch-handle@4x.png
+++ b/src/quickcontrols/imagine/images/switch-handle@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-focused.png b/src/quickcontrols/imagine/images/switch-indicator-checked-focused.png
index 7f5ba5dfc4..7f5ba5dfc4 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-focused.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-focused.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@2x.png b/src/quickcontrols/imagine/images/switch-indicator-checked-focused@2x.png
index a0090df49f..a0090df49f 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@2x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@3x.png b/src/quickcontrols/imagine/images/switch-indicator-checked-focused@3x.png
index 0c7e526459..0c7e526459 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@3x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@4x.png b/src/quickcontrols/imagine/images/switch-indicator-checked-focused@4x.png
index 3a5e1d36ca..3a5e1d36ca 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-focused@4x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered.png b/src/quickcontrols/imagine/images/switch-indicator-checked-hovered.png
index 7f5ba5dfc4..7f5ba5dfc4 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-hovered.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@2x.png b/src/quickcontrols/imagine/images/switch-indicator-checked-hovered@2x.png
index a0090df49f..a0090df49f 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@3x.png b/src/quickcontrols/imagine/images/switch-indicator-checked-hovered@3x.png
index 0c7e526459..0c7e526459 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@4x.png b/src/quickcontrols/imagine/images/switch-indicator-checked-hovered@4x.png
index 3a5e1d36ca..3a5e1d36ca 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed.png b/src/quickcontrols/imagine/images/switch-indicator-checked-pressed.png
index ecbc552a17..ecbc552a17 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-pressed.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@2x.png b/src/quickcontrols/imagine/images/switch-indicator-checked-pressed@2x.png
index 07fe7241d8..07fe7241d8 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@3x.png b/src/quickcontrols/imagine/images/switch-indicator-checked-pressed@3x.png
index 8c65c27f4e..8c65c27f4e 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@4x.png b/src/quickcontrols/imagine/images/switch-indicator-checked-pressed@4x.png
index f6a1e47658..f6a1e47658 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked.png b/src/quickcontrols/imagine/images/switch-indicator-checked.png
index 2b7265cd0f..2b7265cd0f 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked@2x.png b/src/quickcontrols/imagine/images/switch-indicator-checked@2x.png
index 6ec88c7fc8..6ec88c7fc8 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked@2x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked@3x.png b/src/quickcontrols/imagine/images/switch-indicator-checked@3x.png
index 48c979856a..48c979856a 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked@3x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-checked@4x.png b/src/quickcontrols/imagine/images/switch-indicator-checked@4x.png
index e9f81807da..e9f81807da 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-checked@4x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-disabled.png b/src/quickcontrols/imagine/images/switch-indicator-disabled.png
index 9cfab79197..9cfab79197 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-disabled.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-disabled.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-disabled@2x.png b/src/quickcontrols/imagine/images/switch-indicator-disabled@2x.png
index 3bbbb8dfbc..3bbbb8dfbc 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-disabled@3x.png b/src/quickcontrols/imagine/images/switch-indicator-disabled@3x.png
index 80d9a74685..80d9a74685 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-disabled@4x.png b/src/quickcontrols/imagine/images/switch-indicator-disabled@4x.png
index 9ee7bfabbc..9ee7bfabbc 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-focused.png b/src/quickcontrols/imagine/images/switch-indicator-focused.png
index 4867bcac54..4867bcac54 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-focused.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-focused.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-focused@2x.png b/src/quickcontrols/imagine/images/switch-indicator-focused@2x.png
index d833a0cdb4..d833a0cdb4 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-focused@2x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-focused@3x.png b/src/quickcontrols/imagine/images/switch-indicator-focused@3x.png
index a632b6ae1c..a632b6ae1c 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-focused@3x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-focused@4x.png b/src/quickcontrols/imagine/images/switch-indicator-focused@4x.png
index b5affab772..b5affab772 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-focused@4x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-hovered.png b/src/quickcontrols/imagine/images/switch-indicator-hovered.png
index 4867bcac54..4867bcac54 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-hovered.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-hovered.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-hovered@2x.png b/src/quickcontrols/imagine/images/switch-indicator-hovered@2x.png
index d833a0cdb4..d833a0cdb4 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-hovered@3x.png b/src/quickcontrols/imagine/images/switch-indicator-hovered@3x.png
index a632b6ae1c..a632b6ae1c 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-hovered@4x.png b/src/quickcontrols/imagine/images/switch-indicator-hovered@4x.png
index b5affab772..b5affab772 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-pressed.png b/src/quickcontrols/imagine/images/switch-indicator-pressed.png
index 4fbbc060e8..4fbbc060e8 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-pressed.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-pressed.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-pressed@2x.png b/src/quickcontrols/imagine/images/switch-indicator-pressed@2x.png
index 7939f943e5..7939f943e5 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-pressed@3x.png b/src/quickcontrols/imagine/images/switch-indicator-pressed@3x.png
index adcbe45bb7..adcbe45bb7 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator-pressed@4x.png b/src/quickcontrols/imagine/images/switch-indicator-pressed@4x.png
index 74c0c77e6f..74c0c77e6f 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator.png b/src/quickcontrols/imagine/images/switch-indicator.png
index b6b4f1cd79..b6b4f1cd79 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator.png
+++ b/src/quickcontrols/imagine/images/switch-indicator.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator@2x.png b/src/quickcontrols/imagine/images/switch-indicator@2x.png
index bfeedeb720..bfeedeb720 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator@2x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator@2x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator@3x.png b/src/quickcontrols/imagine/images/switch-indicator@3x.png
index 19e5ba2ca7..19e5ba2ca7 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator@3x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator@3x.png
diff --git a/src/quickcontrols2/imagine/images/switch-indicator@4x.png b/src/quickcontrols/imagine/images/switch-indicator@4x.png
index 9345cd4fdb..9345cd4fdb 100644
--- a/src/quickcontrols2/imagine/images/switch-indicator@4x.png
+++ b/src/quickcontrols/imagine/images/switch-indicator@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-disabled.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-disabled.9.png
index 23570729d6..23570729d6 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-focused.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-focused.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-focused@2x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-focused@3x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-focused@4x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-hovered.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-hovered.9.png
index b8749743d0..b8749743d0 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-hovered.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@2x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-hovered@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@3x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-hovered@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@4x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-hovered@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-pressed.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-pressed.9.png
index 6ae574d55a..6ae574d55a 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-pressed.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@2x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@3x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@4x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background.9.png b/src/quickcontrols/imagine/images/switchdelegate-background.9.png
index b8749743d0..b8749743d0 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background@2x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background@3x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-background@4x.9.png b/src/quickcontrols/imagine/images/switchdelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled.png b/src/quickcontrols/imagine/images/switchdelegate-handle-disabled.png
index 595dd5465d..595dd5465d 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle-disabled.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@2x.png b/src/quickcontrols/imagine/images/switchdelegate-handle-disabled@2x.png
index 5be736aafa..5be736aafa 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@3x.png b/src/quickcontrols/imagine/images/switchdelegate-handle-disabled@3x.png
index c8002ca3d9..c8002ca3d9 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@4x.png b/src/quickcontrols/imagine/images/switchdelegate-handle-disabled@4x.png
index 00e70c1ba5..00e70c1ba5 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed.png b/src/quickcontrols/imagine/images/switchdelegate-handle-pressed.png
index 595dd5465d..595dd5465d 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle-pressed.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@2x.png b/src/quickcontrols/imagine/images/switchdelegate-handle-pressed@2x.png
index 5be736aafa..5be736aafa 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@3x.png b/src/quickcontrols/imagine/images/switchdelegate-handle-pressed@3x.png
index c8002ca3d9..c8002ca3d9 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@4x.png b/src/quickcontrols/imagine/images/switchdelegate-handle-pressed@4x.png
index 00e70c1ba5..00e70c1ba5 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle.png b/src/quickcontrols/imagine/images/switchdelegate-handle.png
index 15649c34c7..15649c34c7 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle@2x.png b/src/quickcontrols/imagine/images/switchdelegate-handle@2x.png
index 04f84ed920..04f84ed920 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle@3x.png b/src/quickcontrols/imagine/images/switchdelegate-handle@3x.png
index e0cfb63718..e0cfb63718 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-handle@4x.png b/src/quickcontrols/imagine/images/switchdelegate-handle@4x.png
index 73fa381a4a..73fa381a4a 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-handle@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-handle@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-focused.png
index 7f5ba5dfc4..7f5ba5dfc4 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-focused.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@2x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-focused@2x.png
index a0090df49f..a0090df49f 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@3x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-focused@3x.png
index 0c7e526459..0c7e526459 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@4x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-focused@4x.png
index 3a5e1d36ca..3a5e1d36ca 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-focused@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-hovered.png
index 7f5ba5dfc4..7f5ba5dfc4 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-hovered.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@2x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-hovered@2x.png
index a0090df49f..a0090df49f 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@3x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-hovered@3x.png
index 0c7e526459..0c7e526459 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@4x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-hovered@4x.png
index 3a5e1d36ca..3a5e1d36ca 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-pressed.png
index ecbc552a17..ecbc552a17 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-pressed.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@2x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-pressed@2x.png
index 07fe7241d8..07fe7241d8 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@3x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-pressed@3x.png
index 8c65c27f4e..8c65c27f4e 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@4x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-pressed@4x.png
index f6a1e47658..f6a1e47658 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked.png
index 2b7265cd0f..2b7265cd0f 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@2x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked@2x.png
index 6ec88c7fc8..6ec88c7fc8 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@3x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked@3x.png
index 48c979856a..48c979856a 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@4x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked@4x.png
index e9f81807da..e9f81807da 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-checked@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-checked@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-disabled.png
index 9cfab79197..9cfab79197 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-disabled.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@2x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-disabled@2x.png
index 3bbbb8dfbc..3bbbb8dfbc 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-disabled@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@3x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-disabled@3x.png
index 80d9a74685..80d9a74685 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-disabled@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@4x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-disabled@4x.png
index 9ee7bfabbc..9ee7bfabbc 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-disabled@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-disabled@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-focused.png
index 4867bcac54..4867bcac54 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-focused.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@2x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-focused@2x.png
index d833a0cdb4..d833a0cdb4 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-focused@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@3x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-focused@3x.png
index a632b6ae1c..a632b6ae1c 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-focused@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@4x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-focused@4x.png
index b5affab772..b5affab772 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-focused@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-focused@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-hovered.png
index 4867bcac54..4867bcac54 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-hovered.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@2x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-hovered@2x.png
index d833a0cdb4..d833a0cdb4 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-hovered@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@3x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-hovered@3x.png
index a632b6ae1c..a632b6ae1c 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-hovered@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@4x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-hovered@4x.png
index b5affab772..b5affab772 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-hovered@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-hovered@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-pressed.png
index 4fbbc060e8..4fbbc060e8 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-pressed.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@2x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-pressed@2x.png
index 7939f943e5..7939f943e5 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-pressed@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@3x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-pressed@3x.png
index adcbe45bb7..adcbe45bb7 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-pressed@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@4x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator-pressed@4x.png
index 74c0c77e6f..74c0c77e6f 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator-pressed@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator-pressed@4x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator.png b/src/quickcontrols/imagine/images/switchdelegate-indicator.png
index b6b4f1cd79..b6b4f1cd79 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator@2x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator@2x.png
index bfeedeb720..bfeedeb720 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator@2x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator@2x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator@3x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator@3x.png
index 19e5ba2ca7..19e5ba2ca7 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator@3x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator@3x.png
diff --git a/src/quickcontrols2/imagine/images/switchdelegate-indicator@4x.png b/src/quickcontrols/imagine/images/switchdelegate-indicator@4x.png
index 9345cd4fdb..9345cd4fdb 100644
--- a/src/quickcontrols2/imagine/images/switchdelegate-indicator@4x.png
+++ b/src/quickcontrols/imagine/images/switchdelegate-indicator@4x.png
diff --git a/src/quickcontrols2/imagine/images/tabbar-background.png b/src/quickcontrols/imagine/images/tabbar-background.png
index 002efdedde..002efdedde 100644
--- a/src/quickcontrols2/imagine/images/tabbar-background.png
+++ b/src/quickcontrols/imagine/images/tabbar-background.png
diff --git a/src/quickcontrols2/imagine/images/tabbar-background@2x.png b/src/quickcontrols/imagine/images/tabbar-background@2x.png
index aaa1cbaf4b..aaa1cbaf4b 100644
--- a/src/quickcontrols2/imagine/images/tabbar-background@2x.png
+++ b/src/quickcontrols/imagine/images/tabbar-background@2x.png
diff --git a/src/quickcontrols2/imagine/images/tabbar-background@3x.png b/src/quickcontrols/imagine/images/tabbar-background@3x.png
index c4eb9e1f02..c4eb9e1f02 100644
--- a/src/quickcontrols2/imagine/images/tabbar-background@3x.png
+++ b/src/quickcontrols/imagine/images/tabbar-background@3x.png
diff --git a/src/quickcontrols2/imagine/images/tabbar-background@4x.png b/src/quickcontrols/imagine/images/tabbar-background@4x.png
index 4a4e234a6a..4a4e234a6a 100644
--- a/src/quickcontrols2/imagine/images/tabbar-background@4x.png
+++ b/src/quickcontrols/imagine/images/tabbar-background@4x.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-checked.9.png b/src/quickcontrols/imagine/images/tabbutton-background-checked.9.png
index d2f0fa76a6..d2f0fa76a6 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-checked.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-checked.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-checked@2x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-checked@2x.9.png
index bee1329202..bee1329202 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-checked@2x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-checked@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-checked@3x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-checked@3x.9.png
index 70afb7d337..70afb7d337 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-checked@3x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-checked@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-checked@4x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-checked@4x.9.png
index 3a2015c464..3a2015c464 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-checked@4x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-checked@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked.9.png b/src/quickcontrols/imagine/images/tabbutton-background-disabled-checked.9.png
index a6d3011bd9..a6d3011bd9 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-disabled-checked.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@2x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-disabled-checked@2x.9.png
index 8ebfa02686..8ebfa02686 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@2x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-disabled-checked@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@3x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-disabled-checked@3x.9.png
index 1d5a1d5149..1d5a1d5149 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@3x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-disabled-checked@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@4x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-disabled-checked@4x.9.png
index f06dc55f9b..f06dc55f9b 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-disabled-checked@4x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-disabled-checked@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-disabled.9.png b/src/quickcontrols/imagine/images/tabbutton-background-disabled.9.png
index a6d3011bd9..a6d3011bd9 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-disabled@2x.9.png
index 8ebfa02686..8ebfa02686 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-disabled@3x.9.png
index 1d5a1d5149..1d5a1d5149 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-disabled@4x.9.png
index f06dc55f9b..f06dc55f9b 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-hovered.9.png b/src/quickcontrols/imagine/images/tabbutton-background-hovered.9.png
index 3f945184f8..3f945184f8 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-hovered.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-hovered@2x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-hovered@2x.9.png
index 8a19720a2a..8a19720a2a 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-hovered@3x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-hovered@3x.9.png
index eadcf45714..eadcf45714 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-hovered@4x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-hovered@4x.9.png
index 8bf8e992aa..8bf8e992aa 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-pressed.9.png b/src/quickcontrols/imagine/images/tabbutton-background-pressed.9.png
index d48733ed81..d48733ed81 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-pressed.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-pressed@2x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-pressed@2x.9.png
index fbbaad7bec..fbbaad7bec 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-pressed@3x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-pressed@3x.9.png
index 3a0ba70e63..3a0ba70e63 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background-pressed@4x.9.png b/src/quickcontrols/imagine/images/tabbutton-background-pressed@4x.9.png
index c04f124e5e..c04f124e5e 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background.9.png b/src/quickcontrols/imagine/images/tabbutton-background.9.png
index 2266c72223..2266c72223 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background@2x.9.png b/src/quickcontrols/imagine/images/tabbutton-background@2x.9.png
index b7adb7adc3..b7adb7adc3 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background@3x.9.png b/src/quickcontrols/imagine/images/tabbutton-background@3x.9.png
index d8f4eae55f..d8f4eae55f 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/tabbutton-background@4x.9.png b/src/quickcontrols/imagine/images/tabbutton-background@4x.9.png
index 066d35b38c..066d35b38c 100644
--- a/src/quickcontrols2/imagine/images/tabbutton-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/tabbutton-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background-disabled.9.png b/src/quickcontrols/imagine/images/textarea-background-disabled.9.png
index 97d48f8c00..97d48f8c00 100644
--- a/src/quickcontrols2/imagine/images/textarea-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/textarea-background-disabled@2x.9.png
index f9ea1d49dd..f9ea1d49dd 100644
--- a/src/quickcontrols2/imagine/images/textarea-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/textarea-background-disabled@3x.9.png
index 04e7ef6f07..04e7ef6f07 100644
--- a/src/quickcontrols2/imagine/images/textarea-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/textarea-background-disabled@4x.9.png
index feaaa3bcbc..feaaa3bcbc 100644
--- a/src/quickcontrols2/imagine/images/textarea-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background-focused.9.png b/src/quickcontrols/imagine/images/textarea-background-focused.9.png
index 1d73acfa0a..1d73acfa0a 100644
--- a/src/quickcontrols2/imagine/images/textarea-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background-focused@2x.9.png b/src/quickcontrols/imagine/images/textarea-background-focused@2x.9.png
index 5be4cd6f8c..5be4cd6f8c 100644
--- a/src/quickcontrols2/imagine/images/textarea-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background-focused@3x.9.png b/src/quickcontrols/imagine/images/textarea-background-focused@3x.9.png
index 6ba3e24610..6ba3e24610 100644
--- a/src/quickcontrols2/imagine/images/textarea-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background-focused@4x.9.png b/src/quickcontrols/imagine/images/textarea-background-focused@4x.9.png
index 366aa5112f..366aa5112f 100644
--- a/src/quickcontrols2/imagine/images/textarea-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background.9.png b/src/quickcontrols/imagine/images/textarea-background.9.png
index 0b9ca9f3ec..0b9ca9f3ec 100644
--- a/src/quickcontrols2/imagine/images/textarea-background.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background@2x.9.png b/src/quickcontrols/imagine/images/textarea-background@2x.9.png
index a806ed1b11..a806ed1b11 100644
--- a/src/quickcontrols2/imagine/images/textarea-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background@3x.9.png b/src/quickcontrols/imagine/images/textarea-background@3x.9.png
index 547ef33c41..547ef33c41 100644
--- a/src/quickcontrols2/imagine/images/textarea-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/textarea-background@4x.9.png b/src/quickcontrols/imagine/images/textarea-background@4x.9.png
index b759b1e80b..b759b1e80b 100644
--- a/src/quickcontrols2/imagine/images/textarea-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/textarea-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background-disabled.9.png b/src/quickcontrols/imagine/images/textfield-background-disabled.9.png
index 312a1294d1..312a1294d1 100644
--- a/src/quickcontrols2/imagine/images/textfield-background-disabled.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background-disabled.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background-disabled@2x.9.png b/src/quickcontrols/imagine/images/textfield-background-disabled@2x.9.png
index 2c6c7e9165..2c6c7e9165 100644
--- a/src/quickcontrols2/imagine/images/textfield-background-disabled@2x.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background-disabled@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background-disabled@3x.9.png b/src/quickcontrols/imagine/images/textfield-background-disabled@3x.9.png
index 1d1aca7177..1d1aca7177 100644
--- a/src/quickcontrols2/imagine/images/textfield-background-disabled@3x.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background-disabled@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background-disabled@4x.9.png b/src/quickcontrols/imagine/images/textfield-background-disabled@4x.9.png
index ed93182a70..ed93182a70 100644
--- a/src/quickcontrols2/imagine/images/textfield-background-disabled@4x.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background-disabled@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background-focused.9.png b/src/quickcontrols/imagine/images/textfield-background-focused.9.png
index 1251f4e4cc..1251f4e4cc 100644
--- a/src/quickcontrols2/imagine/images/textfield-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background-focused@2x.9.png b/src/quickcontrols/imagine/images/textfield-background-focused@2x.9.png
index d535e8bc98..d535e8bc98 100644
--- a/src/quickcontrols2/imagine/images/textfield-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background-focused@3x.9.png b/src/quickcontrols/imagine/images/textfield-background-focused@3x.9.png
index 9fca3bb239..9fca3bb239 100644
--- a/src/quickcontrols2/imagine/images/textfield-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background-focused@4x.9.png b/src/quickcontrols/imagine/images/textfield-background-focused@4x.9.png
index a275a52e89..a275a52e89 100644
--- a/src/quickcontrols2/imagine/images/textfield-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background.9.png b/src/quickcontrols/imagine/images/textfield-background.9.png
index 7ea6096880..7ea6096880 100644
--- a/src/quickcontrols2/imagine/images/textfield-background.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background@2x.9.png b/src/quickcontrols/imagine/images/textfield-background@2x.9.png
index 0a4c3f2a9f..0a4c3f2a9f 100644
--- a/src/quickcontrols2/imagine/images/textfield-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background@3x.9.png b/src/quickcontrols/imagine/images/textfield-background@3x.9.png
index e855274187..e855274187 100644
--- a/src/quickcontrols2/imagine/images/textfield-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/textfield-background@4x.9.png b/src/quickcontrols/imagine/images/textfield-background@4x.9.png
index 29ef5bb9d2..29ef5bb9d2 100644
--- a/src/quickcontrols2/imagine/images/textfield-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/textfield-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbar-background.png b/src/quickcontrols/imagine/images/toolbar-background.png
index 9c67cf2702..9c67cf2702 100644
--- a/src/quickcontrols2/imagine/images/toolbar-background.png
+++ b/src/quickcontrols/imagine/images/toolbar-background.png
diff --git a/src/quickcontrols2/imagine/images/toolbar-background@2x.png b/src/quickcontrols/imagine/images/toolbar-background@2x.png
index b0602519a7..b0602519a7 100644
--- a/src/quickcontrols2/imagine/images/toolbar-background@2x.png
+++ b/src/quickcontrols/imagine/images/toolbar-background@2x.png
diff --git a/src/quickcontrols2/imagine/images/toolbar-background@3x.png b/src/quickcontrols/imagine/images/toolbar-background@3x.png
index 7f227ca343..7f227ca343 100644
--- a/src/quickcontrols2/imagine/images/toolbar-background@3x.png
+++ b/src/quickcontrols/imagine/images/toolbar-background@3x.png
diff --git a/src/quickcontrols2/imagine/images/toolbar-background@4x.png b/src/quickcontrols/imagine/images/toolbar-background@4x.png
index 4788ecc743..4788ecc743 100644
--- a/src/quickcontrols2/imagine/images/toolbar-background@4x.png
+++ b/src/quickcontrols/imagine/images/toolbar-background@4x.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked-focused.9.png
index 287a2872de..287a2872de 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@2x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked-focused@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@3x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked-focused@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@4x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked-focused@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked-hovered.9.png
index 287a2872de..287a2872de 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@2x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked-hovered@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@3x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked-hovered@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@4x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked-hovered@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked.9.png
index 287a2872de..287a2872de 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked@2x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked@2x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked@3x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked@3x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-checked@4x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-checked@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-checked@4x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-checked@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked.9.png b/src/quickcontrols/imagine/images/toolbutton-background-disabled-checked.9.png
index 287a2872de..287a2872de 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-disabled-checked.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@2x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-disabled-checked@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@2x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-disabled-checked@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@3x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-disabled-checked@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@3x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-disabled-checked@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@4x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-disabled-checked@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-disabled-checked@4x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-disabled-checked@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-focused.9.png b/src/quickcontrols/imagine/images/toolbutton-background-focused.9.png
index 287a2872de..287a2872de 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-focused.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-focused.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-focused@2x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-focused@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-focused@2x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-focused@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-focused@3x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-focused@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-focused@3x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-focused@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-focused@4x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-focused@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-focused@4x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-focused@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-hovered.9.png b/src/quickcontrols/imagine/images/toolbutton-background-hovered.9.png
index 287a2872de..287a2872de 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-hovered.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-hovered.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-hovered@2x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-hovered@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-hovered@2x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-hovered@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-hovered@3x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-hovered@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-hovered@3x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-hovered@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-hovered@4x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-hovered@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-hovered@4x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-hovered@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-pressed.9.png b/src/quickcontrols/imagine/images/toolbutton-background-pressed.9.png
index 287a2872de..287a2872de 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-pressed.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-pressed.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-pressed@2x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-pressed@2x.9.png
index aa84416561..aa84416561 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-pressed@2x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-pressed@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-pressed@3x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-pressed@3x.9.png
index 8c6822555b..8c6822555b 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-pressed@3x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-pressed@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background-pressed@4x.9.png b/src/quickcontrols/imagine/images/toolbutton-background-pressed@4x.9.png
index 89bdd096f8..89bdd096f8 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background-pressed@4x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background-pressed@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background.9.png b/src/quickcontrols/imagine/images/toolbutton-background.9.png
index 5a72a62128..5a72a62128 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background@2x.9.png b/src/quickcontrols/imagine/images/toolbutton-background@2x.9.png
index 688a071a84..688a071a84 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background@3x.9.png b/src/quickcontrols/imagine/images/toolbutton-background@3x.9.png
index 64375a7e5b..64375a7e5b 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolbutton-background@4x.9.png b/src/quickcontrols/imagine/images/toolbutton-background@4x.9.png
index 96004a103c..96004a103c 100644
--- a/src/quickcontrols2/imagine/images/toolbutton-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/toolbutton-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal.9.png b/src/quickcontrols/imagine/images/toolseparator-separator-horizontal.9.png
index 75e3e66229..75e3e66229 100644
--- a/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal.9.png
+++ b/src/quickcontrols/imagine/images/toolseparator-separator-horizontal.9.png
diff --git a/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@2x.9.png b/src/quickcontrols/imagine/images/toolseparator-separator-horizontal@2x.9.png
index 3662dec944..3662dec944 100644
--- a/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@2x.9.png
+++ b/src/quickcontrols/imagine/images/toolseparator-separator-horizontal@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@3x.9.png b/src/quickcontrols/imagine/images/toolseparator-separator-horizontal@3x.9.png
index 2771470175..2771470175 100644
--- a/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@3x.9.png
+++ b/src/quickcontrols/imagine/images/toolseparator-separator-horizontal@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@4x.9.png b/src/quickcontrols/imagine/images/toolseparator-separator-horizontal@4x.9.png
index deeda9f5fd..deeda9f5fd 100644
--- a/src/quickcontrols2/imagine/images/toolseparator-separator-horizontal@4x.9.png
+++ b/src/quickcontrols/imagine/images/toolseparator-separator-horizontal@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolseparator-separator-vertical.9.png b/src/quickcontrols/imagine/images/toolseparator-separator-vertical.9.png
index 5b607aaf5c..5b607aaf5c 100644
--- a/src/quickcontrols2/imagine/images/toolseparator-separator-vertical.9.png
+++ b/src/quickcontrols/imagine/images/toolseparator-separator-vertical.9.png
diff --git a/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@2x.9.png b/src/quickcontrols/imagine/images/toolseparator-separator-vertical@2x.9.png
index f5a11e0467..f5a11e0467 100644
--- a/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@2x.9.png
+++ b/src/quickcontrols/imagine/images/toolseparator-separator-vertical@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@3x.9.png b/src/quickcontrols/imagine/images/toolseparator-separator-vertical@3x.9.png
index c957280f37..c957280f37 100644
--- a/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@3x.9.png
+++ b/src/quickcontrols/imagine/images/toolseparator-separator-vertical@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@4x.9.png b/src/quickcontrols/imagine/images/toolseparator-separator-vertical@4x.9.png
index c888689df7..c888689df7 100644
--- a/src/quickcontrols2/imagine/images/toolseparator-separator-vertical@4x.9.png
+++ b/src/quickcontrols/imagine/images/toolseparator-separator-vertical@4x.9.png
diff --git a/src/quickcontrols2/imagine/images/tooltip-background.9.png b/src/quickcontrols/imagine/images/tooltip-background.9.png
index 2e0dc67c3e..2e0dc67c3e 100644
--- a/src/quickcontrols2/imagine/images/tooltip-background.9.png
+++ b/src/quickcontrols/imagine/images/tooltip-background.9.png
diff --git a/src/quickcontrols2/imagine/images/tooltip-background@2x.9.png b/src/quickcontrols/imagine/images/tooltip-background@2x.9.png
index dd5609982f..dd5609982f 100644
--- a/src/quickcontrols2/imagine/images/tooltip-background@2x.9.png
+++ b/src/quickcontrols/imagine/images/tooltip-background@2x.9.png
diff --git a/src/quickcontrols2/imagine/images/tooltip-background@3x.9.png b/src/quickcontrols/imagine/images/tooltip-background@3x.9.png
index fed465427e..fed465427e 100644
--- a/src/quickcontrols2/imagine/images/tooltip-background@3x.9.png
+++ b/src/quickcontrols/imagine/images/tooltip-background@3x.9.png
diff --git a/src/quickcontrols2/imagine/images/tooltip-background@4x.9.png b/src/quickcontrols/imagine/images/tooltip-background@4x.9.png
index 9bc964908f..9bc964908f 100644
--- a/src/quickcontrols2/imagine/images/tooltip-background@4x.9.png
+++ b/src/quickcontrols/imagine/images/tooltip-background@4x.9.png
diff --git a/src/quickcontrols2/imagine/impl/CMakeLists.txt b/src/quickcontrols/imagine/impl/CMakeLists.txt
index 830176f13e..830176f13e 100644
--- a/src/quickcontrols2/imagine/impl/CMakeLists.txt
+++ b/src/quickcontrols/imagine/impl/CMakeLists.txt
diff --git a/src/quickcontrols2/imagine/impl/OpacityMask.qml b/src/quickcontrols/imagine/impl/OpacityMask.qml
index 6108901129..6108901129 100644
--- a/src/quickcontrols2/imagine/impl/OpacityMask.qml
+++ b/src/quickcontrols/imagine/impl/OpacityMask.qml
diff --git a/src/quickcontrols2/imagine/impl/shaders/+glslcore/OpacityMask.frag b/src/quickcontrols/imagine/impl/shaders/+glslcore/OpacityMask.frag
index 529e269614..529e269614 100644
--- a/src/quickcontrols2/imagine/impl/shaders/+glslcore/OpacityMask.frag
+++ b/src/quickcontrols/imagine/impl/shaders/+glslcore/OpacityMask.frag
diff --git a/src/quickcontrols2/imagine/impl/shaders/+qsb/OpacityMask.frag b/src/quickcontrols/imagine/impl/shaders/+qsb/OpacityMask.frag
index 331b30b807..331b30b807 100644
--- a/src/quickcontrols2/imagine/impl/shaders/+qsb/OpacityMask.frag
+++ b/src/quickcontrols/imagine/impl/shaders/+qsb/OpacityMask.frag
diff --git a/src/quickcontrols2/imagine/impl/shaders/OpacityMask.frag b/src/quickcontrols/imagine/impl/shaders/OpacityMask.frag
index 84f9bc3ee6..84f9bc3ee6 100644
--- a/src/quickcontrols2/imagine/impl/shaders/OpacityMask.frag
+++ b/src/quickcontrols/imagine/impl/shaders/OpacityMask.frag
diff --git a/src/quickcontrols2/imagine/impl/shaders/OpacityMask_rhi.frag b/src/quickcontrols/imagine/impl/shaders/OpacityMask_rhi.frag
index 9ae3249978..9ae3249978 100644
--- a/src/quickcontrols2/imagine/impl/shaders/OpacityMask_rhi.frag
+++ b/src/quickcontrols/imagine/impl/shaders/OpacityMask_rhi.frag
diff --git a/src/quickcontrols2/imagine/impl/shaders/compile.bat b/src/quickcontrols/imagine/impl/shaders/compile.bat
index 42b8cb45c0..42b8cb45c0 100644
--- a/src/quickcontrols2/imagine/impl/shaders/compile.bat
+++ b/src/quickcontrols/imagine/impl/shaders/compile.bat
diff --git a/src/quickcontrols2/imagine/qquickimaginestyle.cpp b/src/quickcontrols/imagine/qquickimaginestyle.cpp
index 377103e2f2..377103e2f2 100644
--- a/src/quickcontrols2/imagine/qquickimaginestyle.cpp
+++ b/src/quickcontrols/imagine/qquickimaginestyle.cpp
diff --git a/src/quickcontrols2/imagine/qquickimaginestyle_p.h b/src/quickcontrols/imagine/qquickimaginestyle_p.h
index 81f17fb58c..81f17fb58c 100644
--- a/src/quickcontrols2/imagine/qquickimaginestyle_p.h
+++ b/src/quickcontrols/imagine/qquickimaginestyle_p.h
diff --git a/src/quickcontrols2/imagine/qquickimaginetheme.cpp b/src/quickcontrols/imagine/qquickimaginetheme.cpp
index 921034962a..921034962a 100644
--- a/src/quickcontrols2/imagine/qquickimaginetheme.cpp
+++ b/src/quickcontrols/imagine/qquickimaginetheme.cpp
diff --git a/src/quickcontrols2/imagine/qquickimaginetheme_p.h b/src/quickcontrols/imagine/qquickimaginetheme_p.h
index 93b3063b78..93b3063b78 100644
--- a/src/quickcontrols2/imagine/qquickimaginetheme_p.h
+++ b/src/quickcontrols/imagine/qquickimaginetheme_p.h
diff --git a/src/quickcontrols2/imagine/qtquickcontrols2imaginestyleplugin.cpp b/src/quickcontrols/imagine/qtquickcontrols2imaginestyleplugin.cpp
index ddf3927562..ddf3927562 100644
--- a/src/quickcontrols2/imagine/qtquickcontrols2imaginestyleplugin.cpp
+++ b/src/quickcontrols/imagine/qtquickcontrols2imaginestyleplugin.cpp
diff --git a/src/quickcontrols2/ios/Button.qml b/src/quickcontrols/ios/Button.qml
index 6d8a6f8e09..6d8a6f8e09 100644
--- a/src/quickcontrols2/ios/Button.qml
+++ b/src/quickcontrols/ios/Button.qml
diff --git a/src/quickcontrols2/ios/CMakeLists.txt b/src/quickcontrols/ios/CMakeLists.txt
index 83faad5315..83faad5315 100644
--- a/src/quickcontrols2/ios/CMakeLists.txt
+++ b/src/quickcontrols/ios/CMakeLists.txt
diff --git a/src/quickcontrols2/ios/CheckBox.qml b/src/quickcontrols/ios/CheckBox.qml
index 2ef8f83114..2ef8f83114 100644
--- a/src/quickcontrols2/ios/CheckBox.qml
+++ b/src/quickcontrols/ios/CheckBox.qml
diff --git a/src/quickcontrols2/ios/CheckDelegate.qml b/src/quickcontrols/ios/CheckDelegate.qml
index fbd2a4ce35..fbd2a4ce35 100644
--- a/src/quickcontrols2/ios/CheckDelegate.qml
+++ b/src/quickcontrols/ios/CheckDelegate.qml
diff --git a/src/quickcontrols2/ios/Dial.qml b/src/quickcontrols/ios/Dial.qml
index 2a4c9666bc..2a4c9666bc 100644
--- a/src/quickcontrols2/ios/Dial.qml
+++ b/src/quickcontrols/ios/Dial.qml
diff --git a/src/quickcontrols2/ios/Drawer.qml b/src/quickcontrols/ios/Drawer.qml
index 52cdb8b372..52cdb8b372 100644
--- a/src/quickcontrols2/ios/Drawer.qml
+++ b/src/quickcontrols/ios/Drawer.qml
diff --git a/src/quickcontrols2/ios/Frame.qml b/src/quickcontrols/ios/Frame.qml
index 5c52269a3c..5c52269a3c 100644
--- a/src/quickcontrols2/ios/Frame.qml
+++ b/src/quickcontrols/ios/Frame.qml
diff --git a/src/quickcontrols2/ios/GroupBox.qml b/src/quickcontrols/ios/GroupBox.qml
index 3adc599ddf..3adc599ddf 100644
--- a/src/quickcontrols2/ios/GroupBox.qml
+++ b/src/quickcontrols/ios/GroupBox.qml
diff --git a/src/quickcontrols2/ios/ItemDelegate.qml b/src/quickcontrols/ios/ItemDelegate.qml
index 28146e51fd..28146e51fd 100644
--- a/src/quickcontrols2/ios/ItemDelegate.qml
+++ b/src/quickcontrols/ios/ItemDelegate.qml
diff --git a/src/quickcontrols2/ios/Menu.qml b/src/quickcontrols/ios/Menu.qml
index 437731c19e..437731c19e 100644
--- a/src/quickcontrols2/ios/Menu.qml
+++ b/src/quickcontrols/ios/Menu.qml
diff --git a/src/quickcontrols2/ios/MenuBar.qml b/src/quickcontrols/ios/MenuBar.qml
index 06f549e82a..06f549e82a 100644
--- a/src/quickcontrols2/ios/MenuBar.qml
+++ b/src/quickcontrols/ios/MenuBar.qml
diff --git a/src/quickcontrols2/ios/MenuBarItem.qml b/src/quickcontrols/ios/MenuBarItem.qml
index 5fe36693e4..5fe36693e4 100644
--- a/src/quickcontrols2/ios/MenuBarItem.qml
+++ b/src/quickcontrols/ios/MenuBarItem.qml
diff --git a/src/quickcontrols2/ios/MenuItem.qml b/src/quickcontrols/ios/MenuItem.qml
index 85137f5a21..85137f5a21 100644
--- a/src/quickcontrols2/ios/MenuItem.qml
+++ b/src/quickcontrols/ios/MenuItem.qml
diff --git a/src/quickcontrols2/ios/MenuSeparator.qml b/src/quickcontrols/ios/MenuSeparator.qml
index ba69005611..ba69005611 100644
--- a/src/quickcontrols2/ios/MenuSeparator.qml
+++ b/src/quickcontrols/ios/MenuSeparator.qml
diff --git a/src/quickcontrols2/ios/PageIndicator.qml b/src/quickcontrols/ios/PageIndicator.qml
index 036f952ea8..036f952ea8 100644
--- a/src/quickcontrols2/ios/PageIndicator.qml
+++ b/src/quickcontrols/ios/PageIndicator.qml
diff --git a/src/quickcontrols2/ios/Popup.qml b/src/quickcontrols/ios/Popup.qml
index 47a6157f71..47a6157f71 100644
--- a/src/quickcontrols2/ios/Popup.qml
+++ b/src/quickcontrols/ios/Popup.qml
diff --git a/src/quickcontrols2/ios/ProgressBar.qml b/src/quickcontrols/ios/ProgressBar.qml
index c280d5f94f..c280d5f94f 100644
--- a/src/quickcontrols2/ios/ProgressBar.qml
+++ b/src/quickcontrols/ios/ProgressBar.qml
diff --git a/src/quickcontrols2/ios/RadioButton.qml b/src/quickcontrols/ios/RadioButton.qml
index 37cf71e1f5..37cf71e1f5 100644
--- a/src/quickcontrols2/ios/RadioButton.qml
+++ b/src/quickcontrols/ios/RadioButton.qml
diff --git a/src/quickcontrols2/ios/RadioDelegate.qml b/src/quickcontrols/ios/RadioDelegate.qml
index 6de6dbb622..6de6dbb622 100644
--- a/src/quickcontrols2/ios/RadioDelegate.qml
+++ b/src/quickcontrols/ios/RadioDelegate.qml
diff --git a/src/quickcontrols2/ios/RangeSlider.qml b/src/quickcontrols/ios/RangeSlider.qml
index 966f612ba8..966f612ba8 100644
--- a/src/quickcontrols2/ios/RangeSlider.qml
+++ b/src/quickcontrols/ios/RangeSlider.qml
diff --git a/src/quickcontrols2/ios/ScrollBar.qml b/src/quickcontrols/ios/ScrollBar.qml
index 3bdabe4f08..3bdabe4f08 100644
--- a/src/quickcontrols2/ios/ScrollBar.qml
+++ b/src/quickcontrols/ios/ScrollBar.qml
diff --git a/src/quickcontrols2/ios/ScrollIndicator.qml b/src/quickcontrols/ios/ScrollIndicator.qml
index d6d842196a..d6d842196a 100644
--- a/src/quickcontrols2/ios/ScrollIndicator.qml
+++ b/src/quickcontrols/ios/ScrollIndicator.qml
diff --git a/src/quickcontrols2/ios/Slider.qml b/src/quickcontrols/ios/Slider.qml
index 1f6ca9f242..1f6ca9f242 100644
--- a/src/quickcontrols2/ios/Slider.qml
+++ b/src/quickcontrols/ios/Slider.qml
diff --git a/src/quickcontrols2/ios/SpinBox.qml b/src/quickcontrols/ios/SpinBox.qml
index ed4e4c1bc7..ed4e4c1bc7 100644
--- a/src/quickcontrols2/ios/SpinBox.qml
+++ b/src/quickcontrols/ios/SpinBox.qml
diff --git a/src/quickcontrols2/ios/SplitView.qml b/src/quickcontrols/ios/SplitView.qml
index ab912b86b2..ab912b86b2 100644
--- a/src/quickcontrols2/ios/SplitView.qml
+++ b/src/quickcontrols/ios/SplitView.qml
diff --git a/src/quickcontrols2/ios/StackView.qml b/src/quickcontrols/ios/StackView.qml
index c116ad5227..c116ad5227 100644
--- a/src/quickcontrols2/ios/StackView.qml
+++ b/src/quickcontrols/ios/StackView.qml
diff --git a/src/quickcontrols2/ios/SwipeDelegate.qml b/src/quickcontrols/ios/SwipeDelegate.qml
index ccabfc0cb4..ccabfc0cb4 100644
--- a/src/quickcontrols2/ios/SwipeDelegate.qml
+++ b/src/quickcontrols/ios/SwipeDelegate.qml
diff --git a/src/quickcontrols2/ios/Switch.qml b/src/quickcontrols/ios/Switch.qml
index 7a600afc5f..7a600afc5f 100644
--- a/src/quickcontrols2/ios/Switch.qml
+++ b/src/quickcontrols/ios/Switch.qml
diff --git a/src/quickcontrols2/ios/SwitchDelegate.qml b/src/quickcontrols/ios/SwitchDelegate.qml
index 4cba6dcabf..4cba6dcabf 100644
--- a/src/quickcontrols2/ios/SwitchDelegate.qml
+++ b/src/quickcontrols/ios/SwitchDelegate.qml
diff --git a/src/quickcontrols2/ios/TabBar.qml b/src/quickcontrols/ios/TabBar.qml
index 1d289c71af..1d289c71af 100644
--- a/src/quickcontrols2/ios/TabBar.qml
+++ b/src/quickcontrols/ios/TabBar.qml
diff --git a/src/quickcontrols2/ios/TabButton.qml b/src/quickcontrols/ios/TabButton.qml
index 0dc84e4f1d..0dc84e4f1d 100644
--- a/src/quickcontrols2/ios/TabButton.qml
+++ b/src/quickcontrols/ios/TabButton.qml
diff --git a/src/quickcontrols2/ios/TextArea.qml b/src/quickcontrols/ios/TextArea.qml
index 582af1bb64..582af1bb64 100644
--- a/src/quickcontrols2/ios/TextArea.qml
+++ b/src/quickcontrols/ios/TextArea.qml
diff --git a/src/quickcontrols2/ios/TextField.qml b/src/quickcontrols/ios/TextField.qml
index 4b5a1fb48e..4b5a1fb48e 100644
--- a/src/quickcontrols2/ios/TextField.qml
+++ b/src/quickcontrols/ios/TextField.qml
diff --git a/src/quickcontrols2/ios/ToolBar.qml b/src/quickcontrols/ios/ToolBar.qml
index 77b3d8ac0b..77b3d8ac0b 100644
--- a/src/quickcontrols2/ios/ToolBar.qml
+++ b/src/quickcontrols/ios/ToolBar.qml
diff --git a/src/quickcontrols2/ios/ToolButton.qml b/src/quickcontrols/ios/ToolButton.qml
index b18073dc81..b18073dc81 100644
--- a/src/quickcontrols2/ios/ToolButton.qml
+++ b/src/quickcontrols/ios/ToolButton.qml
diff --git a/src/quickcontrols2/ios/TreeViewDelegate.qml b/src/quickcontrols/ios/TreeViewDelegate.qml
index 4dcfcbf39d..4dcfcbf39d 100644
--- a/src/quickcontrols2/ios/TreeViewDelegate.qml
+++ b/src/quickcontrols/ios/TreeViewDelegate.qml
diff --git a/src/quickcontrols2/ios/images/arrow-indicator-dark.png b/src/quickcontrols/ios/images/arrow-indicator-dark.png
index 031ba049b7..031ba049b7 100644
--- a/src/quickcontrols2/ios/images/arrow-indicator-dark.png
+++ b/src/quickcontrols/ios/images/arrow-indicator-dark.png
diff --git a/src/quickcontrols2/ios/images/arrow-indicator-dark@2x.png b/src/quickcontrols/ios/images/arrow-indicator-dark@2x.png
index 9987384025..9987384025 100644
--- a/src/quickcontrols2/ios/images/arrow-indicator-dark@2x.png
+++ b/src/quickcontrols/ios/images/arrow-indicator-dark@2x.png
diff --git a/src/quickcontrols2/ios/images/arrow-indicator-dark@3x.png b/src/quickcontrols/ios/images/arrow-indicator-dark@3x.png
index d470ec6887..d470ec6887 100644
--- a/src/quickcontrols2/ios/images/arrow-indicator-dark@3x.png
+++ b/src/quickcontrols/ios/images/arrow-indicator-dark@3x.png
diff --git a/src/quickcontrols2/ios/images/arrow-indicator-light.png b/src/quickcontrols/ios/images/arrow-indicator-light.png
index 2d95d8d07a..2d95d8d07a 100644
--- a/src/quickcontrols2/ios/images/arrow-indicator-light.png
+++ b/src/quickcontrols/ios/images/arrow-indicator-light.png
diff --git a/src/quickcontrols2/ios/images/arrow-indicator-light@2x.png b/src/quickcontrols/ios/images/arrow-indicator-light@2x.png
index cbc4b9e54f..cbc4b9e54f 100644
--- a/src/quickcontrols2/ios/images/arrow-indicator-light@2x.png
+++ b/src/quickcontrols/ios/images/arrow-indicator-light@2x.png
diff --git a/src/quickcontrols2/ios/images/arrow-indicator-light@3x.png b/src/quickcontrols/ios/images/arrow-indicator-light@3x.png
index be7d45d153..be7d45d153 100644
--- a/src/quickcontrols2/ios/images/arrow-indicator-light@3x.png
+++ b/src/quickcontrols/ios/images/arrow-indicator-light@3x.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark.png b/src/quickcontrols/ios/images/checkbox-indicator-checked-dark.png
index 4e0749fded..4e0749fded 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-checked-dark.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark@2x.png b/src/quickcontrols/ios/images/checkbox-indicator-checked-dark@2x.png
index b58cdc18b5..b58cdc18b5 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark@2x.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-checked-dark@2x.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark@3x.png b/src/quickcontrols/ios/images/checkbox-indicator-checked-dark@3x.png
index 331dbcab14..331dbcab14 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark@3x.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-checked-dark@3x.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-light.png b/src/quickcontrols/ios/images/checkbox-indicator-checked-light.png
index a2e0cda8f5..a2e0cda8f5 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-checked-light.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-checked-light.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-light@2x.png b/src/quickcontrols/ios/images/checkbox-indicator-checked-light@2x.png
index d90b64b6b8..d90b64b6b8 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-checked-light@2x.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-checked-light@2x.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-light@3x.png b/src/quickcontrols/ios/images/checkbox-indicator-checked-light@3x.png
index d1b02f2004..d1b02f2004 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-checked-light@3x.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-checked-light@3x.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark.png b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-dark.png
index 39f8f71d06..39f8f71d06 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-dark.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark@2x.png b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-dark@2x.png
index 5ce5545ee0..5ce5545ee0 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark@2x.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-dark@2x.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark@3x.png b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-dark@3x.png
index 0c6da9715a..0c6da9715a 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark@3x.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-dark@3x.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light.png b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-light.png
index a6dc7d5d81..a6dc7d5d81 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-light.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light@2x.png b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-light@2x.png
index 1cc0559163..1cc0559163 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light@2x.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-light@2x.png
diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light@3x.png b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-light@3x.png
index 36f007efea..36f007efea 100644
--- a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light@3x.png
+++ b/src/quickcontrols/ios/images/checkbox-indicator-partially-checked-light@3x.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-dark.9.png b/src/quickcontrols/ios/images/drawer-background-dark.9.png
index 2e0526198e..2e0526198e 100644
--- a/src/quickcontrols2/ios/images/drawer-background-dark.9.png
+++ b/src/quickcontrols/ios/images/drawer-background-dark.9.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-dark.9@2x.png b/src/quickcontrols/ios/images/drawer-background-dark.9@2x.png
index 2a8b3b60e3..2a8b3b60e3 100644
--- a/src/quickcontrols2/ios/images/drawer-background-dark.9@2x.png
+++ b/src/quickcontrols/ios/images/drawer-background-dark.9@2x.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-dark.9@3x.png b/src/quickcontrols/ios/images/drawer-background-dark.9@3x.png
index 19805fbd19..19805fbd19 100644
--- a/src/quickcontrols2/ios/images/drawer-background-dark.9@3x.png
+++ b/src/quickcontrols/ios/images/drawer-background-dark.9@3x.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-light.9.png b/src/quickcontrols/ios/images/drawer-background-light.9.png
index 9c8a42bcc4..9c8a42bcc4 100644
--- a/src/quickcontrols2/ios/images/drawer-background-light.9.png
+++ b/src/quickcontrols/ios/images/drawer-background-light.9.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-light.9@2x.png b/src/quickcontrols/ios/images/drawer-background-light.9@2x.png
index 9975339c29..9975339c29 100644
--- a/src/quickcontrols2/ios/images/drawer-background-light.9@2x.png
+++ b/src/quickcontrols/ios/images/drawer-background-light.9@2x.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-light.9@3x.png b/src/quickcontrols/ios/images/drawer-background-light.9@3x.png
index 83d723b573..83d723b573 100644
--- a/src/quickcontrols2/ios/images/drawer-background-light.9@3x.png
+++ b/src/quickcontrols/ios/images/drawer-background-light.9@3x.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-modal-dark.9.png b/src/quickcontrols/ios/images/drawer-background-modal-dark.9.png
index 3ff175251b..3ff175251b 100644
--- a/src/quickcontrols2/ios/images/drawer-background-modal-dark.9.png
+++ b/src/quickcontrols/ios/images/drawer-background-modal-dark.9.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-modal-dark.9@2x.png b/src/quickcontrols/ios/images/drawer-background-modal-dark.9@2x.png
index 54770858f1..54770858f1 100644
--- a/src/quickcontrols2/ios/images/drawer-background-modal-dark.9@2x.png
+++ b/src/quickcontrols/ios/images/drawer-background-modal-dark.9@2x.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-modal-dark.9@3x.png b/src/quickcontrols/ios/images/drawer-background-modal-dark.9@3x.png
index f5747ebdfe..f5747ebdfe 100644
--- a/src/quickcontrols2/ios/images/drawer-background-modal-dark.9@3x.png
+++ b/src/quickcontrols/ios/images/drawer-background-modal-dark.9@3x.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-modal-light.9.png b/src/quickcontrols/ios/images/drawer-background-modal-light.9.png
index ea4e753269..ea4e753269 100644
--- a/src/quickcontrols2/ios/images/drawer-background-modal-light.9.png
+++ b/src/quickcontrols/ios/images/drawer-background-modal-light.9.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-modal-light.9@2x.png b/src/quickcontrols/ios/images/drawer-background-modal-light.9@2x.png
index 109fda953c..109fda953c 100644
--- a/src/quickcontrols2/ios/images/drawer-background-modal-light.9@2x.png
+++ b/src/quickcontrols/ios/images/drawer-background-modal-light.9@2x.png
diff --git a/src/quickcontrols2/ios/images/drawer-background-modal-light.9@3x.png b/src/quickcontrols/ios/images/drawer-background-modal-light.9@3x.png
index 02a52acf5f..02a52acf5f 100644
--- a/src/quickcontrols2/ios/images/drawer-background-modal-light.9@3x.png
+++ b/src/quickcontrols/ios/images/drawer-background-modal-light.9@3x.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-dark.9.png b/src/quickcontrols/ios/images/itemdelegate-background-dark.9.png
index 73f3ad8825..73f3ad8825 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-dark.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-dark.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-dark@2x.9.png b/src/quickcontrols/ios/images/itemdelegate-background-dark@2x.9.png
index 5a4f22b3f9..5a4f22b3f9 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-dark@3x.9.png b/src/quickcontrols/ios/images/itemdelegate-background-dark@3x.9.png
index 92f36a96d1..92f36a96d1 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-light.9.png b/src/quickcontrols/ios/images/itemdelegate-background-light.9.png
index 162821415e..162821415e 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-light.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-light.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-light@2x.9.png b/src/quickcontrols/ios/images/itemdelegate-background-light@2x.9.png
index b14617e04f..b14617e04f 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-light@2x.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-light@3x.9.png b/src/quickcontrols/ios/images/itemdelegate-background-light@3x.9.png
index 6f2df3a583..6f2df3a583 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-light@3x.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-dark.9.png b/src/quickcontrols/ios/images/itemdelegate-background-pressed-dark.9.png
index 4ca285bbbe..4ca285bbbe 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-dark.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-pressed-dark.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-dark@2x.9.png b/src/quickcontrols/ios/images/itemdelegate-background-pressed-dark@2x.9.png
index 6ddb779bca..6ddb779bca 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-pressed-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-dark@3x.9.png b/src/quickcontrols/ios/images/itemdelegate-background-pressed-dark@3x.9.png
index 6e9c02e288..6e9c02e288 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-pressed-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-light.9.png b/src/quickcontrols/ios/images/itemdelegate-background-pressed-light.9.png
index b9b2ea03bb..b9b2ea03bb 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-light.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-pressed-light.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-light@2x.9.png b/src/quickcontrols/ios/images/itemdelegate-background-pressed-light@2x.9.png
index 141272953d..141272953d 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-light@2x.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-pressed-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-light@3x.9.png b/src/quickcontrols/ios/images/itemdelegate-background-pressed-light@3x.9.png
index 7201fb9e62..7201fb9e62 100644
--- a/src/quickcontrols2/ios/images/itemdelegate-background-pressed-light@3x.9.png
+++ b/src/quickcontrols/ios/images/itemdelegate-background-pressed-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menu-background-dark.9.png b/src/quickcontrols/ios/images/menu-background-dark.9.png
index 863a3c1759..863a3c1759 100644
--- a/src/quickcontrols2/ios/images/menu-background-dark.9.png
+++ b/src/quickcontrols/ios/images/menu-background-dark.9.png
diff --git a/src/quickcontrols2/ios/images/menu-background-dark@2x.9.png b/src/quickcontrols/ios/images/menu-background-dark@2x.9.png
index ddddaa3532..ddddaa3532 100644
--- a/src/quickcontrols2/ios/images/menu-background-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/menu-background-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menu-background-dark@3x.9.png b/src/quickcontrols/ios/images/menu-background-dark@3x.9.png
index a640f6fe06..a640f6fe06 100644
--- a/src/quickcontrols2/ios/images/menu-background-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/menu-background-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menu-background-light.9.png b/src/quickcontrols/ios/images/menu-background-light.9.png
index 410abed278..410abed278 100644
--- a/src/quickcontrols2/ios/images/menu-background-light.9.png
+++ b/src/quickcontrols/ios/images/menu-background-light.9.png
diff --git a/src/quickcontrols2/ios/images/menu-background-light@2x.9.png b/src/quickcontrols/ios/images/menu-background-light@2x.9.png
index 82d99af518..82d99af518 100644
--- a/src/quickcontrols2/ios/images/menu-background-light@2x.9.png
+++ b/src/quickcontrols/ios/images/menu-background-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menu-background-light@3x.9.png b/src/quickcontrols/ios/images/menu-background-light@3x.9.png
index 48f3f7ed4e..48f3f7ed4e 100644
--- a/src/quickcontrols2/ios/images/menu-background-light@3x.9.png
+++ b/src/quickcontrols/ios/images/menu-background-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-dark.9.png b/src/quickcontrols/ios/images/menuitem-background-dark.9.png
index 463def221b..463def221b 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-dark.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-dark.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-dark@2x.9.png b/src/quickcontrols/ios/images/menuitem-background-dark@2x.9.png
index 53fdaa7c35..53fdaa7c35 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-dark@3x.9.png b/src/quickcontrols/ios/images/menuitem-background-dark@3x.9.png
index a514f80071..a514f80071 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-dark.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-dark.9.png
index 514c0901e6..514c0901e6 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-dark.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-dark.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-dark@2x.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-dark@2x.9.png
index 1ca1ee8d9e..1ca1ee8d9e 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-dark@3x.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-dark@3x.9.png
index 6a4277a7c3..6a4277a7c3 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-light.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-light.9.png
index 262c12d7b7..262c12d7b7 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-light.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-light.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-light@2x.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-light@2x.9.png
index 4838abb511..4838abb511 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-light@2x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-light@3x.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-light@3x.9.png
index 0e17b608da..0e17b608da 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-light@3x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-dark.9.png
index 290101b99b..290101b99b 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-dark.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark@2x.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-dark@2x.9.png
index a738f20650..a738f20650 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark@3x.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-dark@3x.9.png
index ef05342d0b..ef05342d0b 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-light.9.png
index 706f642552..706f642552 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-light.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light@2x.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-light@2x.9.png
index e196a71bbe..e196a71bbe 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light@2x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light@3x.9.png b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-light@3x.9.png
index 4f5a71ff86..4f5a71ff86 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-edge-pressed-light@3x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-edge-pressed-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-light.9.png b/src/quickcontrols/ios/images/menuitem-background-light.9.png
index 644f207a26..644f207a26 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-light.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-light.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-light@2x.9.png b/src/quickcontrols/ios/images/menuitem-background-light@2x.9.png
index d7c78cb5dc..d7c78cb5dc 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-light@2x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-light@3x.9.png b/src/quickcontrols/ios/images/menuitem-background-light@3x.9.png
index 70ce76a961..70ce76a961 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-light@3x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-dark.9.png b/src/quickcontrols/ios/images/menuitem-background-pressed-dark.9.png
index 4f1fdfc82c..4f1fdfc82c 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-pressed-dark.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-pressed-dark.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-dark@2x.9.png b/src/quickcontrols/ios/images/menuitem-background-pressed-dark@2x.9.png
index f72729f45d..f72729f45d 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-pressed-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-pressed-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-dark@3x.9.png b/src/quickcontrols/ios/images/menuitem-background-pressed-dark@3x.9.png
index eaa574174b..eaa574174b 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-pressed-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-pressed-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-light.9.png b/src/quickcontrols/ios/images/menuitem-background-pressed-light.9.png
index 5141095a95..5141095a95 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-pressed-light.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-pressed-light.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-light@2x.9.png b/src/quickcontrols/ios/images/menuitem-background-pressed-light@2x.9.png
index b8fb91997f..b8fb91997f 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-pressed-light@2x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-pressed-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-pressed-light@3x.9.png b/src/quickcontrols/ios/images/menuitem-background-pressed-light@3x.9.png
index 250247d322..250247d322 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-pressed-light@3x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-pressed-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark.9.png b/src/quickcontrols/ios/images/menuitem-background-single-pressed-dark.9.png
index 708285fe39..708285fe39 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-single-pressed-dark.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark@2x.9.png b/src/quickcontrols/ios/images/menuitem-background-single-pressed-dark@2x.9.png
index 0cb6f175ff..0cb6f175ff 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-single-pressed-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark@3x.9.png b/src/quickcontrols/ios/images/menuitem-background-single-pressed-dark@3x.9.png
index cb7c1f210c..cb7c1f210c 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-single-pressed-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light.9.png b/src/quickcontrols/ios/images/menuitem-background-single-pressed-light.9.png
index 5a71309c91..5a71309c91 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-single-pressed-light.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light@2x.9.png b/src/quickcontrols/ios/images/menuitem-background-single-pressed-light@2x.9.png
index 7798409aa3..7798409aa3 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light@2x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-single-pressed-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light@3x.9.png b/src/quickcontrols/ios/images/menuitem-background-single-pressed-light@3x.9.png
index 77a69bd247..77a69bd247 100644
--- a/src/quickcontrols2/ios/images/menuitem-background-single-pressed-light@3x.9.png
+++ b/src/quickcontrols/ios/images/menuitem-background-single-pressed-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-dark.9.png b/src/quickcontrols/ios/images/menuseparator-separator-dark.9.png
index 819e465354..819e465354 100644
--- a/src/quickcontrols2/ios/images/menuseparator-separator-dark.9.png
+++ b/src/quickcontrols/ios/images/menuseparator-separator-dark.9.png
diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-dark@2x.9.png b/src/quickcontrols/ios/images/menuseparator-separator-dark@2x.9.png
index 81e3cdd391..81e3cdd391 100644
--- a/src/quickcontrols2/ios/images/menuseparator-separator-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/menuseparator-separator-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-dark@3x.9.png b/src/quickcontrols/ios/images/menuseparator-separator-dark@3x.9.png
index 95d88ee659..95d88ee659 100644
--- a/src/quickcontrols2/ios/images/menuseparator-separator-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/menuseparator-separator-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-light.9.png b/src/quickcontrols/ios/images/menuseparator-separator-light.9.png
index 46276666e2..46276666e2 100644
--- a/src/quickcontrols2/ios/images/menuseparator-separator-light.9.png
+++ b/src/quickcontrols/ios/images/menuseparator-separator-light.9.png
diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-light@2x.9.png b/src/quickcontrols/ios/images/menuseparator-separator-light@2x.9.png
index 0e2b9986a9..0e2b9986a9 100644
--- a/src/quickcontrols2/ios/images/menuseparator-separator-light@2x.9.png
+++ b/src/quickcontrols/ios/images/menuseparator-separator-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/menuseparator-separator-light@3x.9.png b/src/quickcontrols/ios/images/menuseparator-separator-light@3x.9.png
index d3eb183bf3..d3eb183bf3 100644
--- a/src/quickcontrols2/ios/images/menuseparator-separator-light@3x.9.png
+++ b/src/quickcontrols/ios/images/menuseparator-separator-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-current-dark.png b/src/quickcontrols/ios/images/pageindicator-delegate-current-dark.png
index 8f51025a25..8f51025a25 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-current-dark.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-current-dark.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-current-dark@2x.png b/src/quickcontrols/ios/images/pageindicator-delegate-current-dark@2x.png
index 434b0e295c..434b0e295c 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-current-dark@2x.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-current-dark@2x.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-current-dark@3x.png b/src/quickcontrols/ios/images/pageindicator-delegate-current-dark@3x.png
index 3d89f00f1a..3d89f00f1a 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-current-dark@3x.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-current-dark@3x.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-current-light.png b/src/quickcontrols/ios/images/pageindicator-delegate-current-light.png
index ab9a27a6c5..ab9a27a6c5 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-current-light.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-current-light.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-current-light@2x.png b/src/quickcontrols/ios/images/pageindicator-delegate-current-light@2x.png
index 94b23004e9..94b23004e9 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-current-light@2x.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-current-light@2x.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-current-light@3x.png b/src/quickcontrols/ios/images/pageindicator-delegate-current-light@3x.png
index 24229b4cbf..24229b4cbf 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-current-light@3x.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-current-light@3x.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-dark.png b/src/quickcontrols/ios/images/pageindicator-delegate-dark.png
index 560c3be532..560c3be532 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-dark.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-dark.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-dark@2x.png b/src/quickcontrols/ios/images/pageindicator-delegate-dark@2x.png
index 5159b47d56..5159b47d56 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-dark@2x.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-dark@2x.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-dark@3x.png b/src/quickcontrols/ios/images/pageindicator-delegate-dark@3x.png
index 979badf935..979badf935 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-dark@3x.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-dark@3x.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-light.png b/src/quickcontrols/ios/images/pageindicator-delegate-light.png
index 65bd5ad63c..65bd5ad63c 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-light.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-light.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-light@2x.png b/src/quickcontrols/ios/images/pageindicator-delegate-light@2x.png
index 7bd65b8105..7bd65b8105 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-light@2x.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-light@2x.png
diff --git a/src/quickcontrols2/ios/images/pageindicator-delegate-light@3x.png b/src/quickcontrols/ios/images/pageindicator-delegate-light@3x.png
index a46d8668dc..a46d8668dc 100644
--- a/src/quickcontrols2/ios/images/pageindicator-delegate-light@3x.png
+++ b/src/quickcontrols/ios/images/pageindicator-delegate-light@3x.png
diff --git a/src/quickcontrols2/ios/images/popup-background-dark.9.png b/src/quickcontrols/ios/images/popup-background-dark.9.png
index 9afd3ab0ce..9afd3ab0ce 100644
--- a/src/quickcontrols2/ios/images/popup-background-dark.9.png
+++ b/src/quickcontrols/ios/images/popup-background-dark.9.png
diff --git a/src/quickcontrols2/ios/images/popup-background-dark@2x.9.png b/src/quickcontrols/ios/images/popup-background-dark@2x.9.png
index 115908f4e0..115908f4e0 100644
--- a/src/quickcontrols2/ios/images/popup-background-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/popup-background-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/popup-background-dark@3x.9.png b/src/quickcontrols/ios/images/popup-background-dark@3x.9.png
index 2377c6f5d7..2377c6f5d7 100644
--- a/src/quickcontrols2/ios/images/popup-background-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/popup-background-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/popup-background-light.9.png b/src/quickcontrols/ios/images/popup-background-light.9.png
index c06ec445cc..c06ec445cc 100644
--- a/src/quickcontrols2/ios/images/popup-background-light.9.png
+++ b/src/quickcontrols/ios/images/popup-background-light.9.png
diff --git a/src/quickcontrols2/ios/images/popup-background-light@2x.9.png b/src/quickcontrols/ios/images/popup-background-light@2x.9.png
index 0de7471cf0..0de7471cf0 100644
--- a/src/quickcontrols2/ios/images/popup-background-light@2x.9.png
+++ b/src/quickcontrols/ios/images/popup-background-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/popup-background-light@3x.9.png b/src/quickcontrols/ios/images/popup-background-light@3x.9.png
index 04fa3cc354..04fa3cc354 100644
--- a/src/quickcontrols2/ios/images/popup-background-light@3x.9.png
+++ b/src/quickcontrols/ios/images/popup-background-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark.png b/src/quickcontrols/ios/images/radiobutton-indicator-checked-dark.png
index f8ac628b14..f8ac628b14 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-checked-dark.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark@2x.png b/src/quickcontrols/ios/images/radiobutton-indicator-checked-dark@2x.png
index 6cdbb278a6..6cdbb278a6 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark@2x.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-checked-dark@2x.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark@3x.png b/src/quickcontrols/ios/images/radiobutton-indicator-checked-dark@3x.png
index 9375a40623..9375a40623 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark@3x.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-checked-dark@3x.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light.png b/src/quickcontrols/ios/images/radiobutton-indicator-checked-light.png
index b17f80c522..b17f80c522 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-checked-light.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light@2x.png b/src/quickcontrols/ios/images/radiobutton-indicator-checked-light@2x.png
index 7cbaa12bfb..7cbaa12bfb 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light@2x.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-checked-light@2x.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light@3x.png b/src/quickcontrols/ios/images/radiobutton-indicator-checked-light@3x.png
index e10579c6e8..e10579c6e8 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light@3x.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-checked-light@3x.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-dark.png b/src/quickcontrols/ios/images/radiobutton-indicator-dark.png
index bede4a1bce..bede4a1bce 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-dark.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-dark.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-dark@2x.png b/src/quickcontrols/ios/images/radiobutton-indicator-dark@2x.png
index 3eacdfd0b5..3eacdfd0b5 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-dark@2x.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-dark@2x.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-dark@3x.png b/src/quickcontrols/ios/images/radiobutton-indicator-dark@3x.png
index 0098efdc9d..0098efdc9d 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-dark@3x.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-dark@3x.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-light.png b/src/quickcontrols/ios/images/radiobutton-indicator-light.png
index 44b999c4f0..44b999c4f0 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-light.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-light.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-light@2x.png b/src/quickcontrols/ios/images/radiobutton-indicator-light@2x.png
index 1dda163af5..1dda163af5 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-light@2x.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-light@2x.png
diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-light@3x.png b/src/quickcontrols/ios/images/radiobutton-indicator-light@3x.png
index e303d37fd0..e303d37fd0 100644
--- a/src/quickcontrols2/ios/images/radiobutton-indicator-light@3x.png
+++ b/src/quickcontrols/ios/images/radiobutton-indicator-light@3x.png
diff --git a/src/quickcontrols2/ios/images/radiodelegate-indicator-dark.png b/src/quickcontrols/ios/images/radiodelegate-indicator-dark.png
index 8a658b26d6..8a658b26d6 100644
--- a/src/quickcontrols2/ios/images/radiodelegate-indicator-dark.png
+++ b/src/quickcontrols/ios/images/radiodelegate-indicator-dark.png
diff --git a/src/quickcontrols2/ios/images/radiodelegate-indicator-dark@2x.png b/src/quickcontrols/ios/images/radiodelegate-indicator-dark@2x.png
index 2477fa99a5..2477fa99a5 100644
--- a/src/quickcontrols2/ios/images/radiodelegate-indicator-dark@2x.png
+++ b/src/quickcontrols/ios/images/radiodelegate-indicator-dark@2x.png
diff --git a/src/quickcontrols2/ios/images/radiodelegate-indicator-dark@3x.png b/src/quickcontrols/ios/images/radiodelegate-indicator-dark@3x.png
index 4bf7b4c7cd..4bf7b4c7cd 100644
--- a/src/quickcontrols2/ios/images/radiodelegate-indicator-dark@3x.png
+++ b/src/quickcontrols/ios/images/radiodelegate-indicator-dark@3x.png
diff --git a/src/quickcontrols2/ios/images/radiodelegate-indicator-light.png b/src/quickcontrols/ios/images/radiodelegate-indicator-light.png
index f826b9e766..f826b9e766 100644
--- a/src/quickcontrols2/ios/images/radiodelegate-indicator-light.png
+++ b/src/quickcontrols/ios/images/radiodelegate-indicator-light.png
diff --git a/src/quickcontrols2/ios/images/radiodelegate-indicator-light@2x.png b/src/quickcontrols/ios/images/radiodelegate-indicator-light@2x.png
index 9b5d5dbed2..9b5d5dbed2 100644
--- a/src/quickcontrols2/ios/images/radiodelegate-indicator-light@2x.png
+++ b/src/quickcontrols/ios/images/radiodelegate-indicator-light@2x.png
diff --git a/src/quickcontrols2/ios/images/radiodelegate-indicator-light@3x.png b/src/quickcontrols/ios/images/radiodelegate-indicator-light@3x.png
index 0470240580..0470240580 100644
--- a/src/quickcontrols2/ios/images/radiodelegate-indicator-light@3x.png
+++ b/src/quickcontrols/ios/images/radiodelegate-indicator-light@3x.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-horizontal.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-dark-horizontal.9.png
index 8a77ce365c..8a77ce365c 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-horizontal.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-dark-horizontal.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-horizontal@2x.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-dark-horizontal@2x.9.png
index b7c68e90df..b7c68e90df 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-horizontal@2x.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-dark-horizontal@2x.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-horizontal@3x.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-dark-horizontal@3x.9.png
index 6c913d0edb..6c913d0edb 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-horizontal@3x.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-dark-horizontal@3x.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-vertical.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-dark-vertical.9.png
index 3172c935cc..3172c935cc 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-vertical.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-dark-vertical.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-vertical@2x.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-dark-vertical@2x.9.png
index e61822c035..e61822c035 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-vertical@2x.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-dark-vertical@2x.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-vertical@3x.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-dark-vertical@3x.9.png
index 4f2b6734ea..4f2b6734ea 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-dark-vertical@3x.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-dark-vertical@3x.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-light-horizontal.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-light-horizontal.9.png
index 8a77ce365c..8a77ce365c 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-light-horizontal.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-light-horizontal.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-light-horizontal@2x.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-light-horizontal@2x.9.png
index b7c68e90df..b7c68e90df 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-light-horizontal@2x.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-light-horizontal@2x.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-light-horizontal@3x.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-light-horizontal@3x.9.png
index 6c913d0edb..6c913d0edb 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-light-horizontal@3x.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-light-horizontal@3x.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-light-vertical.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-light-vertical.9.png
index 3172c935cc..3172c935cc 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-light-vertical.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-light-vertical.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-light-vertical@2x.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-light-vertical@2x.9.png
index e61822c035..e61822c035 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-light-vertical@2x.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-light-vertical@2x.9.png
diff --git a/src/quickcontrols2/ios/images/scrollindicator-handle-light-vertical@3x.9.png b/src/quickcontrols/ios/images/scrollindicator-handle-light-vertical@3x.9.png
index 4f2b6734ea..4f2b6734ea 100644
--- a/src/quickcontrols2/ios/images/scrollindicator-handle-light-vertical@3x.9.png
+++ b/src/quickcontrols/ios/images/scrollindicator-handle-light-vertical@3x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-background-dark.9.png b/src/quickcontrols/ios/images/slider-background-dark.9.png
index fd53274888..fd53274888 100644
--- a/src/quickcontrols2/ios/images/slider-background-dark.9.png
+++ b/src/quickcontrols/ios/images/slider-background-dark.9.png
diff --git a/src/quickcontrols2/ios/images/slider-background-dark@2x.9.png b/src/quickcontrols/ios/images/slider-background-dark@2x.9.png
index ff91196972..ff91196972 100644
--- a/src/quickcontrols2/ios/images/slider-background-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/slider-background-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-background-dark@3x.9.png b/src/quickcontrols/ios/images/slider-background-dark@3x.9.png
index 98b2e63cfb..98b2e63cfb 100644
--- a/src/quickcontrols2/ios/images/slider-background-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/slider-background-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-background-light.9.png b/src/quickcontrols/ios/images/slider-background-light.9.png
index 5970f421ea..5970f421ea 100644
--- a/src/quickcontrols2/ios/images/slider-background-light.9.png
+++ b/src/quickcontrols/ios/images/slider-background-light.9.png
diff --git a/src/quickcontrols2/ios/images/slider-background-light@2x.9.png b/src/quickcontrols/ios/images/slider-background-light@2x.9.png
index 5a03521004..5a03521004 100644
--- a/src/quickcontrols2/ios/images/slider-background-light@2x.9.png
+++ b/src/quickcontrols/ios/images/slider-background-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-background-light@3x.9.png b/src/quickcontrols/ios/images/slider-background-light@3x.9.png
index 39b2fe1968..39b2fe1968 100644
--- a/src/quickcontrols2/ios/images/slider-background-light@3x.9.png
+++ b/src/quickcontrols/ios/images/slider-background-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-handle-disabled-dark.9.png b/src/quickcontrols/ios/images/slider-handle-disabled-dark.9.png
index 5c2666a2b7..5c2666a2b7 100644
--- a/src/quickcontrols2/ios/images/slider-handle-disabled-dark.9.png
+++ b/src/quickcontrols/ios/images/slider-handle-disabled-dark.9.png
diff --git a/src/quickcontrols2/ios/images/slider-handle-disabled-dark@2x.9.png b/src/quickcontrols/ios/images/slider-handle-disabled-dark@2x.9.png
index a33d6625b4..a33d6625b4 100644
--- a/src/quickcontrols2/ios/images/slider-handle-disabled-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/slider-handle-disabled-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-handle-disabled-dark@3x.9.png b/src/quickcontrols/ios/images/slider-handle-disabled-dark@3x.9.png
index 47dcc3183e..47dcc3183e 100644
--- a/src/quickcontrols2/ios/images/slider-handle-disabled-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/slider-handle-disabled-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-handle-disabled-light.9.png b/src/quickcontrols/ios/images/slider-handle-disabled-light.9.png
index be3f21dcb1..be3f21dcb1 100644
--- a/src/quickcontrols2/ios/images/slider-handle-disabled-light.9.png
+++ b/src/quickcontrols/ios/images/slider-handle-disabled-light.9.png
diff --git a/src/quickcontrols2/ios/images/slider-handle-disabled-light@2x.9.png b/src/quickcontrols/ios/images/slider-handle-disabled-light@2x.9.png
index 9e73aec4fd..9e73aec4fd 100644
--- a/src/quickcontrols2/ios/images/slider-handle-disabled-light@2x.9.png
+++ b/src/quickcontrols/ios/images/slider-handle-disabled-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-handle-disabled-light@3x.9.png b/src/quickcontrols/ios/images/slider-handle-disabled-light@3x.9.png
index 35ad327fbe..35ad327fbe 100644
--- a/src/quickcontrols2/ios/images/slider-handle-disabled-light@3x.9.png
+++ b/src/quickcontrols/ios/images/slider-handle-disabled-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-handle.9.png b/src/quickcontrols/ios/images/slider-handle.9.png
index ed9894b60f..ed9894b60f 100644
--- a/src/quickcontrols2/ios/images/slider-handle.9.png
+++ b/src/quickcontrols/ios/images/slider-handle.9.png
diff --git a/src/quickcontrols2/ios/images/slider-handle@2x.9.png b/src/quickcontrols/ios/images/slider-handle@2x.9.png
index f76e4fe945..f76e4fe945 100644
--- a/src/quickcontrols2/ios/images/slider-handle@2x.9.png
+++ b/src/quickcontrols/ios/images/slider-handle@2x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-handle@3x.9.png b/src/quickcontrols/ios/images/slider-handle@3x.9.png
index a6a9fe33f9..a6a9fe33f9 100644
--- a/src/quickcontrols2/ios/images/slider-handle@3x.9.png
+++ b/src/quickcontrols/ios/images/slider-handle@3x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-progress-dark.9.png b/src/quickcontrols/ios/images/slider-progress-dark.9.png
index e41ced1a0e..e41ced1a0e 100644
--- a/src/quickcontrols2/ios/images/slider-progress-dark.9.png
+++ b/src/quickcontrols/ios/images/slider-progress-dark.9.png
diff --git a/src/quickcontrols2/ios/images/slider-progress-dark@2x.9.png b/src/quickcontrols/ios/images/slider-progress-dark@2x.9.png
index 3be5c17f0d..3be5c17f0d 100644
--- a/src/quickcontrols2/ios/images/slider-progress-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/slider-progress-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-progress-dark@3x.9.png b/src/quickcontrols/ios/images/slider-progress-dark@3x.9.png
index 58a21bce2e..58a21bce2e 100644
--- a/src/quickcontrols2/ios/images/slider-progress-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/slider-progress-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-progress-light.9.png b/src/quickcontrols/ios/images/slider-progress-light.9.png
index 764b273756..764b273756 100644
--- a/src/quickcontrols2/ios/images/slider-progress-light.9.png
+++ b/src/quickcontrols/ios/images/slider-progress-light.9.png
diff --git a/src/quickcontrols2/ios/images/slider-progress-light@2x.9.png b/src/quickcontrols/ios/images/slider-progress-light@2x.9.png
index 59fd8395e1..59fd8395e1 100644
--- a/src/quickcontrols2/ios/images/slider-progress-light@2x.9.png
+++ b/src/quickcontrols/ios/images/slider-progress-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/slider-progress-light@3x.9.png b/src/quickcontrols/ios/images/slider-progress-light@3x.9.png
index 0294770364..0294770364 100644
--- a/src/quickcontrols2/ios/images/slider-progress-light@3x.9.png
+++ b/src/quickcontrols/ios/images/slider-progress-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-background-dark.9.png b/src/quickcontrols/ios/images/spinbox-background-dark.9.png
index 429d5dda7f..429d5dda7f 100644
--- a/src/quickcontrols2/ios/images/spinbox-background-dark.9.png
+++ b/src/quickcontrols/ios/images/spinbox-background-dark.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-background-dark@2x.9.png b/src/quickcontrols/ios/images/spinbox-background-dark@2x.9.png
index acb8f3df35..acb8f3df35 100644
--- a/src/quickcontrols2/ios/images/spinbox-background-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-background-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-background-dark@3x.9.png b/src/quickcontrols/ios/images/spinbox-background-dark@3x.9.png
index ea798e64aa..ea798e64aa 100644
--- a/src/quickcontrols2/ios/images/spinbox-background-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-background-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-background-light.9.png b/src/quickcontrols/ios/images/spinbox-background-light.9.png
index a831906778..a831906778 100644
--- a/src/quickcontrols2/ios/images/spinbox-background-light.9.png
+++ b/src/quickcontrols/ios/images/spinbox-background-light.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-background-light@2x.9.png b/src/quickcontrols/ios/images/spinbox-background-light@2x.9.png
index 467cef5b94..467cef5b94 100644
--- a/src/quickcontrols2/ios/images/spinbox-background-light@2x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-background-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-background-light@3x.9.png b/src/quickcontrols/ios/images/spinbox-background-light@3x.9.png
index 5afa6c9232..5afa6c9232 100644
--- a/src/quickcontrols2/ios/images/spinbox-background-light@3x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-background-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-dark.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-dark.9.png
index 989eb661cb..989eb661cb 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-dark.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-dark.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-dark@2x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-dark@2x.9.png
index a22f19bf3d..a22f19bf3d 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-dark@3x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-dark@3x.9.png
index 1e0d12afbc..1e0d12afbc 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-light.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-light.9.png
index 10b614e8e5..10b614e8e5 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-light.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-light.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-light@2x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-light@2x.9.png
index 48fedbe21d..48fedbe21d 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-light@2x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-light@3x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-light@3x.9.png
index 1254e56ddf..1254e56ddf 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-light@3x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-dark.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-dark.9.png
index 1f279f6eef..1f279f6eef 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-dark.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-dark.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-dark@2x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-dark@2x.9.png
index dbbb584f10..dbbb584f10 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-dark@3x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-dark@3x.9.png
index 78ced50148..78ced50148 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-light.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-light.9.png
index 46f9ddbcf5..46f9ddbcf5 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-light.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-light.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-light@2x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-light@2x.9.png
index ad6573bbfa..ad6573bbfa 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-light@2x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-light@3x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-light@3x.9.png
index 0fec10338b..0fec10338b 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-down-pressed-light@3x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-down-pressed-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-dark.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-dark.9.png
index ca688ef523..ca688ef523 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-dark.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-dark.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-dark@2x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-dark@2x.9.png
index 970ea1e89e..970ea1e89e 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-dark@3x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-dark@3x.9.png
index 2ae2dddf45..2ae2dddf45 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-light.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-light.9.png
index ca8afb87ae..ca8afb87ae 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-light.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-light.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-light@2x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-light@2x.9.png
index 4c434039e7..4c434039e7 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-light@2x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-light@3x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-light@3x.9.png
index 3302d3f6d6..3302d3f6d6 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-light@3x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-dark.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-dark.9.png
index 15426b4ce6..15426b4ce6 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-dark.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-dark.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-dark@2x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-dark@2x.9.png
index 6295a5ed2c..6295a5ed2c 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-dark@3x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-dark@3x.9.png
index bdaa739803..bdaa739803 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-light.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-light.9.png
index 09b8ad162c..09b8ad162c 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-light.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-light.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-light@2x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-light@2x.9.png
index 2ec793c747..2ec793c747 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-light@2x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-light@3x.9.png b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-light@3x.9.png
index 95e19eb2af..95e19eb2af 100644
--- a/src/quickcontrols2/ios/images/spinbox-indicator-up-pressed-light@3x.9.png
+++ b/src/quickcontrols/ios/images/spinbox-indicator-up-pressed-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/switch-handle-disabled-dark.9.png b/src/quickcontrols/ios/images/switch-handle-disabled-dark.9.png
index 11f229c8ef..11f229c8ef 100644
--- a/src/quickcontrols2/ios/images/switch-handle-disabled-dark.9.png
+++ b/src/quickcontrols/ios/images/switch-handle-disabled-dark.9.png
diff --git a/src/quickcontrols2/ios/images/switch-handle-disabled-dark@2x.9.png b/src/quickcontrols/ios/images/switch-handle-disabled-dark@2x.9.png
index 7a030a4232..7a030a4232 100644
--- a/src/quickcontrols2/ios/images/switch-handle-disabled-dark@2x.9.png
+++ b/src/quickcontrols/ios/images/switch-handle-disabled-dark@2x.9.png
diff --git a/src/quickcontrols2/ios/images/switch-handle-disabled-dark@3x.9.png b/src/quickcontrols/ios/images/switch-handle-disabled-dark@3x.9.png
index 59b2b0a3e1..59b2b0a3e1 100644
--- a/src/quickcontrols2/ios/images/switch-handle-disabled-dark@3x.9.png
+++ b/src/quickcontrols/ios/images/switch-handle-disabled-dark@3x.9.png
diff --git a/src/quickcontrols2/ios/images/switch-handle-disabled-light.9.png b/src/quickcontrols/ios/images/switch-handle-disabled-light.9.png
index 12a3b4ef6a..12a3b4ef6a 100644
--- a/src/quickcontrols2/ios/images/switch-handle-disabled-light.9.png
+++ b/src/quickcontrols/ios/images/switch-handle-disabled-light.9.png
diff --git a/src/quickcontrols2/ios/images/switch-handle-disabled-light@2x.9.png b/src/quickcontrols/ios/images/switch-handle-disabled-light@2x.9.png
index dedcb7f4eb..dedcb7f4eb 100644
--- a/src/quickcontrols2/ios/images/switch-handle-disabled-light@2x.9.png
+++ b/src/quickcontrols/ios/images/switch-handle-disabled-light@2x.9.png
diff --git a/src/quickcontrols2/ios/images/switch-handle-disabled-light@3x.9.png b/src/quickcontrols/ios/images/switch-handle-disabled-light@3x.9.png
index 8daf9e7a96..8daf9e7a96 100644
--- a/src/quickcontrols2/ios/images/switch-handle-disabled-light@3x.9.png
+++ b/src/quickcontrols/ios/images/switch-handle-disabled-light@3x.9.png
diff --git a/src/quickcontrols2/ios/images/switch-handle.9.png b/src/quickcontrols/ios/images/switch-handle.9.png
index 8112808a81..8112808a81 100644
--- a/src/quickcontrols2/ios/images/switch-handle.9.png
+++ b/src/quickcontrols/ios/images/switch-handle.9.png
diff --git a/src/quickcontrols2/ios/images/switch-handle@2x.9.png b/src/quickcontrols/ios/images/switch-handle@2x.9.png
index 4767588b3b..4767588b3b 100644
--- a/src/quickcontrols2/ios/images/switch-handle@2x.9.png
+++ b/src/quickcontrols/ios/images/switch-handle@2x.9.png
diff --git a/src/quickcontrols2/ios/images/switch-handle@3x.9.png b/src/quickcontrols/ios/images/switch-handle@3x.9.png
index af4bcd06f8..af4bcd06f8 100644
--- a/src/quickcontrols2/ios/images/switch-handle@3x.9.png
+++ b/src/quickcontrols/ios/images/switch-handle@3x.9.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-checked-dark.png b/src/quickcontrols/ios/images/switch-indicator-checked-dark.png
index c72622096d..c72622096d 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-checked-dark.png
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-dark.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-checked-dark@2x.png b/src/quickcontrols/ios/images/switch-indicator-checked-dark@2x.png
index 0275dc140e..0275dc140e 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-checked-dark@2x.png
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-dark@2x.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-checked-dark@3x.png b/src/quickcontrols/ios/images/switch-indicator-checked-dark@3x.png
index 9b8684219e..9b8684219e 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-checked-dark@3x.png
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-dark@3x.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-checked-light.png b/src/quickcontrols/ios/images/switch-indicator-checked-light.png
index 5633ce2816..5633ce2816 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-checked-light.png
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-light.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-checked-light@2x.png b/src/quickcontrols/ios/images/switch-indicator-checked-light@2x.png
index 6859b04326..6859b04326 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-checked-light@2x.png
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-light@2x.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-checked-light@3x.png b/src/quickcontrols/ios/images/switch-indicator-checked-light@3x.png
index 3181f82f80..3181f82f80 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-checked-light@3x.png
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-light@3x.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-dark.png b/src/quickcontrols/ios/images/switch-indicator-dark.png
index 939cd4e780..939cd4e780 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-dark.png
+++ b/src/quickcontrols/ios/images/switch-indicator-dark.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-dark@2x.png b/src/quickcontrols/ios/images/switch-indicator-dark@2x.png
index 294e4e6621..294e4e6621 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-dark@2x.png
+++ b/src/quickcontrols/ios/images/switch-indicator-dark@2x.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-dark@3x.png b/src/quickcontrols/ios/images/switch-indicator-dark@3x.png
index 500c2891cb..500c2891cb 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-dark@3x.png
+++ b/src/quickcontrols/ios/images/switch-indicator-dark@3x.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-light.png b/src/quickcontrols/ios/images/switch-indicator-light.png
index 250cf0d99c..250cf0d99c 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-light.png
+++ b/src/quickcontrols/ios/images/switch-indicator-light.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-light@2x.png b/src/quickcontrols/ios/images/switch-indicator-light@2x.png
index 08886b2004..08886b2004 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-light@2x.png
+++ b/src/quickcontrols/ios/images/switch-indicator-light@2x.png
diff --git a/src/quickcontrols2/ios/images/switch-indicator-light@3x.png b/src/quickcontrols/ios/images/switch-indicator-light@3x.png
index ec2c8dfadc..ec2c8dfadc 100644
--- a/src/quickcontrols2/ios/images/switch-indicator-light@3x.png
+++ b/src/quickcontrols/ios/images/switch-indicator-light@3x.png
diff --git a/src/quickcontrols2/ios/impl/CMakeLists.txt b/src/quickcontrols/ios/impl/CMakeLists.txt
index e298335bb1..e298335bb1 100644
--- a/src/quickcontrols2/ios/impl/CMakeLists.txt
+++ b/src/quickcontrols/ios/impl/CMakeLists.txt
diff --git a/src/quickcontrols2/ios/impl/CursorDelegate.qml b/src/quickcontrols/ios/impl/CursorDelegate.qml
index 9b675afeb2..9b675afeb2 100644
--- a/src/quickcontrols2/ios/impl/CursorDelegate.qml
+++ b/src/quickcontrols/ios/impl/CursorDelegate.qml
diff --git a/src/quickcontrols2/ios/impl/qquickioscursorflashtimer.cpp b/src/quickcontrols/ios/impl/qquickioscursorflashtimer.cpp
index 8ae88b2a90..8ae88b2a90 100644
--- a/src/quickcontrols2/ios/impl/qquickioscursorflashtimer.cpp
+++ b/src/quickcontrols/ios/impl/qquickioscursorflashtimer.cpp
diff --git a/src/quickcontrols2/ios/impl/qquickioscursorflashtimer_p.h b/src/quickcontrols/ios/impl/qquickioscursorflashtimer_p.h
index 46e73ecb64..46e73ecb64 100644
--- a/src/quickcontrols2/ios/impl/qquickioscursorflashtimer_p.h
+++ b/src/quickcontrols/ios/impl/qquickioscursorflashtimer_p.h
diff --git a/src/quickcontrols2/ios/impl/qquickiosstyle.cpp b/src/quickcontrols/ios/impl/qquickiosstyle.cpp
index cfbbfd69f5..cfbbfd69f5 100644
--- a/src/quickcontrols2/ios/impl/qquickiosstyle.cpp
+++ b/src/quickcontrols/ios/impl/qquickiosstyle.cpp
diff --git a/src/quickcontrols2/ios/impl/qquickiosstyle_p.h b/src/quickcontrols/ios/impl/qquickiosstyle_p.h
index 03144751ad..03144751ad 100644
--- a/src/quickcontrols2/ios/impl/qquickiosstyle_p.h
+++ b/src/quickcontrols/ios/impl/qquickiosstyle_p.h
diff --git a/src/quickcontrols2/ios/qquickiostheme.mm b/src/quickcontrols/ios/qquickiostheme.mm
index 9c58e68d9d..9c58e68d9d 100644
--- a/src/quickcontrols2/ios/qquickiostheme.mm
+++ b/src/quickcontrols/ios/qquickiostheme.mm
diff --git a/src/quickcontrols2/ios/qquickiostheme_p.h b/src/quickcontrols/ios/qquickiostheme_p.h
index e85de7e439..e85de7e439 100644
--- a/src/quickcontrols2/ios/qquickiostheme_p.h
+++ b/src/quickcontrols/ios/qquickiostheme_p.h
diff --git a/src/quickcontrols2/ios/qtquickcontrols2iosstyleplugin.cpp b/src/quickcontrols/ios/qtquickcontrols2iosstyleplugin.cpp
index 87110a9936..87110a9936 100644
--- a/src/quickcontrols2/ios/qtquickcontrols2iosstyleplugin.cpp
+++ b/src/quickcontrols/ios/qtquickcontrols2iosstyleplugin.cpp
diff --git a/src/quickcontrols2/macos/Button.qml b/src/quickcontrols/macos/Button.qml
index 5fa56c2b13..5fa56c2b13 100644
--- a/src/quickcontrols2/macos/Button.qml
+++ b/src/quickcontrols/macos/Button.qml
diff --git a/src/quickcontrols2/macos/CMakeLists.txt b/src/quickcontrols/macos/CMakeLists.txt
index f0a3dcd3f4..f0a3dcd3f4 100644
--- a/src/quickcontrols2/macos/CMakeLists.txt
+++ b/src/quickcontrols/macos/CMakeLists.txt
diff --git a/src/quickcontrols2/macos/CheckBox.qml b/src/quickcontrols/macos/CheckBox.qml
index 09756cb594..09756cb594 100644
--- a/src/quickcontrols2/macos/CheckBox.qml
+++ b/src/quickcontrols/macos/CheckBox.qml
diff --git a/src/quickcontrols2/macos/ComboBox.qml b/src/quickcontrols/macos/ComboBox.qml
index 4ea2012382..4ea2012382 100644
--- a/src/quickcontrols2/macos/ComboBox.qml
+++ b/src/quickcontrols/macos/ComboBox.qml
diff --git a/src/quickcontrols2/macos/Dial.qml b/src/quickcontrols/macos/Dial.qml
index f0cbf9c691..f0cbf9c691 100644
--- a/src/quickcontrols2/macos/Dial.qml
+++ b/src/quickcontrols/macos/Dial.qml
diff --git a/src/quickcontrols2/macos/Dialog.qml b/src/quickcontrols/macos/Dialog.qml
index 69e9d9bf46..69e9d9bf46 100644
--- a/src/quickcontrols2/macos/Dialog.qml
+++ b/src/quickcontrols/macos/Dialog.qml
diff --git a/src/quickcontrols2/macos/DialogButtonBox.qml b/src/quickcontrols/macos/DialogButtonBox.qml
index b99de3354c..b99de3354c 100644
--- a/src/quickcontrols2/macos/DialogButtonBox.qml
+++ b/src/quickcontrols/macos/DialogButtonBox.qml
diff --git a/src/quickcontrols2/macos/Frame.qml b/src/quickcontrols/macos/Frame.qml
index bb37d8aa26..bb37d8aa26 100644
--- a/src/quickcontrols2/macos/Frame.qml
+++ b/src/quickcontrols/macos/Frame.qml
diff --git a/src/quickcontrols2/macos/GroupBox.qml b/src/quickcontrols/macos/GroupBox.qml
index 38c82891a1..38c82891a1 100644
--- a/src/quickcontrols2/macos/GroupBox.qml
+++ b/src/quickcontrols/macos/GroupBox.qml
diff --git a/src/quickcontrols2/macos/ProgressBar.qml b/src/quickcontrols/macos/ProgressBar.qml
index 66456e029e..66456e029e 100644
--- a/src/quickcontrols2/macos/ProgressBar.qml
+++ b/src/quickcontrols/macos/ProgressBar.qml
diff --git a/src/quickcontrols2/macos/RadioButton.qml b/src/quickcontrols/macos/RadioButton.qml
index 56d1e537a4..56d1e537a4 100644
--- a/src/quickcontrols2/macos/RadioButton.qml
+++ b/src/quickcontrols/macos/RadioButton.qml
diff --git a/src/quickcontrols2/macos/ScrollBar.qml b/src/quickcontrols/macos/ScrollBar.qml
index 15235ffc83..15235ffc83 100644
--- a/src/quickcontrols2/macos/ScrollBar.qml
+++ b/src/quickcontrols/macos/ScrollBar.qml
diff --git a/src/quickcontrols2/macos/ScrollView.qml b/src/quickcontrols/macos/ScrollView.qml
index 594406fa55..594406fa55 100644
--- a/src/quickcontrols2/macos/ScrollView.qml
+++ b/src/quickcontrols/macos/ScrollView.qml
diff --git a/src/quickcontrols2/macos/SelectionRectangle.qml b/src/quickcontrols/macos/SelectionRectangle.qml
index 8efadd8e31..8efadd8e31 100644
--- a/src/quickcontrols2/macos/SelectionRectangle.qml
+++ b/src/quickcontrols/macos/SelectionRectangle.qml
diff --git a/src/quickcontrols2/macos/Slider.qml b/src/quickcontrols/macos/Slider.qml
index 33db57b16c..33db57b16c 100644
--- a/src/quickcontrols2/macos/Slider.qml
+++ b/src/quickcontrols/macos/Slider.qml
diff --git a/src/quickcontrols2/macos/SpinBox.qml b/src/quickcontrols/macos/SpinBox.qml
index 9f10a08e55..9f10a08e55 100644
--- a/src/quickcontrols2/macos/SpinBox.qml
+++ b/src/quickcontrols/macos/SpinBox.qml
diff --git a/src/quickcontrols2/macos/TextArea.qml b/src/quickcontrols/macos/TextArea.qml
index 9dbd0863bd..9dbd0863bd 100644
--- a/src/quickcontrols2/macos/TextArea.qml
+++ b/src/quickcontrols/macos/TextArea.qml
diff --git a/src/quickcontrols2/macos/TextField.qml b/src/quickcontrols/macos/TextField.qml
index 2ef2c683da..2ef2c683da 100644
--- a/src/quickcontrols2/macos/TextField.qml
+++ b/src/quickcontrols/macos/TextField.qml
diff --git a/src/quickcontrols2/macos/TreeViewDelegate.qml b/src/quickcontrols/macos/TreeViewDelegate.qml
index 43930cc7a9..43930cc7a9 100644
--- a/src/quickcontrols2/macos/TreeViewDelegate.qml
+++ b/src/quickcontrols/macos/TreeViewDelegate.qml
diff --git a/src/quickcontrols2/macos/qtquickcontrols2macosstyleplugin.cpp b/src/quickcontrols/macos/qtquickcontrols2macosstyleplugin.cpp
index ec67ffa4dc..ec67ffa4dc 100644
--- a/src/quickcontrols2/macos/qtquickcontrols2macosstyleplugin.cpp
+++ b/src/quickcontrols/macos/qtquickcontrols2macosstyleplugin.cpp
diff --git a/src/quickcontrols2/material/ApplicationWindow.qml b/src/quickcontrols/material/ApplicationWindow.qml
index 9ba951956b..9ba951956b 100644
--- a/src/quickcontrols2/material/ApplicationWindow.qml
+++ b/src/quickcontrols/material/ApplicationWindow.qml
diff --git a/src/quickcontrols2/material/BusyIndicator.qml b/src/quickcontrols/material/BusyIndicator.qml
index 9de6535651..9de6535651 100644
--- a/src/quickcontrols2/material/BusyIndicator.qml
+++ b/src/quickcontrols/material/BusyIndicator.qml
diff --git a/src/quickcontrols2/material/Button.qml b/src/quickcontrols/material/Button.qml
index f2828b1eeb..f2828b1eeb 100644
--- a/src/quickcontrols2/material/Button.qml
+++ b/src/quickcontrols/material/Button.qml
diff --git a/src/quickcontrols2/material/CMakeLists.txt b/src/quickcontrols/material/CMakeLists.txt
index f328e775c3..f328e775c3 100644
--- a/src/quickcontrols2/material/CMakeLists.txt
+++ b/src/quickcontrols/material/CMakeLists.txt
diff --git a/src/quickcontrols2/material/CheckBox.qml b/src/quickcontrols/material/CheckBox.qml
index b74fb005fb..b74fb005fb 100644
--- a/src/quickcontrols2/material/CheckBox.qml
+++ b/src/quickcontrols/material/CheckBox.qml
diff --git a/src/quickcontrols2/material/CheckDelegate.qml b/src/quickcontrols/material/CheckDelegate.qml
index 0dead045a3..0dead045a3 100644
--- a/src/quickcontrols2/material/CheckDelegate.qml
+++ b/src/quickcontrols/material/CheckDelegate.qml
diff --git a/src/quickcontrols2/material/ComboBox.qml b/src/quickcontrols/material/ComboBox.qml
index 30222c4180..30222c4180 100644
--- a/src/quickcontrols2/material/ComboBox.qml
+++ b/src/quickcontrols/material/ComboBox.qml
diff --git a/src/quickcontrols2/material/DelayButton.qml b/src/quickcontrols/material/DelayButton.qml
index f050d57a39..f050d57a39 100644
--- a/src/quickcontrols2/material/DelayButton.qml
+++ b/src/quickcontrols/material/DelayButton.qml
diff --git a/src/quickcontrols2/material/Dial.qml b/src/quickcontrols/material/Dial.qml
index a44938fe20..a44938fe20 100644
--- a/src/quickcontrols2/material/Dial.qml
+++ b/src/quickcontrols/material/Dial.qml
diff --git a/src/quickcontrols2/material/Dialog.qml b/src/quickcontrols/material/Dialog.qml
index 72f11ffd22..72f11ffd22 100644
--- a/src/quickcontrols2/material/Dialog.qml
+++ b/src/quickcontrols/material/Dialog.qml
diff --git a/src/quickcontrols2/material/DialogButtonBox.qml b/src/quickcontrols/material/DialogButtonBox.qml
index dad1601931..dad1601931 100644
--- a/src/quickcontrols2/material/DialogButtonBox.qml
+++ b/src/quickcontrols/material/DialogButtonBox.qml
diff --git a/src/quickcontrols2/material/Drawer.qml b/src/quickcontrols/material/Drawer.qml
index ecfe8836b9..ecfe8836b9 100644
--- a/src/quickcontrols2/material/Drawer.qml
+++ b/src/quickcontrols/material/Drawer.qml
diff --git a/src/quickcontrols2/material/Frame.qml b/src/quickcontrols/material/Frame.qml
index 8b6674e16f..8b6674e16f 100644
--- a/src/quickcontrols2/material/Frame.qml
+++ b/src/quickcontrols/material/Frame.qml
diff --git a/src/quickcontrols2/material/GroupBox.qml b/src/quickcontrols/material/GroupBox.qml
index be7e6fbadc..be7e6fbadc 100644
--- a/src/quickcontrols2/material/GroupBox.qml
+++ b/src/quickcontrols/material/GroupBox.qml
diff --git a/src/quickcontrols2/material/HorizontalHeaderView.qml b/src/quickcontrols/material/HorizontalHeaderView.qml
index 671728c004..671728c004 100644
--- a/src/quickcontrols2/material/HorizontalHeaderView.qml
+++ b/src/quickcontrols/material/HorizontalHeaderView.qml
diff --git a/src/quickcontrols2/material/ItemDelegate.qml b/src/quickcontrols/material/ItemDelegate.qml
index f394106d3b..f394106d3b 100644
--- a/src/quickcontrols2/material/ItemDelegate.qml
+++ b/src/quickcontrols/material/ItemDelegate.qml
diff --git a/src/quickcontrols2/material/LICENSE_ANGULARJS.txt b/src/quickcontrols/material/LICENSE_ANGULARJS.txt
index c1f2a826bb..c1f2a826bb 100644
--- a/src/quickcontrols2/material/LICENSE_ANGULARJS.txt
+++ b/src/quickcontrols/material/LICENSE_ANGULARJS.txt
diff --git a/src/quickcontrols2/material/Label.qml b/src/quickcontrols/material/Label.qml
index ce4e01a058..ce4e01a058 100644
--- a/src/quickcontrols2/material/Label.qml
+++ b/src/quickcontrols/material/Label.qml
diff --git a/src/quickcontrols2/material/Menu.qml b/src/quickcontrols/material/Menu.qml
index 4601772196..4601772196 100644
--- a/src/quickcontrols2/material/Menu.qml
+++ b/src/quickcontrols/material/Menu.qml
diff --git a/src/quickcontrols2/material/MenuBar.qml b/src/quickcontrols/material/MenuBar.qml
index c31b5b3158..c31b5b3158 100644
--- a/src/quickcontrols2/material/MenuBar.qml
+++ b/src/quickcontrols/material/MenuBar.qml
diff --git a/src/quickcontrols2/material/MenuBarItem.qml b/src/quickcontrols/material/MenuBarItem.qml
index 1ef47659f4..1ef47659f4 100644
--- a/src/quickcontrols2/material/MenuBarItem.qml
+++ b/src/quickcontrols/material/MenuBarItem.qml
diff --git a/src/quickcontrols2/material/MenuItem.qml b/src/quickcontrols/material/MenuItem.qml
index 34e88a1e0b..34e88a1e0b 100644
--- a/src/quickcontrols2/material/MenuItem.qml
+++ b/src/quickcontrols/material/MenuItem.qml
diff --git a/src/quickcontrols2/material/MenuSeparator.qml b/src/quickcontrols/material/MenuSeparator.qml
index c0c9fb34ec..c0c9fb34ec 100644
--- a/src/quickcontrols2/material/MenuSeparator.qml
+++ b/src/quickcontrols/material/MenuSeparator.qml
diff --git a/src/quickcontrols2/material/Page.qml b/src/quickcontrols/material/Page.qml
index f8b97a2d3e..f8b97a2d3e 100644
--- a/src/quickcontrols2/material/Page.qml
+++ b/src/quickcontrols/material/Page.qml
diff --git a/src/quickcontrols2/material/PageIndicator.qml b/src/quickcontrols/material/PageIndicator.qml
index a64ab67b53..a64ab67b53 100644
--- a/src/quickcontrols2/material/PageIndicator.qml
+++ b/src/quickcontrols/material/PageIndicator.qml
diff --git a/src/quickcontrols2/material/Pane.qml b/src/quickcontrols/material/Pane.qml
index a6e0ae5b33..a6e0ae5b33 100644
--- a/src/quickcontrols2/material/Pane.qml
+++ b/src/quickcontrols/material/Pane.qml
diff --git a/src/quickcontrols2/material/Popup.qml b/src/quickcontrols/material/Popup.qml
index 7727ef0d3c..7727ef0d3c 100644
--- a/src/quickcontrols2/material/Popup.qml
+++ b/src/quickcontrols/material/Popup.qml
diff --git a/src/quickcontrols2/material/ProgressBar.qml b/src/quickcontrols/material/ProgressBar.qml
index 073088bdd2..073088bdd2 100644
--- a/src/quickcontrols2/material/ProgressBar.qml
+++ b/src/quickcontrols/material/ProgressBar.qml
diff --git a/src/quickcontrols2/material/RadioButton.qml b/src/quickcontrols/material/RadioButton.qml
index 00c9390095..00c9390095 100644
--- a/src/quickcontrols2/material/RadioButton.qml
+++ b/src/quickcontrols/material/RadioButton.qml
diff --git a/src/quickcontrols2/material/RadioDelegate.qml b/src/quickcontrols/material/RadioDelegate.qml
index ad9f95443f..ad9f95443f 100644
--- a/src/quickcontrols2/material/RadioDelegate.qml
+++ b/src/quickcontrols/material/RadioDelegate.qml
diff --git a/src/quickcontrols2/material/RangeSlider.qml b/src/quickcontrols/material/RangeSlider.qml
index 81507f334d..81507f334d 100644
--- a/src/quickcontrols2/material/RangeSlider.qml
+++ b/src/quickcontrols/material/RangeSlider.qml
diff --git a/src/quickcontrols2/material/RoundButton.qml b/src/quickcontrols/material/RoundButton.qml
index 3484fb9460..3484fb9460 100644
--- a/src/quickcontrols2/material/RoundButton.qml
+++ b/src/quickcontrols/material/RoundButton.qml
diff --git a/src/quickcontrols2/material/ScrollBar.qml b/src/quickcontrols/material/ScrollBar.qml
index b377f4042a..b377f4042a 100644
--- a/src/quickcontrols2/material/ScrollBar.qml
+++ b/src/quickcontrols/material/ScrollBar.qml
diff --git a/src/quickcontrols2/material/ScrollIndicator.qml b/src/quickcontrols/material/ScrollIndicator.qml
index 71f7eea104..71f7eea104 100644
--- a/src/quickcontrols2/material/ScrollIndicator.qml
+++ b/src/quickcontrols/material/ScrollIndicator.qml
diff --git a/src/quickcontrols2/material/ScrollView.qml b/src/quickcontrols/material/ScrollView.qml
index 60789313c9..60789313c9 100644
--- a/src/quickcontrols2/material/ScrollView.qml
+++ b/src/quickcontrols/material/ScrollView.qml
diff --git a/src/quickcontrols2/material/SelectionRectangle.qml b/src/quickcontrols/material/SelectionRectangle.qml
index 4e1b425f47..4e1b425f47 100644
--- a/src/quickcontrols2/material/SelectionRectangle.qml
+++ b/src/quickcontrols/material/SelectionRectangle.qml
diff --git a/src/quickcontrols2/material/Slider.qml b/src/quickcontrols/material/Slider.qml
index 5061ecf03f..5061ecf03f 100644
--- a/src/quickcontrols2/material/Slider.qml
+++ b/src/quickcontrols/material/Slider.qml
diff --git a/src/quickcontrols2/material/SpinBox.qml b/src/quickcontrols/material/SpinBox.qml
index 7529f8e9a0..7529f8e9a0 100644
--- a/src/quickcontrols2/material/SpinBox.qml
+++ b/src/quickcontrols/material/SpinBox.qml
diff --git a/src/quickcontrols2/material/SplitView.qml b/src/quickcontrols/material/SplitView.qml
index 0c53a0f557..0c53a0f557 100644
--- a/src/quickcontrols2/material/SplitView.qml
+++ b/src/quickcontrols/material/SplitView.qml
diff --git a/src/quickcontrols2/material/StackView.qml b/src/quickcontrols/material/StackView.qml
index 241b91f2d7..241b91f2d7 100644
--- a/src/quickcontrols2/material/StackView.qml
+++ b/src/quickcontrols/material/StackView.qml
diff --git a/src/quickcontrols2/material/SwipeDelegate.qml b/src/quickcontrols/material/SwipeDelegate.qml
index d445dafac1..d445dafac1 100644
--- a/src/quickcontrols2/material/SwipeDelegate.qml
+++ b/src/quickcontrols/material/SwipeDelegate.qml
diff --git a/src/quickcontrols2/material/SwipeView.qml b/src/quickcontrols/material/SwipeView.qml
index 72e63dd4d2..72e63dd4d2 100644
--- a/src/quickcontrols2/material/SwipeView.qml
+++ b/src/quickcontrols/material/SwipeView.qml
diff --git a/src/quickcontrols2/material/Switch.qml b/src/quickcontrols/material/Switch.qml
index db3fedfdc3..db3fedfdc3 100644
--- a/src/quickcontrols2/material/Switch.qml
+++ b/src/quickcontrols/material/Switch.qml
diff --git a/src/quickcontrols2/material/SwitchDelegate.qml b/src/quickcontrols/material/SwitchDelegate.qml
index 39423887f9..39423887f9 100644
--- a/src/quickcontrols2/material/SwitchDelegate.qml
+++ b/src/quickcontrols/material/SwitchDelegate.qml
diff --git a/src/quickcontrols2/material/TabBar.qml b/src/quickcontrols/material/TabBar.qml
index 5daffc9797..5daffc9797 100644
--- a/src/quickcontrols2/material/TabBar.qml
+++ b/src/quickcontrols/material/TabBar.qml
diff --git a/src/quickcontrols2/material/TabButton.qml b/src/quickcontrols/material/TabButton.qml
index a57f652d37..a57f652d37 100644
--- a/src/quickcontrols2/material/TabButton.qml
+++ b/src/quickcontrols/material/TabButton.qml
diff --git a/src/quickcontrols2/material/TextArea.qml b/src/quickcontrols/material/TextArea.qml
index 242cbf691b..242cbf691b 100644
--- a/src/quickcontrols2/material/TextArea.qml
+++ b/src/quickcontrols/material/TextArea.qml
diff --git a/src/quickcontrols2/material/TextField.qml b/src/quickcontrols/material/TextField.qml
index 598f66f938..598f66f938 100644
--- a/src/quickcontrols2/material/TextField.qml
+++ b/src/quickcontrols/material/TextField.qml
diff --git a/src/quickcontrols2/material/ToolBar.qml b/src/quickcontrols/material/ToolBar.qml
index 96fa3c6302..96fa3c6302 100644
--- a/src/quickcontrols2/material/ToolBar.qml
+++ b/src/quickcontrols/material/ToolBar.qml
diff --git a/src/quickcontrols2/material/ToolButton.qml b/src/quickcontrols/material/ToolButton.qml
index ac397edeea..ac397edeea 100644
--- a/src/quickcontrols2/material/ToolButton.qml
+++ b/src/quickcontrols/material/ToolButton.qml
diff --git a/src/quickcontrols2/material/ToolSeparator.qml b/src/quickcontrols/material/ToolSeparator.qml
index 456067ac0e..456067ac0e 100644
--- a/src/quickcontrols2/material/ToolSeparator.qml
+++ b/src/quickcontrols/material/ToolSeparator.qml
diff --git a/src/quickcontrols2/material/ToolTip.qml b/src/quickcontrols/material/ToolTip.qml
index b944c23557..b944c23557 100644
--- a/src/quickcontrols2/material/ToolTip.qml
+++ b/src/quickcontrols/material/ToolTip.qml
diff --git a/src/quickcontrols2/material/TreeViewDelegate.qml b/src/quickcontrols/material/TreeViewDelegate.qml
index a7be36a555..a7be36a555 100644
--- a/src/quickcontrols2/material/TreeViewDelegate.qml
+++ b/src/quickcontrols/material/TreeViewDelegate.qml
diff --git a/src/quickcontrols2/material/Tumbler.qml b/src/quickcontrols/material/Tumbler.qml
index 59320cf52b..59320cf52b 100644
--- a/src/quickcontrols2/material/Tumbler.qml
+++ b/src/quickcontrols/material/Tumbler.qml
diff --git a/src/quickcontrols2/material/VerticalHeaderView.qml b/src/quickcontrols/material/VerticalHeaderView.qml
index e497d4a84c..e497d4a84c 100644
--- a/src/quickcontrols2/material/VerticalHeaderView.qml
+++ b/src/quickcontrols/material/VerticalHeaderView.qml
diff --git a/src/quickcontrols2/material/images/arrow-indicator.png b/src/quickcontrols/material/images/arrow-indicator.png
index 5a9780015b..5a9780015b 100644
--- a/src/quickcontrols2/material/images/arrow-indicator.png
+++ b/src/quickcontrols/material/images/arrow-indicator.png
diff --git a/src/quickcontrols2/material/images/arrow-indicator.svg b/src/quickcontrols/material/images/arrow-indicator.svg
index 1e7217c855..1e7217c855 100644
--- a/src/quickcontrols2/material/images/arrow-indicator.svg
+++ b/src/quickcontrols/material/images/arrow-indicator.svg
diff --git a/src/quickcontrols2/material/images/arrow-indicator@2x.png b/src/quickcontrols/material/images/arrow-indicator@2x.png
index 37ce3a957e..37ce3a957e 100644
--- a/src/quickcontrols2/material/images/arrow-indicator@2x.png
+++ b/src/quickcontrols/material/images/arrow-indicator@2x.png
diff --git a/src/quickcontrols2/material/images/arrow-indicator@3x.png b/src/quickcontrols/material/images/arrow-indicator@3x.png
index 57abd97295..57abd97295 100644
--- a/src/quickcontrols2/material/images/arrow-indicator@3x.png
+++ b/src/quickcontrols/material/images/arrow-indicator@3x.png
diff --git a/src/quickcontrols2/material/images/arrow-indicator@4x.png b/src/quickcontrols/material/images/arrow-indicator@4x.png
index 26d3d7c1f1..26d3d7c1f1 100644
--- a/src/quickcontrols2/material/images/arrow-indicator@4x.png
+++ b/src/quickcontrols/material/images/arrow-indicator@4x.png
diff --git a/src/quickcontrols2/material/images/check.png b/src/quickcontrols/material/images/check.png
index 756a43a579..756a43a579 100644
--- a/src/quickcontrols2/material/images/check.png
+++ b/src/quickcontrols/material/images/check.png
diff --git a/src/quickcontrols2/material/images/check@2x.png b/src/quickcontrols/material/images/check@2x.png
index 9d1d6a32b6..9d1d6a32b6 100644
--- a/src/quickcontrols2/material/images/check@2x.png
+++ b/src/quickcontrols/material/images/check@2x.png
diff --git a/src/quickcontrols2/material/images/check@3x.png b/src/quickcontrols/material/images/check@3x.png
index 32ed72f017..32ed72f017 100644
--- a/src/quickcontrols2/material/images/check@3x.png
+++ b/src/quickcontrols/material/images/check@3x.png
diff --git a/src/quickcontrols2/material/images/check@4x.png b/src/quickcontrols/material/images/check@4x.png
index 1767cee617..1767cee617 100644
--- a/src/quickcontrols2/material/images/check@4x.png
+++ b/src/quickcontrols/material/images/check@4x.png
diff --git a/src/quickcontrols2/material/images/drop-indicator.png b/src/quickcontrols/material/images/drop-indicator.png
index 93560f507a..93560f507a 100644
--- a/src/quickcontrols2/material/images/drop-indicator.png
+++ b/src/quickcontrols/material/images/drop-indicator.png
diff --git a/src/quickcontrols2/material/images/drop-indicator.svg b/src/quickcontrols/material/images/drop-indicator.svg
index 94b5ca1514..94b5ca1514 100644
--- a/src/quickcontrols2/material/images/drop-indicator.svg
+++ b/src/quickcontrols/material/images/drop-indicator.svg
diff --git a/src/quickcontrols2/material/images/drop-indicator@2x.png b/src/quickcontrols/material/images/drop-indicator@2x.png
index d32f81604c..d32f81604c 100644
--- a/src/quickcontrols2/material/images/drop-indicator@2x.png
+++ b/src/quickcontrols/material/images/drop-indicator@2x.png
diff --git a/src/quickcontrols2/material/images/drop-indicator@3x.png b/src/quickcontrols/material/images/drop-indicator@3x.png
index 34c3e7d115..34c3e7d115 100644
--- a/src/quickcontrols2/material/images/drop-indicator@3x.png
+++ b/src/quickcontrols/material/images/drop-indicator@3x.png
diff --git a/src/quickcontrols2/material/images/drop-indicator@4x.png b/src/quickcontrols/material/images/drop-indicator@4x.png
index 0613f6dd0d..0613f6dd0d 100644
--- a/src/quickcontrols2/material/images/drop-indicator@4x.png
+++ b/src/quickcontrols/material/images/drop-indicator@4x.png
diff --git a/src/quickcontrols2/material/impl/BoxShadow.qml b/src/quickcontrols/material/impl/BoxShadow.qml
index f77412d554..f77412d554 100644
--- a/src/quickcontrols2/material/impl/BoxShadow.qml
+++ b/src/quickcontrols/material/impl/BoxShadow.qml
diff --git a/src/quickcontrols2/material/impl/CMakeLists.txt b/src/quickcontrols/material/impl/CMakeLists.txt
index 8b8e2311b4..8b8e2311b4 100644
--- a/src/quickcontrols2/material/impl/CMakeLists.txt
+++ b/src/quickcontrols/material/impl/CMakeLists.txt
diff --git a/src/quickcontrols2/material/impl/CheckIndicator.qml b/src/quickcontrols/material/impl/CheckIndicator.qml
index b09567c04b..b09567c04b 100644
--- a/src/quickcontrols2/material/impl/CheckIndicator.qml
+++ b/src/quickcontrols/material/impl/CheckIndicator.qml
diff --git a/src/quickcontrols2/material/impl/CursorDelegate.qml b/src/quickcontrols/material/impl/CursorDelegate.qml
index 811aa89e36..811aa89e36 100644
--- a/src/quickcontrols2/material/impl/CursorDelegate.qml
+++ b/src/quickcontrols/material/impl/CursorDelegate.qml
diff --git a/src/quickcontrols2/material/impl/ElevationEffect.qml b/src/quickcontrols/material/impl/ElevationEffect.qml
index 6690567617..6690567617 100644
--- a/src/quickcontrols2/material/impl/ElevationEffect.qml
+++ b/src/quickcontrols/material/impl/ElevationEffect.qml
diff --git a/src/quickcontrols2/material/impl/RadioIndicator.qml b/src/quickcontrols/material/impl/RadioIndicator.qml
index 9570065692..9570065692 100644
--- a/src/quickcontrols2/material/impl/RadioIndicator.qml
+++ b/src/quickcontrols/material/impl/RadioIndicator.qml
diff --git a/src/quickcontrols2/material/impl/RectangularGlow.qml b/src/quickcontrols/material/impl/RectangularGlow.qml
index b604049cf9..b604049cf9 100644
--- a/src/quickcontrols2/material/impl/RectangularGlow.qml
+++ b/src/quickcontrols/material/impl/RectangularGlow.qml
diff --git a/src/quickcontrols2/material/impl/SliderHandle.qml b/src/quickcontrols/material/impl/SliderHandle.qml
index ca7912b91d..ca7912b91d 100644
--- a/src/quickcontrols2/material/impl/SliderHandle.qml
+++ b/src/quickcontrols/material/impl/SliderHandle.qml
diff --git a/src/quickcontrols2/material/impl/SwitchIndicator.qml b/src/quickcontrols/material/impl/SwitchIndicator.qml
index e439bc31b7..e439bc31b7 100644
--- a/src/quickcontrols2/material/impl/SwitchIndicator.qml
+++ b/src/quickcontrols/material/impl/SwitchIndicator.qml
diff --git a/src/quickcontrols2/material/impl/qquickmaterialbusyindicator.cpp b/src/quickcontrols/material/impl/qquickmaterialbusyindicator.cpp
index 4d5b4e13e7..4d5b4e13e7 100644
--- a/src/quickcontrols2/material/impl/qquickmaterialbusyindicator.cpp
+++ b/src/quickcontrols/material/impl/qquickmaterialbusyindicator.cpp
diff --git a/src/quickcontrols2/material/impl/qquickmaterialbusyindicator_p.h b/src/quickcontrols/material/impl/qquickmaterialbusyindicator_p.h
index b6bbd925c7..b6bbd925c7 100644
--- a/src/quickcontrols2/material/impl/qquickmaterialbusyindicator_p.h
+++ b/src/quickcontrols/material/impl/qquickmaterialbusyindicator_p.h
diff --git a/src/quickcontrols2/material/impl/qquickmaterialprogressbar.cpp b/src/quickcontrols/material/impl/qquickmaterialprogressbar.cpp
index 67c9f614f5..67c9f614f5 100644
--- a/src/quickcontrols2/material/impl/qquickmaterialprogressbar.cpp
+++ b/src/quickcontrols/material/impl/qquickmaterialprogressbar.cpp
diff --git a/src/quickcontrols2/material/impl/qquickmaterialprogressbar_p.h b/src/quickcontrols/material/impl/qquickmaterialprogressbar_p.h
index d250c2f76d..d250c2f76d 100644
--- a/src/quickcontrols2/material/impl/qquickmaterialprogressbar_p.h
+++ b/src/quickcontrols/material/impl/qquickmaterialprogressbar_p.h
diff --git a/src/quickcontrols2/material/impl/qquickmaterialripple.cpp b/src/quickcontrols/material/impl/qquickmaterialripple.cpp
index 04e171f190..04e171f190 100644
--- a/src/quickcontrols2/material/impl/qquickmaterialripple.cpp
+++ b/src/quickcontrols/material/impl/qquickmaterialripple.cpp
diff --git a/src/quickcontrols2/material/impl/qquickmaterialripple_p.h b/src/quickcontrols/material/impl/qquickmaterialripple_p.h
index cdaaf13b1a..cdaaf13b1a 100644
--- a/src/quickcontrols2/material/impl/qquickmaterialripple_p.h
+++ b/src/quickcontrols/material/impl/qquickmaterialripple_p.h
diff --git a/src/quickcontrols2/material/qquickmaterialstyle.cpp b/src/quickcontrols/material/qquickmaterialstyle.cpp
index dbe7347acc..dbe7347acc 100644
--- a/src/quickcontrols2/material/qquickmaterialstyle.cpp
+++ b/src/quickcontrols/material/qquickmaterialstyle.cpp
diff --git a/src/quickcontrols2/material/qquickmaterialstyle_p.h b/src/quickcontrols/material/qquickmaterialstyle_p.h
index 99344a6192..99344a6192 100644
--- a/src/quickcontrols2/material/qquickmaterialstyle_p.h
+++ b/src/quickcontrols/material/qquickmaterialstyle_p.h
diff --git a/src/quickcontrols2/material/qquickmaterialtheme.cpp b/src/quickcontrols/material/qquickmaterialtheme.cpp
index 629c389be5..629c389be5 100644
--- a/src/quickcontrols2/material/qquickmaterialtheme.cpp
+++ b/src/quickcontrols/material/qquickmaterialtheme.cpp
diff --git a/src/quickcontrols2/material/qquickmaterialtheme_p.h b/src/quickcontrols/material/qquickmaterialtheme_p.h
index 893f441c86..893f441c86 100644
--- a/src/quickcontrols2/material/qquickmaterialtheme_p.h
+++ b/src/quickcontrols/material/qquickmaterialtheme_p.h
diff --git a/src/quickcontrols2/material/qt_attribution.json b/src/quickcontrols/material/qt_attribution.json
index 85fdadf9e0..85fdadf9e0 100644
--- a/src/quickcontrols2/material/qt_attribution.json
+++ b/src/quickcontrols/material/qt_attribution.json
diff --git a/src/quickcontrols2/material/qtquickcontrols2materialstyleplugin.cpp b/src/quickcontrols/material/qtquickcontrols2materialstyleplugin.cpp
index 10aa64b8cf..10aa64b8cf 100644
--- a/src/quickcontrols2/material/qtquickcontrols2materialstyleplugin.cpp
+++ b/src/quickcontrols/material/qtquickcontrols2materialstyleplugin.cpp
diff --git a/src/quickcontrols2/material/shaders/+glslcore/RectangularGlow.frag b/src/quickcontrols/material/shaders/+glslcore/RectangularGlow.frag
index 432d86b5d5..432d86b5d5 100644
--- a/src/quickcontrols2/material/shaders/+glslcore/RectangularGlow.frag
+++ b/src/quickcontrols/material/shaders/+glslcore/RectangularGlow.frag
diff --git a/src/quickcontrols2/material/shaders/+hlsl/RectangularGlow.frag b/src/quickcontrols/material/shaders/+hlsl/RectangularGlow.frag
index 69d9f852fb..69d9f852fb 100644
--- a/src/quickcontrols2/material/shaders/+hlsl/RectangularGlow.frag
+++ b/src/quickcontrols/material/shaders/+hlsl/RectangularGlow.frag
diff --git a/src/quickcontrols2/material/shaders/+qsb/RectangularGlow.frag b/src/quickcontrols/material/shaders/+qsb/RectangularGlow.frag
index 5cfa2db6ed..5cfa2db6ed 100644
--- a/src/quickcontrols2/material/shaders/+qsb/RectangularGlow.frag
+++ b/src/quickcontrols/material/shaders/+qsb/RectangularGlow.frag
diff --git a/src/quickcontrols2/material/shaders/RectangularGlow.frag b/src/quickcontrols/material/shaders/RectangularGlow.frag
index 40bab5806c..40bab5806c 100644
--- a/src/quickcontrols2/material/shaders/RectangularGlow.frag
+++ b/src/quickcontrols/material/shaders/RectangularGlow.frag
diff --git a/src/quickcontrols2/material/shaders/RectangularGlow_rhi.frag b/src/quickcontrols/material/shaders/RectangularGlow_rhi.frag
index 3e7d2dfe6f..3e7d2dfe6f 100644
--- a/src/quickcontrols2/material/shaders/RectangularGlow_rhi.frag
+++ b/src/quickcontrols/material/shaders/RectangularGlow_rhi.frag
diff --git a/src/quickcontrols2/material/shaders/compile.bat b/src/quickcontrols/material/shaders/compile.bat
index e0ccbb7ed5..e0ccbb7ed5 100644
--- a/src/quickcontrols2/material/shaders/compile.bat
+++ b/src/quickcontrols/material/shaders/compile.bat
diff --git a/src/quickcontrols/qquickattachedpropertypropagator.cpp b/src/quickcontrols/qquickattachedpropertypropagator.cpp
new file mode 100644
index 0000000000..ab6f47d4cd
--- /dev/null
+++ b/src/quickcontrols/qquickattachedpropertypropagator.cpp
@@ -0,0 +1,380 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#include "qquickattachedpropertypropagator.h"
+
+#include <QtCore/qpointer.h>
+#include <QtQuick/qquickwindow.h>
+#include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquickitemchangelistener_p.h>
+#include <QtQuickTemplates2/private/qquickpopup_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QQuickAttachedPropertyPropagator
+    \brief The QQuickAttachedPropertyPropagator class provides a way to
+    propagate attached properties.
+    \inmodule QtQuickControls2
+    \since 6.5
+
+    In QML, it is possible to
+    \l {Attached Properties and Attached Signal Handlers}{attach properties and
+    signal handlers} to objects. \l {Providing Attached Properties} goes into more
+    detail about how to expose your own C++ attached types.
+
+    QQuickAttachedPropertyPropagator provides an API to propagate attached
+    properties from a parent object to its children, similar to
+    \l {Control::}{font} and \l {Item::}{palette} propagation. It supports
+    propagation through \l {Item}{items}, \l {Popup}{popups}, and
+    \l {Window}{windows}.
+
+    If propagation of properties is not important, consider using a
+    \l {QML_SINGLETON}{C++} or
+    \l {Contents of a Module Definition qmldir File}{QML} singleton instead,
+    as it is better suited for that use case, and is more efficient in that
+    it only requires one QObject.
+
+    To use QQuickAttachedPropertyPropagator:
+    \list
+    \li Derive from it
+    \li Call \l initialize() in the constructor
+    \li Define set/inherit/propagate/reset functions for each property as needed
+    \li Reimplement \l attachedParentChange() to handle property inheritance
+    \endlist
+
+    For an example that demonstrates this in depth, see
+    \l {Qt Quick Controls - Attached Style Properties Example}.
+
+    \sa {Styling Qt Quick Controls}
+*/
+
+static QQuickAttachedPropertyPropagator *attachedObject(const QMetaObject *type, QObject *object, bool create = false)
+{
+    if (!object)
+        return nullptr;
+    auto func = qmlAttachedPropertiesFunction(object, type);
+    return qobject_cast<QQuickAttachedPropertyPropagator *>(qmlAttachedPropertiesObject(object, func, create));
+}
+
+/*!
+    \internal
+
+    Tries to find a QQuickAttachedPropertyPropagator whose type is \a ourAttachedType
+    and is attached to an ancestor of \a objectWeAreAttachedTo.
+
+    QQuickAttachedPropertyPropagator needs to know who its parent attached object is in
+    order to inherit attached property values from it. This is called when an
+    instance of QQuickAttachedPropertyPropagator is created, and whenever
+    \c {objectWeAreAttachedTo}'s parent changes, for example.
+*/
+static QQuickAttachedPropertyPropagator *findAttachedParent(const QMetaObject *ourAttachedType, QObject *objectWeAreAttachedTo)
+{
+    QQuickItem *item = qobject_cast<QQuickItem *>(objectWeAreAttachedTo);
+    if (item) {
+        // lookup parent items and popups
+        QQuickItem *parent = item->parentItem();
+        while (parent) {
+            QQuickAttachedPropertyPropagator *attached = attachedObject(ourAttachedType, parent);
+            if (attached)
+                return attached;
+
+            QQuickPopup *popup = qobject_cast<QQuickPopup *>(parent->parent());
+            if (popup)
+                return attachedObject(ourAttachedType, popup);
+
+            parent = parent->parentItem();
+        }
+
+        // fallback to item's window
+        QQuickAttachedPropertyPropagator *attached = attachedObject(ourAttachedType, item->window());
+        if (attached)
+            return attached;
+    } else {
+        // lookup popup's window
+        QQuickPopup *popup = qobject_cast<QQuickPopup *>(objectWeAreAttachedTo);
+        if (popup)
+            return attachedObject(ourAttachedType, popup->popupItem()->window());
+    }
+
+    // lookup parent window
+    QQuickWindow *window = qobject_cast<QQuickWindow *>(objectWeAreAttachedTo);
+    if (window) {
+        // It doesn't seem like a parent window can be anything but transient in Qt Quick.
+        QQuickWindow *parentWindow = qobject_cast<QQuickWindow *>(window->transientParent());
+        if (parentWindow) {
+            QQuickAttachedPropertyPropagator *attached = attachedObject(ourAttachedType, parentWindow);
+            if (attached)
+                return attached;
+        }
+    }
+
+    // fallback to engine (global)
+    if (objectWeAreAttachedTo) {
+        QQmlEngine *engine = qmlEngine(objectWeAreAttachedTo);
+        if (engine) {
+            QByteArray name = QByteArray("_q_") + ourAttachedType->className();
+            QQuickAttachedPropertyPropagator *attached = engine->property(name).value<QQuickAttachedPropertyPropagator *>();
+            if (!attached) {
+                attached = attachedObject(ourAttachedType, engine, true);
+                engine->setProperty(name, QVariant::fromValue(attached));
+            }
+            return attached;
+        }
+    }
+
+    return nullptr;
+}
+
+static QList<QQuickAttachedPropertyPropagator *> findAttachedChildren(const QMetaObject *type, QObject *object)
+{
+    QList<QQuickAttachedPropertyPropagator *> children;
+
+    QQuickItem *item = qobject_cast<QQuickItem *>(object);
+    if (!item) {
+        QQuickWindow *window = qobject_cast<QQuickWindow *>(object);
+        if (window)
+            item = window->contentItem();
+    }
+
+    if (!item)
+        return children;
+
+    // At this point, "item" could either be an item that the attached object is
+    // attached to directly, or the contentItem of a window that the attached object
+    // is attached to.
+
+    // Look for attached properties on items.
+    const auto childItems = item->childItems();
+    for (QQuickItem *child : childItems) {
+        QQuickAttachedPropertyPropagator *attached = attachedObject(type, child);
+        if (attached)
+            children += attached;
+        else
+            children += findAttachedChildren(type, child);
+    }
+
+    // Look for attached properties on windows. Windows declared in QML
+    // as children of a Window are QObject-parented to the contentItem (see
+    // QQuickWindowPrivate::data_append()). Windows declared as children
+    // of items are QObject-parented to those items.
+    const auto &windowChildren = item->children();
+    for (QObject *child : windowChildren) {
+        QQuickWindow *childWindow = qobject_cast<QQuickWindow *>(child);
+        if (childWindow) {
+            QQuickAttachedPropertyPropagator *attached = attachedObject(type, childWindow);
+            if (attached)
+                children += attached;
+        }
+    }
+
+    return children;
+}
+
+static QQuickItem *findAttachedItem(QObject *parent)
+{
+    QQuickItem *item = qobject_cast<QQuickItem *>(parent);
+    if (!item) {
+        QQuickPopup *popup = qobject_cast<QQuickPopup *>(parent);
+        if (popup)
+            item = popup->popupItem();
+    }
+    return item;
+}
+
+class QQuickAttachedPropertyPropagatorPrivate : public QObjectPrivate, public QQuickItemChangeListener
+{
+public:
+    Q_DECLARE_PUBLIC(QQuickAttachedPropertyPropagator)
+
+    static QQuickAttachedPropertyPropagatorPrivate *get(QQuickAttachedPropertyPropagator *attachedObject)
+    {
+        return attachedObject->d_func();
+    }
+
+    void attachTo(QObject *object);
+    void detachFrom(QObject *object);
+    void setAttachedParent(QQuickAttachedPropertyPropagator *parent);
+
+    void itemWindowChanged(QQuickWindow *window);
+    void itemParentChanged(QQuickItem *item, QQuickItem *parent) override;
+
+    QList<QQuickAttachedPropertyPropagator *> attachedChildren;
+    QPointer<QQuickAttachedPropertyPropagator> attachedParent;
+};
+
+void QQuickAttachedPropertyPropagatorPrivate::attachTo(QObject *object)
+{
+    QQuickItem *item = findAttachedItem(object);
+    if (item) {
+        connect(item, &QQuickItem::windowChanged, this, &QQuickAttachedPropertyPropagatorPrivate::itemWindowChanged);
+        QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Parent);
+    }
+}
+
+void QQuickAttachedPropertyPropagatorPrivate::detachFrom(QObject *object)
+{
+    QQuickItem *item = findAttachedItem(object);
+    if (item) {
+        disconnect(item, &QQuickItem::windowChanged, this, &QQuickAttachedPropertyPropagatorPrivate::itemWindowChanged);
+        QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Parent);
+    }
+}
+
+/*!
+    \internal
+
+    This function sets the attached parent of this attached object.
+
+    Currently it is called when:
+    \list
+    \li The target item's parent changes.
+    \li The target item's window changes.
+    \li The attached object is constructed, to set the attached parent
+        and the attached parent of the attached object children.
+    \li The attached object is destructed.
+    \endlist
+
+    \quotefromfile ../../examples/quickcontrols/attachedstyleproperties/MyStyle/mystyle.cpp
+    \skipto MyStyle::resetTheme
+    \printuntil }
+*/
+void QQuickAttachedPropertyPropagatorPrivate::setAttachedParent(QQuickAttachedPropertyPropagator *parent)
+{
+    Q_Q(QQuickAttachedPropertyPropagator);
+    if (attachedParent == parent)
+        return;
+
+    QQuickAttachedPropertyPropagator *oldParent = attachedParent;
+    if (attachedParent)
+        QQuickAttachedPropertyPropagatorPrivate::get(attachedParent)->attachedChildren.removeOne(q);
+    attachedParent = parent;
+    if (parent)
+        QQuickAttachedPropertyPropagatorPrivate::get(parent)->attachedChildren.append(q);
+    q->attachedParentChange(parent, oldParent);
+}
+
+void QQuickAttachedPropertyPropagatorPrivate::itemWindowChanged(QQuickWindow *window)
+{
+    Q_Q(QQuickAttachedPropertyPropagator);
+    QQuickAttachedPropertyPropagator *attachedParent = nullptr;
+    QQuickItem *item = qobject_cast<QQuickItem *>(q->sender());
+    if (item)
+        attachedParent = findAttachedParent(q->metaObject(), item);
+    if (!attachedParent)
+        attachedParent = attachedObject(q->metaObject(), window);
+    setAttachedParent(attachedParent);
+}
+
+void QQuickAttachedPropertyPropagatorPrivate::itemParentChanged(QQuickItem *item, QQuickItem *parent)
+{
+    Q_Q(QQuickAttachedPropertyPropagator);
+    Q_UNUSED(parent);
+    setAttachedParent(findAttachedParent(q->metaObject(), item));
+}
+
+/*!
+    Constructs a QQuickAttachedPropertyPropagator with the given \a parent.
+
+    The \c parent will be used to find this object's
+    \l {attachedParent()}{attached parent}.
+
+    Derived classes should call \l initialize() in their constructor.
+*/
+QQuickAttachedPropertyPropagator::QQuickAttachedPropertyPropagator(QObject *parent)
+    : QObject(*(new QQuickAttachedPropertyPropagatorPrivate), parent)
+{
+    Q_D(QQuickAttachedPropertyPropagator);
+    d->attachTo(parent);
+}
+
+/*!
+    Destroys the QQuickAttachedPropertyPropagator.
+*/
+QQuickAttachedPropertyPropagator::~QQuickAttachedPropertyPropagator()
+{
+    Q_D(QQuickAttachedPropertyPropagator);
+    d->detachFrom(parent());
+    d->setAttachedParent(nullptr);
+}
+
+/*!
+    This function returns the attached children of this attached object.
+
+    The attached children are used when propagating property values:
+
+    \quotefromfile ../../examples/quickcontrols/attachedstyleproperties/MyStyle/mystyle.cpp
+    \skipto MyStyle::propagateTheme
+    \printuntil }
+    \printuntil }
+*/
+QList<QQuickAttachedPropertyPropagator *> QQuickAttachedPropertyPropagator::attachedChildren() const
+{
+    Q_D(const QQuickAttachedPropertyPropagator);
+    return d->attachedChildren;
+}
+
+/*!
+    This function returns the attached parent of this attached object.
+
+    The attached parent is used when inheriting property values:
+
+    \quotefromfile ../../examples/quickcontrols/attachedstyleproperties/MyStyle/mystyle.cpp
+    \skipto MyStyle::resetTheme
+    \printuntil }
+*/
+QQuickAttachedPropertyPropagator *QQuickAttachedPropertyPropagator::attachedParent() const
+{
+    Q_D(const QQuickAttachedPropertyPropagator);
+    return d->attachedParent;
+}
+
+/*!
+    Finds and sets the attached parent for this attached object, and then does
+    the same for its children. This must be called upon construction of the
+    attached object in order for propagation to work.
+
+    It can be useful to read global/default values before calling this
+    function. For example, before calling \c initialize(), the
+    \l {Imagine Style}{Imagine} style checks a static "globalsInitialized" flag
+    to see if it should read default values from \l QSettings. The values from
+    that file form the basis for any attached property values that have not
+    been explicitly set.
+
+    \quotefromfile ../../examples/quickcontrols/attachedstyleproperties/MyStyle/mystyle.cpp
+    \skipto MyStyle::MyStyle
+    \printuntil }
+*/
+void QQuickAttachedPropertyPropagator::initialize()
+{
+    Q_D(QQuickAttachedPropertyPropagator);
+    QQuickAttachedPropertyPropagator *attachedParent = findAttachedParent(metaObject(), parent());
+    if (attachedParent)
+        d->setAttachedParent(attachedParent);
+
+    const QList<QQuickAttachedPropertyPropagator *> attachedChildren = findAttachedChildren(metaObject(), parent());
+    for (QQuickAttachedPropertyPropagator *child : attachedChildren)
+        QQuickAttachedPropertyPropagatorPrivate::get(child)->setAttachedParent(this);
+}
+
+/*!
+    This function is called whenever the attached parent of this
+    QQuickAttachedPropertyPropagator changes from \a oldParent to \a newParent.
+
+    Subclasses should reimplement this function to inherit attached properties
+    from \c newParent.
+
+    \quotefromfile ../../examples/quickcontrols/attachedstyleproperties/MyStyle/mystyle.cpp
+    \skipto attachedParentChange
+    \printuntil }
+    \printuntil }
+*/
+void QQuickAttachedPropertyPropagator::attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent)
+{
+    Q_UNUSED(newParent);
+    Q_UNUSED(oldParent);
+}
+
+QT_END_NAMESPACE
+
+#include "moc_qquickattachedpropertypropagator.cpp"
diff --git a/src/quickcontrols2/qquickattachedpropertypropagator.h b/src/quickcontrols/qquickattachedpropertypropagator.h
index ec5ff7991a..ec5ff7991a 100644
--- a/src/quickcontrols2/qquickattachedpropertypropagator.h
+++ b/src/quickcontrols/qquickattachedpropertypropagator.h
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols/qquickstyle.cpp
index da1bcd200b..da1bcd200b 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols/qquickstyle.cpp
diff --git a/src/quickcontrols2/qquickstyle.h b/src/quickcontrols/qquickstyle.h
index 019cacef14..019cacef14 100644
--- a/src/quickcontrols2/qquickstyle.h
+++ b/src/quickcontrols/qquickstyle.h
diff --git a/src/quickcontrols2/qquickstyle_p.h b/src/quickcontrols/qquickstyle_p.h
index 8a563aee7b..8a563aee7b 100644
--- a/src/quickcontrols2/qquickstyle_p.h
+++ b/src/quickcontrols/qquickstyle_p.h
diff --git a/src/quickcontrols2/qquickstyleplugin.cpp b/src/quickcontrols/qquickstyleplugin.cpp
index 8f0a71c9ad..8f0a71c9ad 100644
--- a/src/quickcontrols2/qquickstyleplugin.cpp
+++ b/src/quickcontrols/qquickstyleplugin.cpp
diff --git a/src/quickcontrols2/qquickstyleplugin_p.h b/src/quickcontrols/qquickstyleplugin_p.h
index d0f690205c..d0f690205c 100644
--- a/src/quickcontrols2/qquickstyleplugin_p.h
+++ b/src/quickcontrols/qquickstyleplugin_p.h
diff --git a/src/quickcontrols2/qt_cmdline.cmake b/src/quickcontrols/qt_cmdline.cmake
index ed009c5407..ed009c5407 100644
--- a/src/quickcontrols2/qt_cmdline.cmake
+++ b/src/quickcontrols/qt_cmdline.cmake
diff --git a/src/quickcontrols2/qtquickcontrols2global.h b/src/quickcontrols/qtquickcontrols2global.h
index 7e52bb1863..7e52bb1863 100644
--- a/src/quickcontrols2/qtquickcontrols2global.h
+++ b/src/quickcontrols/qtquickcontrols2global.h
diff --git a/src/quickcontrols2/qtquickcontrols2plugin.cpp b/src/quickcontrols/qtquickcontrols2plugin.cpp
index 8e30e8428b..8e30e8428b 100644
--- a/src/quickcontrols2/qtquickcontrols2plugin.cpp
+++ b/src/quickcontrols/qtquickcontrols2plugin.cpp
diff --git a/src/quickcontrols2/universal/ApplicationWindow.qml b/src/quickcontrols/universal/ApplicationWindow.qml
index 7828d20480..7828d20480 100644
--- a/src/quickcontrols2/universal/ApplicationWindow.qml
+++ b/src/quickcontrols/universal/ApplicationWindow.qml
diff --git a/src/quickcontrols2/universal/BusyIndicator.qml b/src/quickcontrols/universal/BusyIndicator.qml
index 64dfdd251a..64dfdd251a 100644
--- a/src/quickcontrols2/universal/BusyIndicator.qml
+++ b/src/quickcontrols/universal/BusyIndicator.qml
diff --git a/src/quickcontrols2/universal/Button.qml b/src/quickcontrols/universal/Button.qml
index bdf10e3c8c..bdf10e3c8c 100644
--- a/src/quickcontrols2/universal/Button.qml
+++ b/src/quickcontrols/universal/Button.qml
diff --git a/src/quickcontrols2/universal/CMakeLists.txt b/src/quickcontrols/universal/CMakeLists.txt
index 6f5dc1bb25..6f5dc1bb25 100644
--- a/src/quickcontrols2/universal/CMakeLists.txt
+++ b/src/quickcontrols/universal/CMakeLists.txt
diff --git a/src/quickcontrols2/universal/CheckBox.qml b/src/quickcontrols/universal/CheckBox.qml
index c7f99b3b2b..c7f99b3b2b 100644
--- a/src/quickcontrols2/universal/CheckBox.qml
+++ b/src/quickcontrols/universal/CheckBox.qml
diff --git a/src/quickcontrols2/universal/CheckDelegate.qml b/src/quickcontrols/universal/CheckDelegate.qml
index f11f0ac888..f11f0ac888 100644
--- a/src/quickcontrols2/universal/CheckDelegate.qml
+++ b/src/quickcontrols/universal/CheckDelegate.qml
diff --git a/src/quickcontrols2/universal/ComboBox.qml b/src/quickcontrols/universal/ComboBox.qml
index 9a812388aa..9a812388aa 100644
--- a/src/quickcontrols2/universal/ComboBox.qml
+++ b/src/quickcontrols/universal/ComboBox.qml
diff --git a/src/quickcontrols2/universal/DelayButton.qml b/src/quickcontrols/universal/DelayButton.qml
index 2b2cc83580..2b2cc83580 100644
--- a/src/quickcontrols2/universal/DelayButton.qml
+++ b/src/quickcontrols/universal/DelayButton.qml
diff --git a/src/quickcontrols2/universal/Dial.qml b/src/quickcontrols/universal/Dial.qml
index 6f86b00722..6f86b00722 100644
--- a/src/quickcontrols2/universal/Dial.qml
+++ b/src/quickcontrols/universal/Dial.qml
diff --git a/src/quickcontrols2/universal/Dialog.qml b/src/quickcontrols/universal/Dialog.qml
index 0ed4e673c7..0ed4e673c7 100644
--- a/src/quickcontrols2/universal/Dialog.qml
+++ b/src/quickcontrols/universal/Dialog.qml
diff --git a/src/quickcontrols2/universal/DialogButtonBox.qml b/src/quickcontrols/universal/DialogButtonBox.qml
index 826a13efd3..826a13efd3 100644
--- a/src/quickcontrols2/universal/DialogButtonBox.qml
+++ b/src/quickcontrols/universal/DialogButtonBox.qml
diff --git a/src/quickcontrols2/universal/Drawer.qml b/src/quickcontrols/universal/Drawer.qml
index 4c4ff5d443..4c4ff5d443 100644
--- a/src/quickcontrols2/universal/Drawer.qml
+++ b/src/quickcontrols/universal/Drawer.qml
diff --git a/src/quickcontrols2/universal/Frame.qml b/src/quickcontrols/universal/Frame.qml
index 2e650d7913..2e650d7913 100644
--- a/src/quickcontrols2/universal/Frame.qml
+++ b/src/quickcontrols/universal/Frame.qml
diff --git a/src/quickcontrols2/universal/GroupBox.qml b/src/quickcontrols/universal/GroupBox.qml
index b0b211bd95..b0b211bd95 100644
--- a/src/quickcontrols2/universal/GroupBox.qml
+++ b/src/quickcontrols/universal/GroupBox.qml
diff --git a/src/quickcontrols2/universal/HorizontalHeaderView.qml b/src/quickcontrols/universal/HorizontalHeaderView.qml
index 878fb1e10e..878fb1e10e 100644
--- a/src/quickcontrols2/universal/HorizontalHeaderView.qml
+++ b/src/quickcontrols/universal/HorizontalHeaderView.qml
diff --git a/src/quickcontrols2/universal/ItemDelegate.qml b/src/quickcontrols/universal/ItemDelegate.qml
index ab999d6094..ab999d6094 100644
--- a/src/quickcontrols2/universal/ItemDelegate.qml
+++ b/src/quickcontrols/universal/ItemDelegate.qml
diff --git a/src/quickcontrols2/universal/Label.qml b/src/quickcontrols/universal/Label.qml
index e77f48d185..e77f48d185 100644
--- a/src/quickcontrols2/universal/Label.qml
+++ b/src/quickcontrols/universal/Label.qml
diff --git a/src/quickcontrols2/universal/Menu.qml b/src/quickcontrols/universal/Menu.qml
index 64dac0c4b8..64dac0c4b8 100644
--- a/src/quickcontrols2/universal/Menu.qml
+++ b/src/quickcontrols/universal/Menu.qml
diff --git a/src/quickcontrols2/universal/MenuBar.qml b/src/quickcontrols/universal/MenuBar.qml
index 1c0f4c6b2d..1c0f4c6b2d 100644
--- a/src/quickcontrols2/universal/MenuBar.qml
+++ b/src/quickcontrols/universal/MenuBar.qml
diff --git a/src/quickcontrols2/universal/MenuBarItem.qml b/src/quickcontrols/universal/MenuBarItem.qml
index 84dfb22fad..84dfb22fad 100644
--- a/src/quickcontrols2/universal/MenuBarItem.qml
+++ b/src/quickcontrols/universal/MenuBarItem.qml
diff --git a/src/quickcontrols2/universal/MenuItem.qml b/src/quickcontrols/universal/MenuItem.qml
index 00b9d16228..00b9d16228 100644
--- a/src/quickcontrols2/universal/MenuItem.qml
+++ b/src/quickcontrols/universal/MenuItem.qml
diff --git a/src/quickcontrols2/universal/MenuSeparator.qml b/src/quickcontrols/universal/MenuSeparator.qml
index dc814ef2fe..dc814ef2fe 100644
--- a/src/quickcontrols2/universal/MenuSeparator.qml
+++ b/src/quickcontrols/universal/MenuSeparator.qml
diff --git a/src/quickcontrols2/universal/Page.qml b/src/quickcontrols/universal/Page.qml
index 7e2c69aa5b..7e2c69aa5b 100644
--- a/src/quickcontrols2/universal/Page.qml
+++ b/src/quickcontrols/universal/Page.qml
diff --git a/src/quickcontrols2/universal/PageIndicator.qml b/src/quickcontrols/universal/PageIndicator.qml
index 68147f6996..68147f6996 100644
--- a/src/quickcontrols2/universal/PageIndicator.qml
+++ b/src/quickcontrols/universal/PageIndicator.qml
diff --git a/src/quickcontrols2/universal/Pane.qml b/src/quickcontrols/universal/Pane.qml
index 2f27979c4b..2f27979c4b 100644
--- a/src/quickcontrols2/universal/Pane.qml
+++ b/src/quickcontrols/universal/Pane.qml
diff --git a/src/quickcontrols2/universal/Popup.qml b/src/quickcontrols/universal/Popup.qml
index 5899919791..5899919791 100644
--- a/src/quickcontrols2/universal/Popup.qml
+++ b/src/quickcontrols/universal/Popup.qml
diff --git a/src/quickcontrols2/universal/ProgressBar.qml b/src/quickcontrols/universal/ProgressBar.qml
index 803941f865..803941f865 100644
--- a/src/quickcontrols2/universal/ProgressBar.qml
+++ b/src/quickcontrols/universal/ProgressBar.qml
diff --git a/src/quickcontrols2/universal/README.md b/src/quickcontrols/universal/README.md
index 8d02d18ba3..8d02d18ba3 100644
--- a/src/quickcontrols2/universal/README.md
+++ b/src/quickcontrols/universal/README.md
diff --git a/src/quickcontrols2/universal/RadioButton.qml b/src/quickcontrols/universal/RadioButton.qml
index b7e594308b..b7e594308b 100644
--- a/src/quickcontrols2/universal/RadioButton.qml
+++ b/src/quickcontrols/universal/RadioButton.qml
diff --git a/src/quickcontrols2/universal/RadioDelegate.qml b/src/quickcontrols/universal/RadioDelegate.qml
index 9e9899d15a..9e9899d15a 100644
--- a/src/quickcontrols2/universal/RadioDelegate.qml
+++ b/src/quickcontrols/universal/RadioDelegate.qml
diff --git a/src/quickcontrols2/universal/RangeSlider.qml b/src/quickcontrols/universal/RangeSlider.qml
index cd85d930bb..cd85d930bb 100644
--- a/src/quickcontrols2/universal/RangeSlider.qml
+++ b/src/quickcontrols/universal/RangeSlider.qml
diff --git a/src/quickcontrols2/universal/RoundButton.qml b/src/quickcontrols/universal/RoundButton.qml
index c2d0f9e823..c2d0f9e823 100644
--- a/src/quickcontrols2/universal/RoundButton.qml
+++ b/src/quickcontrols/universal/RoundButton.qml
diff --git a/src/quickcontrols2/universal/ScrollBar.qml b/src/quickcontrols/universal/ScrollBar.qml
index a5ab5fc762..a5ab5fc762 100644
--- a/src/quickcontrols2/universal/ScrollBar.qml
+++ b/src/quickcontrols/universal/ScrollBar.qml
diff --git a/src/quickcontrols2/universal/ScrollIndicator.qml b/src/quickcontrols/universal/ScrollIndicator.qml
index 1df2163498..1df2163498 100644
--- a/src/quickcontrols2/universal/ScrollIndicator.qml
+++ b/src/quickcontrols/universal/ScrollIndicator.qml
diff --git a/src/quickcontrols2/universal/ScrollView.qml b/src/quickcontrols/universal/ScrollView.qml
index 60789313c9..60789313c9 100644
--- a/src/quickcontrols2/universal/ScrollView.qml
+++ b/src/quickcontrols/universal/ScrollView.qml
diff --git a/src/quickcontrols2/universal/SelectionRectangle.qml b/src/quickcontrols/universal/SelectionRectangle.qml
index e7b99852da..e7b99852da 100644
--- a/src/quickcontrols2/universal/SelectionRectangle.qml
+++ b/src/quickcontrols/universal/SelectionRectangle.qml
diff --git a/src/quickcontrols2/universal/Slider.qml b/src/quickcontrols/universal/Slider.qml
index 305c5c321f..305c5c321f 100644
--- a/src/quickcontrols2/universal/Slider.qml
+++ b/src/quickcontrols/universal/Slider.qml
diff --git a/src/quickcontrols2/universal/SpinBox.qml b/src/quickcontrols/universal/SpinBox.qml
index 07721c8712..07721c8712 100644
--- a/src/quickcontrols2/universal/SpinBox.qml
+++ b/src/quickcontrols/universal/SpinBox.qml
diff --git a/src/quickcontrols2/universal/SplitView.qml b/src/quickcontrols/universal/SplitView.qml
index e18169db6a..e18169db6a 100644
--- a/src/quickcontrols2/universal/SplitView.qml
+++ b/src/quickcontrols/universal/SplitView.qml
diff --git a/src/quickcontrols2/universal/StackView.qml b/src/quickcontrols/universal/StackView.qml
index b5d568f98d..b5d568f98d 100644
--- a/src/quickcontrols2/universal/StackView.qml
+++ b/src/quickcontrols/universal/StackView.qml
diff --git a/src/quickcontrols2/universal/SwipeDelegate.qml b/src/quickcontrols/universal/SwipeDelegate.qml
index 0bb2367ca7..0bb2367ca7 100644
--- a/src/quickcontrols2/universal/SwipeDelegate.qml
+++ b/src/quickcontrols/universal/SwipeDelegate.qml
diff --git a/src/quickcontrols2/universal/Switch.qml b/src/quickcontrols/universal/Switch.qml
index 70de360bde..70de360bde 100644
--- a/src/quickcontrols2/universal/Switch.qml
+++ b/src/quickcontrols/universal/Switch.qml
diff --git a/src/quickcontrols2/universal/SwitchDelegate.qml b/src/quickcontrols/universal/SwitchDelegate.qml
index 18a55e9cd9..18a55e9cd9 100644
--- a/src/quickcontrols2/universal/SwitchDelegate.qml
+++ b/src/quickcontrols/universal/SwitchDelegate.qml
diff --git a/src/quickcontrols2/universal/TabBar.qml b/src/quickcontrols/universal/TabBar.qml
index c06aaaf541..c06aaaf541 100644
--- a/src/quickcontrols2/universal/TabBar.qml
+++ b/src/quickcontrols/universal/TabBar.qml
diff --git a/src/quickcontrols2/universal/TabButton.qml b/src/quickcontrols/universal/TabButton.qml
index 7c8080301e..7c8080301e 100644
--- a/src/quickcontrols2/universal/TabButton.qml
+++ b/src/quickcontrols/universal/TabButton.qml
diff --git a/src/quickcontrols2/universal/TextArea.qml b/src/quickcontrols/universal/TextArea.qml
index 8a3cdd1119..8a3cdd1119 100644
--- a/src/quickcontrols2/universal/TextArea.qml
+++ b/src/quickcontrols/universal/TextArea.qml
diff --git a/src/quickcontrols2/universal/TextField.qml b/src/quickcontrols/universal/TextField.qml
index fb20779156..fb20779156 100644
--- a/src/quickcontrols2/universal/TextField.qml
+++ b/src/quickcontrols/universal/TextField.qml
diff --git a/src/quickcontrols2/universal/ToolBar.qml b/src/quickcontrols/universal/ToolBar.qml
index 33aa490c08..33aa490c08 100644
--- a/src/quickcontrols2/universal/ToolBar.qml
+++ b/src/quickcontrols/universal/ToolBar.qml
diff --git a/src/quickcontrols2/universal/ToolButton.qml b/src/quickcontrols/universal/ToolButton.qml
index 08c346b99e..08c346b99e 100644
--- a/src/quickcontrols2/universal/ToolButton.qml
+++ b/src/quickcontrols/universal/ToolButton.qml
diff --git a/src/quickcontrols2/universal/ToolSeparator.qml b/src/quickcontrols/universal/ToolSeparator.qml
index 2d6cc9a3cc..2d6cc9a3cc 100644
--- a/src/quickcontrols2/universal/ToolSeparator.qml
+++ b/src/quickcontrols/universal/ToolSeparator.qml
diff --git a/src/quickcontrols2/universal/ToolTip.qml b/src/quickcontrols/universal/ToolTip.qml
index af1d49586e..af1d49586e 100644
--- a/src/quickcontrols2/universal/ToolTip.qml
+++ b/src/quickcontrols/universal/ToolTip.qml
diff --git a/src/quickcontrols2/universal/Tumbler.qml b/src/quickcontrols/universal/Tumbler.qml
index 03b5fcca63..03b5fcca63 100644
--- a/src/quickcontrols2/universal/Tumbler.qml
+++ b/src/quickcontrols/universal/Tumbler.qml
diff --git a/src/quickcontrols2/universal/VerticalHeaderView.qml b/src/quickcontrols/universal/VerticalHeaderView.qml
index 189bed0906..189bed0906 100644
--- a/src/quickcontrols2/universal/VerticalHeaderView.qml
+++ b/src/quickcontrols/universal/VerticalHeaderView.qml
diff --git a/src/quickcontrols2/universal/images/checkmark.png b/src/quickcontrols/universal/images/checkmark.png
index e2aae6fe0f..e2aae6fe0f 100644
--- a/src/quickcontrols2/universal/images/checkmark.png
+++ b/src/quickcontrols/universal/images/checkmark.png
diff --git a/src/quickcontrols2/universal/images/checkmark@2x.png b/src/quickcontrols/universal/images/checkmark@2x.png
index 0df4159a7c..0df4159a7c 100644
--- a/src/quickcontrols2/universal/images/checkmark@2x.png
+++ b/src/quickcontrols/universal/images/checkmark@2x.png
diff --git a/src/quickcontrols2/universal/images/checkmark@3x.png b/src/quickcontrols/universal/images/checkmark@3x.png
index 43466cbcb6..43466cbcb6 100644
--- a/src/quickcontrols2/universal/images/checkmark@3x.png
+++ b/src/quickcontrols/universal/images/checkmark@3x.png
diff --git a/src/quickcontrols2/universal/images/checkmark@4x.png b/src/quickcontrols/universal/images/checkmark@4x.png
index 7a47bd2159..7a47bd2159 100644
--- a/src/quickcontrols2/universal/images/checkmark@4x.png
+++ b/src/quickcontrols/universal/images/checkmark@4x.png
diff --git a/src/quickcontrols2/universal/images/downarrow.png b/src/quickcontrols/universal/images/downarrow.png
index b66e2efc22..b66e2efc22 100644
--- a/src/quickcontrols2/universal/images/downarrow.png
+++ b/src/quickcontrols/universal/images/downarrow.png
diff --git a/src/quickcontrols2/universal/images/downarrow@2x.png b/src/quickcontrols/universal/images/downarrow@2x.png
index a704376c8f..a704376c8f 100644
--- a/src/quickcontrols2/universal/images/downarrow@2x.png
+++ b/src/quickcontrols/universal/images/downarrow@2x.png
diff --git a/src/quickcontrols2/universal/images/downarrow@3x.png b/src/quickcontrols/universal/images/downarrow@3x.png
index 3b6d55ab4c..3b6d55ab4c 100644
--- a/src/quickcontrols2/universal/images/downarrow@3x.png
+++ b/src/quickcontrols/universal/images/downarrow@3x.png
diff --git a/src/quickcontrols2/universal/images/downarrow@4x.png b/src/quickcontrols/universal/images/downarrow@4x.png
index 818c6b24ff..818c6b24ff 100644
--- a/src/quickcontrols2/universal/images/downarrow@4x.png
+++ b/src/quickcontrols/universal/images/downarrow@4x.png
diff --git a/src/quickcontrols2/universal/images/leftarrow.png b/src/quickcontrols/universal/images/leftarrow.png
index 0153ccd421..0153ccd421 100644
--- a/src/quickcontrols2/universal/images/leftarrow.png
+++ b/src/quickcontrols/universal/images/leftarrow.png
diff --git a/src/quickcontrols2/universal/images/leftarrow@2x.png b/src/quickcontrols/universal/images/leftarrow@2x.png
index fa692d5b0f..fa692d5b0f 100644
--- a/src/quickcontrols2/universal/images/leftarrow@2x.png
+++ b/src/quickcontrols/universal/images/leftarrow@2x.png
diff --git a/src/quickcontrols2/universal/images/leftarrow@3x.png b/src/quickcontrols/universal/images/leftarrow@3x.png
index 06b0207a60..06b0207a60 100644
--- a/src/quickcontrols2/universal/images/leftarrow@3x.png
+++ b/src/quickcontrols/universal/images/leftarrow@3x.png
diff --git a/src/quickcontrols2/universal/images/leftarrow@4x.png b/src/quickcontrols/universal/images/leftarrow@4x.png
index 1049f616e4..1049f616e4 100644
--- a/src/quickcontrols2/universal/images/leftarrow@4x.png
+++ b/src/quickcontrols/universal/images/leftarrow@4x.png
diff --git a/src/quickcontrols2/universal/images/rightarrow.png b/src/quickcontrols/universal/images/rightarrow.png
index b24d117d79..b24d117d79 100644
--- a/src/quickcontrols2/universal/images/rightarrow.png
+++ b/src/quickcontrols/universal/images/rightarrow.png
diff --git a/src/quickcontrols2/universal/images/rightarrow@2x.png b/src/quickcontrols/universal/images/rightarrow@2x.png
index 80aca7c18f..80aca7c18f 100644
--- a/src/quickcontrols2/universal/images/rightarrow@2x.png
+++ b/src/quickcontrols/universal/images/rightarrow@2x.png
diff --git a/src/quickcontrols2/universal/images/rightarrow@3x.png b/src/quickcontrols/universal/images/rightarrow@3x.png
index ba01724065..ba01724065 100644
--- a/src/quickcontrols2/universal/images/rightarrow@3x.png
+++ b/src/quickcontrols/universal/images/rightarrow@3x.png
diff --git a/src/quickcontrols2/universal/images/rightarrow@4x.png b/src/quickcontrols/universal/images/rightarrow@4x.png
index 21f7ed4d15..21f7ed4d15 100644
--- a/src/quickcontrols2/universal/images/rightarrow@4x.png
+++ b/src/quickcontrols/universal/images/rightarrow@4x.png
diff --git a/src/quickcontrols2/universal/impl/CMakeLists.txt b/src/quickcontrols/universal/impl/CMakeLists.txt
index 078e42e217..078e42e217 100644
--- a/src/quickcontrols2/universal/impl/CMakeLists.txt
+++ b/src/quickcontrols/universal/impl/CMakeLists.txt
diff --git a/src/quickcontrols2/universal/impl/CheckIndicator.qml b/src/quickcontrols/universal/impl/CheckIndicator.qml
index b78e57570d..b78e57570d 100644
--- a/src/quickcontrols2/universal/impl/CheckIndicator.qml
+++ b/src/quickcontrols/universal/impl/CheckIndicator.qml
diff --git a/src/quickcontrols2/universal/impl/RadioIndicator.qml b/src/quickcontrols/universal/impl/RadioIndicator.qml
index 73fc2e964f..73fc2e964f 100644
--- a/src/quickcontrols2/universal/impl/RadioIndicator.qml
+++ b/src/quickcontrols/universal/impl/RadioIndicator.qml
diff --git a/src/quickcontrols2/universal/impl/SwitchIndicator.qml b/src/quickcontrols/universal/impl/SwitchIndicator.qml
index f88094becc..f88094becc 100644
--- a/src/quickcontrols2/universal/impl/SwitchIndicator.qml
+++ b/src/quickcontrols/universal/impl/SwitchIndicator.qml
diff --git a/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator.cpp b/src/quickcontrols/universal/impl/qquickuniversalbusyindicator.cpp
index d0fdd925cd..d0fdd925cd 100644
--- a/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator.cpp
+++ b/src/quickcontrols/universal/impl/qquickuniversalbusyindicator.cpp
diff --git a/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator_p.h b/src/quickcontrols/universal/impl/qquickuniversalbusyindicator_p.h
index 1000bbab09..1000bbab09 100644
--- a/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator_p.h
+++ b/src/quickcontrols/universal/impl/qquickuniversalbusyindicator_p.h
diff --git a/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle.cpp b/src/quickcontrols/universal/impl/qquickuniversalfocusrectangle.cpp
index 9b815b9147..9b815b9147 100644
--- a/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle.cpp
+++ b/src/quickcontrols/universal/impl/qquickuniversalfocusrectangle.cpp
diff --git a/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle_p.h b/src/quickcontrols/universal/impl/qquickuniversalfocusrectangle_p.h
index 909c566722..909c566722 100644
--- a/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle_p.h
+++ b/src/quickcontrols/universal/impl/qquickuniversalfocusrectangle_p.h
diff --git a/src/quickcontrols2/universal/impl/qquickuniversalprogressbar.cpp b/src/quickcontrols/universal/impl/qquickuniversalprogressbar.cpp
index 0ab47e8804..0ab47e8804 100644
--- a/src/quickcontrols2/universal/impl/qquickuniversalprogressbar.cpp
+++ b/src/quickcontrols/universal/impl/qquickuniversalprogressbar.cpp
diff --git a/src/quickcontrols2/universal/impl/qquickuniversalprogressbar_p.h b/src/quickcontrols/universal/impl/qquickuniversalprogressbar_p.h
index a4bbae8cb5..a4bbae8cb5 100644
--- a/src/quickcontrols2/universal/impl/qquickuniversalprogressbar_p.h
+++ b/src/quickcontrols/universal/impl/qquickuniversalprogressbar_p.h
diff --git a/src/quickcontrols2/universal/qquickuniversalstyle.cpp b/src/quickcontrols/universal/qquickuniversalstyle.cpp
index cacf20a75f..cacf20a75f 100644
--- a/src/quickcontrols2/universal/qquickuniversalstyle.cpp
+++ b/src/quickcontrols/universal/qquickuniversalstyle.cpp
diff --git a/src/quickcontrols2/universal/qquickuniversalstyle_p.h b/src/quickcontrols/universal/qquickuniversalstyle_p.h
index 024fde2192..024fde2192 100644
--- a/src/quickcontrols2/universal/qquickuniversalstyle_p.h
+++ b/src/quickcontrols/universal/qquickuniversalstyle_p.h
diff --git a/src/quickcontrols2/universal/qquickuniversaltheme.cpp b/src/quickcontrols/universal/qquickuniversaltheme.cpp
index fff5400986..fff5400986 100644
--- a/src/quickcontrols2/universal/qquickuniversaltheme.cpp
+++ b/src/quickcontrols/universal/qquickuniversaltheme.cpp
diff --git a/src/quickcontrols2/universal/qquickuniversaltheme_p.h b/src/quickcontrols/universal/qquickuniversaltheme_p.h
index 84789c5da1..84789c5da1 100644
--- a/src/quickcontrols2/universal/qquickuniversaltheme_p.h
+++ b/src/quickcontrols/universal/qquickuniversaltheme_p.h
diff --git a/src/quickcontrols2/universal/qtquickcontrols2universalstyleplugin.cpp b/src/quickcontrols/universal/qtquickcontrols2universalstyleplugin.cpp
index 683c966833..683c966833 100644
--- a/src/quickcontrols2/universal/qtquickcontrols2universalstyleplugin.cpp
+++ b/src/quickcontrols/universal/qtquickcontrols2universalstyleplugin.cpp
diff --git a/src/quickcontrols2/windows/Button.qml b/src/quickcontrols/windows/Button.qml
index c16965b021..c16965b021 100644
--- a/src/quickcontrols2/windows/Button.qml
+++ b/src/quickcontrols/windows/Button.qml
diff --git a/src/quickcontrols2/windows/CMakeLists.txt b/src/quickcontrols/windows/CMakeLists.txt
index b5319fef52..b5319fef52 100644
--- a/src/quickcontrols2/windows/CMakeLists.txt
+++ b/src/quickcontrols/windows/CMakeLists.txt
diff --git a/src/quickcontrols2/windows/CheckBox.qml b/src/quickcontrols/windows/CheckBox.qml
index 651caff5d2..651caff5d2 100644
--- a/src/quickcontrols2/windows/CheckBox.qml
+++ b/src/quickcontrols/windows/CheckBox.qml
diff --git a/src/quickcontrols2/windows/ComboBox.qml b/src/quickcontrols/windows/ComboBox.qml
index 7226fa11f8..7226fa11f8 100644
--- a/src/quickcontrols2/windows/ComboBox.qml
+++ b/src/quickcontrols/windows/ComboBox.qml
diff --git a/src/quickcontrols2/windows/Frame.qml b/src/quickcontrols/windows/Frame.qml
index bb37d8aa26..bb37d8aa26 100644
--- a/src/quickcontrols2/windows/Frame.qml
+++ b/src/quickcontrols/windows/Frame.qml
diff --git a/src/quickcontrols2/windows/GroupBox.qml b/src/quickcontrols/windows/GroupBox.qml
index 0002feb676..0002feb676 100644
--- a/src/quickcontrols2/windows/GroupBox.qml
+++ b/src/quickcontrols/windows/GroupBox.qml
diff --git a/src/quickcontrols2/windows/ProgressBar.qml b/src/quickcontrols/windows/ProgressBar.qml
index 421070cf7f..421070cf7f 100644
--- a/src/quickcontrols2/windows/ProgressBar.qml
+++ b/src/quickcontrols/windows/ProgressBar.qml
diff --git a/src/quickcontrols2/windows/RadioButton.qml b/src/quickcontrols/windows/RadioButton.qml
index b32a8a7a6b..b32a8a7a6b 100644
--- a/src/quickcontrols2/windows/RadioButton.qml
+++ b/src/quickcontrols/windows/RadioButton.qml
diff --git a/src/quickcontrols2/windows/ScrollBar.qml b/src/quickcontrols/windows/ScrollBar.qml
index 6906f7dfa2..6906f7dfa2 100644
--- a/src/quickcontrols2/windows/ScrollBar.qml
+++ b/src/quickcontrols/windows/ScrollBar.qml
diff --git a/src/quickcontrols2/windows/ScrollView.qml b/src/quickcontrols/windows/ScrollView.qml
index 62619b8649..62619b8649 100644
--- a/src/quickcontrols2/windows/ScrollView.qml
+++ b/src/quickcontrols/windows/ScrollView.qml
diff --git a/src/quickcontrols2/windows/SelectionRectangle.qml b/src/quickcontrols/windows/SelectionRectangle.qml
index 8efadd8e31..8efadd8e31 100644
--- a/src/quickcontrols2/windows/SelectionRectangle.qml
+++ b/src/quickcontrols/windows/SelectionRectangle.qml
diff --git a/src/quickcontrols2/windows/Slider.qml b/src/quickcontrols/windows/Slider.qml
index 67c8e9638a..67c8e9638a 100644
--- a/src/quickcontrols2/windows/Slider.qml
+++ b/src/quickcontrols/windows/Slider.qml
diff --git a/src/quickcontrols2/windows/SpinBox.qml b/src/quickcontrols/windows/SpinBox.qml
index 0d54e1a4c5..0d54e1a4c5 100644
--- a/src/quickcontrols2/windows/SpinBox.qml
+++ b/src/quickcontrols/windows/SpinBox.qml
diff --git a/src/quickcontrols2/windows/TextArea.qml b/src/quickcontrols/windows/TextArea.qml
index 9dbd0863bd..9dbd0863bd 100644
--- a/src/quickcontrols2/windows/TextArea.qml
+++ b/src/quickcontrols/windows/TextArea.qml
diff --git a/src/quickcontrols2/windows/TextField.qml b/src/quickcontrols/windows/TextField.qml
index 1cedb17389..1cedb17389 100644
--- a/src/quickcontrols2/windows/TextField.qml
+++ b/src/quickcontrols/windows/TextField.qml
diff --git a/src/quickcontrols2/windows/qtquickcontrols2windowsstyleplugin.cpp b/src/quickcontrols/windows/qtquickcontrols2windowsstyleplugin.cpp
index a3431af921..a3431af921 100644
--- a/src/quickcontrols2/windows/qtquickcontrols2windowsstyleplugin.cpp
+++ b/src/quickcontrols/windows/qtquickcontrols2windowsstyleplugin.cpp
diff --git a/src/quickcontrols2/doc/src/qtquickcontrols2-imagine.qdoc b/src/quickcontrols2/doc/src/qtquickcontrols2-imagine.qdoc
deleted file mode 100644
index 1126cf5e92..0000000000
--- a/src/quickcontrols2/doc/src/qtquickcontrols2-imagine.qdoc
+++ /dev/null
@@ -1,2511 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-    \page qtquickcontrols2-imagine.html
-    \title Imagine Style
-
-    The Imagine Style is based on configurable image assets. \l{detailed-desc-imagine}{More...}
-
-    \styleimport {QtQuick.Controls.Imagine 2.12} {Qt 5.10}
-
-    \section1 Attached Properties
-
-    \list
-        \li \l {imagine-path-attached-prop}{\b path} : string
-    \endlist
-
-    \section1 Detailed Description
-    \target detailed-desc-imagine
-
-    The Imagine style is based on image assets. The style comes with a default
-    set of images, but the images can be easily changed by providing a directory
-    with images using a predefined naming convention.
-
-    \image qtquickcontrols2-imagine.png
-    \caption The Imagine style with the default images
-
-    To run an application with the Imagine style, see
-    \l {Using Styles in Qt Quick Controls}.
-
-    \section2 File Names
-
-    The image files are named using the following convention:
-
-    \c <control>-<element>-<states>
-
-    The \c <control> and \c <element> sections are mandatory, but the
-    \c <states> section is optional. For example, if a single file named
-    \c "button-background.9.png" is provided for \l {Button}, it will be used
-    for every state that \c Button supports. It is up to the developer to
-    decide the set of states that they will provide images for. However, it
-    is recommended to provide images for the most common control states where
-    possible, such as \c disabled, \c pressed, etc. This will ensure that
-    interactive controls visually behave as the end user would expect them to.
-
-    \section2 Element Reference
-
-    The following table lists which elements are supported for each control,
-    along with the possible states for that element, and the file extension
-    that it expects. An element is an image that represents a certain visual
-    part of the control. For example, \c {Button}'s \c "background" element
-    represents its \l {Control::}{background}.
-
-    \table
-        \header
-            \li Control
-            \li Element
-            \li States
-            \li Extension
-        \row
-            \li \l ApplicationWindow
-            \li background
-            \li active
-            \li .9.png (or .png)
-        \row
-            \li \l BusyIndicator
-            \li animation
-            \li disabled, running, mirrored, hovered
-            \li .webp
-        \row
-            \li
-            \li background
-            \li same as above
-            \li .webp
-        \row
-            \li \l Button
-            \li background
-            \li disabled, pressed, checked, checkable, focused, highlighted, flat, mirrored, hovered
-            \li .9.png
-        \row
-            \li \l CheckBox
-            \li background
-            \li disabled, pressed, checked, partially-checked, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li indicator
-            \li same as above
-            \li .png
-        \row
-            \li \l CheckDelegate
-            \li background
-            \li disabled, pressed, checked, partially-checked, focused, highlighted, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li indicator
-            \li same as above
-            \li .png
-        \row
-            \li \l ComboBox
-            \li background
-            \li disabled, pressed, editable, open, focused, mirrored, hovered, flat
-            \li .9.png (or .png)
-        \row
-            \li
-            \li indicator
-            \li same as above
-            \li .png
-        \row
-            \li
-            \li popup
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l DelayButton
-            \li background
-            \li disabled, pressed, checked, checkable, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li progress
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li
-            \li mask
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l Dial
-            \li background
-            \li disabled, pressed, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li handle
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l Dialog
-            \li background
-            \li modal, dim
-            \li .9.png (or .png)
-        \row
-            \li
-            \li title
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li
-            \li overlay
-            \li modal
-            \li .9.png (or .png)
-        \row
-            \li \l DialogButtonBox
-            \li background
-            \li disabled, mirrored
-            \li .9.png (or .png)
-        \row
-            \li \l Drawer
-            \li background
-            \li modal, dim, top, left, right, bottom
-            \li .9.png (or .png)
-        \row
-            \li
-            \li overlay
-            \li modal
-            \li .9.png (or .png)
-        \row
-            \li \l Frame
-            \li background
-            \li disabled, mirrored
-            \li .9.png (or .png)
-        \row
-            \li \l GroupBox
-            \li background
-            \li disabled, mirrored
-            \li .9.png (or .png)
-        \row
-            \li
-            \li title
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l ItemDelegate
-            \li background
-            \li disabled, pressed, focused, highlighted, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li \l Label
-            \li background
-            \li disabled, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li \l Menu
-            \li background
-            \li modal, dim
-            \li .9.png (or .png)
-        \row
-            \li
-            \li overlay
-            \li modal
-            \li .9.png (or .png)
-        \row
-            \li \l MenuItem
-            \li arrow
-            \li disabled, pressed, checked, focused, highlighted, mirrored, hovered
-            \li .png
-        \row
-            \li
-            \li background
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li
-            \li indicator
-            \li same as above
-            \li .png
-        \row
-            \li \l MenuSeparator
-            \li background
-            \li disabled, mirrored
-            \li .9.png (or .png)
-        \row
-            \li
-            \li separator
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l Page
-            \li background
-            \li disabled, mirrored
-            \li .9.png (or .png)
-        \row
-            \li \l PageIndicator
-            \li background
-            \li disabled, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li delegate
-            \li disabled, pressed, current, mirrored, hovered
-            \li .png
-        \row
-            \li \l Pane
-            \li background
-            \li disabled, mirrored
-            \li .9.png (or .png)
-        \row
-            \li \l Popup
-            \li background
-            \li modal, dim
-            \li .9.png (or .png)
-        \row
-            \li
-            \li overlay
-            \li modal
-            \li .9.png (or .png)
-        \row
-            \li \l ProgressBar
-            \li animation
-            \li disabled, mirrored, hovered
-            \li .png
-        \row
-            \li
-            \li background
-            \li disabled, indeterminate, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li mask
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li
-            \li progress
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l RadioButton
-            \li background
-            \li disabled, pressed, checked, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li indicator
-            \li same as above
-            \li .png
-        \row
-            \li \l RadioDelegate
-            \li background
-            \li disabled, pressed, checked, focused, highlighted, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li indicator
-            \li same as above
-            \li .png
-        \row
-            \li \l RangeSlider
-            \li background
-            \li vertical, horizontal, disabled, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li \l RangeSlider
-            \li progress
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li
-            \li handle
-            \li first, second, vertical, horizontal, disabled, pressed, focused, mirrored, hovered
-            \li .png
-        \row
-            \li \l RoundButton
-            \li background
-            \li disabled, pressed, checked, checkable, focused, highlighted, flat, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li \l ScrollBar
-            \li background
-            \li vertical, horizontal, disabled, interactive, pressed, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li handle
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l ScrollIndicator
-            \li background
-            \li vertical, horizontal, disabled, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li handle
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l ScrollView
-            \li background
-            \li disabled, mirrored
-            \li .9.png (or .png)
-        \row
-            \li \l Slider
-            \li background
-            \li vertical, horizontal, disabled, pressed, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li handle
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li
-            \li progress
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l SpinBox
-            \li background
-            \li disabled, editable, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li editor
-            \li disabled, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li indicator
-            \li up, down, disabled, editable, pressed, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li \l StackView
-            \li background
-            \li disabled, mirrored
-            \li .9.png (or .png)
-        \row
-            \li \l SwipeDelegate
-            \li background
-            \li disabled, pressed, focused, highlighted, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li \l SwipeView
-            \li background
-            \li vertical, horizontal, disabled, interactive, focused, mirrored
-            \li .9.png (or .png)
-        \row
-            \li \l Switch
-            \li background
-            \li disabled, pressed, checked, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li handle
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li
-            \li indicator
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l SwitchDelegate
-            \li background
-            \li disabled, pressed, checked, focused, highlighted, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li
-            \li handle
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li
-            \li indicator
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l TabBar
-            \li background
-            \li disabled, header, footer, mirrored
-            \li .9.png (or .png)
-        \row
-            \li \l TabButton
-            \li background
-            \li disabled, pressed, checked, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li \l TextArea
-            \li background
-            \li disabled, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li \l TextField
-            \li background
-            \li disabled, focused, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li \l ToolBar
-            \li background
-            \li disabled, header, footer, mirrored
-            \li .9.png (or .png)
-        \row
-            \li \l ToolButton
-            \li background
-            \li disabled, pressed, checked, checkable, focused, highlighted, flat, mirrored, hovered
-            \li .9.png (or .png)
-        \row
-            \li \l ToolSeparator
-            \li background
-            \li vertical, horizontal, disabled, mirrored
-            \li .9.png (or .png)
-        \row
-            \li
-            \li separator
-            \li same as above
-            \li .9.png (or .png)
-        \row
-            \li \l ToolTip
-            \li background
-            \li
-            \li .9.png (or .png)
-        \row
-            \li \l Tumbler
-            \li background
-            \li disabled, focused, mirrored, hovered
-            \li .9.png (or .png)
-    \endtable
-
-    \section2 Asset Examples
-
-    The following table lists examples of assets (taken from the
-    \l {https://code.qt.io/cgit/qt/qtdeclarative.git/tree/src/quickcontrols2/imagine/images}
-    {default Imagine style assets}) for all controls. The list is not
-    exhaustive, as not all elements need assets, but it can be used as a guide
-    when creating your own assets.
-
-    The template that these assets were \l {Exporting 9-Patch Images}
-    {exported from} is available as a
-    \l {https://code.qt.io/cgit/qt/qtdeclarative.git/plain/src/quickcontrols2/imagine/design/imagine.sketch}
-    {Sketch project}.
-
-    \table
-        \header
-            \li Control
-            \li Element
-            \li States
-            \li Asset
-            \li Notes
-        \row
-            \li \l ApplicationWindow
-            \li background
-            \li
-            \li \image imagine/images/applicationwindow-background.png
-            \li \l {sup1}{See footnote} \sup 1
-        \row
-            \li
-            \li overlay
-            \li
-            \li \image imagine/images/applicationwindow-overlay.png
-            \li \l {sup1}{See footnote} \sup 1
-        \row
-            \li
-            \li overlay
-            \li modal
-            \li \image imagine/images/applicationwindow-overlay-modal.png
-            \li \l {sup1}{See footnote} \sup 1
-        \row
-            \li \l Button
-            \li background
-            \li
-            \li \image imagine/images/button-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/button-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/button-background-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/button-background-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked
-            \li \image imagine/images/button-background-checked.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked, disabled
-            \li \image imagine/images/button-background-checked-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked, focused
-            \li \image imagine/images/button-background-checked-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked, hovered
-            \li \image imagine/images/button-background-checked-hovered.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted
-            \li \image imagine/images/button-background-highlighted.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted, disabled
-            \li \image imagine/images/button-background-highlighted-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted, focused
-            \li \image imagine/images/button-background-highlighted-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted, hovered
-            \li \image imagine/images/button-background-highlighted-hovered.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted, pressed
-            \li \image imagine/images/button-background-highlighted-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted, checked
-            \li \image imagine/images/button-background-highlighted-checked.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/button-background-hovered.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li flat
-            \li \image imagine/images/button-background-flat.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li flat, disabled
-            \li \image imagine/images/button-background-flat-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li flat, hovered
-            \li \image imagine/images/button-background-flat-hovered.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li flat, pressed
-            \li \image imagine/images/button-background-flat-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li flat, checked
-            \li \image imagine/images/button-background-flat-checked.9.png
-            \li
-        \row
-            \li \l CheckBox
-            \li indicator
-            \li
-            \li \image imagine/images/checkbox-indicator.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li disabled
-            \li \image imagine/images/checkbox-indicator-disabled.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li pressed
-            \li \image imagine/images/checkbox-indicator-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked
-            \li \image imagine/images/checkbox-indicator-checked.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, pressed
-            \li \image imagine/images/checkbox-indicator-checked-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, hovered
-            \li \image imagine/images/checkbox-indicator-checked-hovered.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, focused
-            \li \image imagine/images/checkbox-indicator-checked-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li partially, checked
-            \li \image imagine/images/checkbox-indicator-partially-checked.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li partially, checked, pressed
-            \li \image imagine/images/checkbox-indicator-partially-checked-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li partially, checked, focused
-            \li \image imagine/images/checkbox-indicator-partially-checked-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li partially, checked, hovered
-            \li \image imagine/images/checkbox-indicator-partially-checked-hovered.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li focused
-            \li \image imagine/images/checkbox-indicator-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li hovered
-            \li \image imagine/images/checkbox-indicator-hovered.png
-            \li
-        \row
-            \li \l CheckDelegate
-            \li background
-            \li
-            \li \image imagine/images/checkdelegate-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/checkdelegate-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/checkdelegate-background-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/checkdelegate-background-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/checkdelegate-background-hovered.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li
-            \li \image imagine/images/checkdelegate-indicator.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li disabled
-            \li \image imagine/images/checkdelegate-indicator-disabled.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li pressed
-            \li \image imagine/images/checkdelegate-indicator-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked
-            \li \image imagine/images/checkdelegate-indicator-checked.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, pressed
-            \li \image imagine/images/checkdelegate-indicator-checked-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, focused
-            \li \image imagine/images/checkdelegate-indicator-checked-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, hovered
-            \li \image imagine/images/checkdelegate-indicator-checked-hovered.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li focused
-            \li \image imagine/images/checkdelegate-indicator-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li hovered
-            \li \image imagine/images/checkdelegate-indicator-hovered.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li partially, checked
-            \li \image imagine/images/checkdelegate-indicator-partially-checked.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li partially, checked, pressed
-            \li \image imagine/images/checkdelegate-indicator-partially-checked-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li partially, checked, focused
-            \li \image imagine/images/checkdelegate-indicator-partially-checked-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li partially, checked, hovered
-            \li \image imagine/images/checkdelegate-indicator-partially-checked-hovered.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li hovered
-            \li \image imagine/images/checkdelegate-indicator-hovered.png
-            \li
-        \row
-            \li \l ComboBox
-            \li background
-            \li
-            \li \image imagine/images/combobox-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/combobox-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/combobox-background-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/combobox-background-hovered.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/combobox-background-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li open
-            \li \image imagine/images/combobox-background-open.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li editable
-            \li \image imagine/images/combobox-background-editable.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li editable, focused
-            \li \image imagine/images/combobox-background-editable-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li editable, disabled
-            \li \image imagine/images/combobox-background-editable-disabled.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li
-            \li \image imagine/images/combobox-indicator.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li disabled
-            \li \image imagine/images/combobox-indicator-disabled.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li editable
-            \li \image imagine/images/combobox-indicator-editable.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li editable, disabled
-            \li \image imagine/images/combobox-indicator-editable-disabled.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li editable, mirrored
-            \li \image imagine/images/combobox-indicator-editable-mirrored.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li editable, mirrored, disabled
-            \li \image imagine/images/combobox-indicator-editable-mirrored-disabled.png
-            \li
-        \row
-            \li
-            \li popup
-            \li
-            \li \image imagine/images/combobox-popup.9.png
-            \li
-        \row
-            \li \l DelayButton
-            \li background
-            \li
-            \li \image imagine/images/delaybutton-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/delaybutton-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled, checked
-            \li \image imagine/images/delaybutton-background-disabled-checked.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/delaybutton-background-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/delaybutton-background-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked
-            \li \image imagine/images/delaybutton-background-checked.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked, focused
-            \li \image imagine/images/delaybutton-background-checked-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked, hovered
-            \li \image imagine/images/delaybutton-background-checked-hovered.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/delaybutton-background-hovered.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li
-            \li \image imagine/images/delaybutton-progress.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li disabled
-            \li \image imagine/images/delaybutton-progress-disabled.9.png
-            \li
-        \row
-            \li
-            \li mask
-            \li
-            \li \image imagine/images/delaybutton-mask.9.png
-            \li
-        \row
-            \li \l Dial
-            \li background
-            \li
-            \li \image imagine/images/dial-background.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/dial-background-disabled.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/dial-background-focused.png
-            \li
-        \row
-            \li
-            \li handle
-            \li
-            \li \image imagine/images/dial-handle.png
-            \li
-        \row
-            \li
-            \li handle
-            \li disabled
-            \li \image imagine/images/dial-handle-disabled.png
-            \li
-        \row
-            \li
-            \li handle
-            \li focused
-            \li \image imagine/images/dial-handle-focused.png
-            \li
-        \row
-            \li
-            \li handle
-            \li focused, pressed
-            \li \image imagine/images/dial-handle-focused-pressed.png
-            \li
-        \row
-            \li
-            \li handle
-            \li focused, hovered
-            \li \image imagine/images/dial-handle-focused-hovered.png
-            \li
-        \row
-            \li
-            \li handle
-            \li pressed
-            \li \image imagine/images/dial-handle-pressed.png
-            \li
-        \row
-            \li
-            \li handle
-            \li hovered
-            \li \image imagine/images/dial-handle-hovered.png
-            \li
-        \row
-            \li \l Dialog
-            \li background
-            \li
-            \li \image imagine/images/dialog-background.9.png
-            \li
-        \row
-            \li
-            \li overlay
-            \li
-            \li \image imagine/images/dialog-overlay.png
-            \li \l {sup1}{See footnote} \sup 1
-        \row
-            \li
-            \li overlay
-            \li modal
-            \li \image imagine/images/dialog-overlay-modal.png
-            \li \l {sup1}{See footnote} \sup 1
-        \row
-            \li \l DialogButtonBox
-            \li background
-            \li
-            \li \image imagine/images/dialogbuttonbox-background.9.png
-            \li
-        \row
-            \li \l Drawer
-            \li background
-            \li left
-            \li \image imagine/images/drawer-background-left.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li right
-            \li \image imagine/images/drawer-background-right.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li top
-            \li \image imagine/images/drawer-background-top.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li bottom
-            \li \image imagine/images/drawer-background-bottom.9.png
-            \li
-        \row
-            \li
-            \li overlay
-            \li
-            \li \image imagine/images/drawer-overlay.png
-            \li \l {sup1}{See footnote} \sup 1
-        \row
-            \li
-            \li overlay
-            \li modal
-            \li \image imagine/images/drawer-overlay-modal.png
-            \li \l {sup1}{See footnote} \sup 1
-        \row
-            \li \l Frame
-            \li background
-            \li
-            \li \image imagine/images/frame-background.9.png
-            \li
-        \row
-            \li \l GroupBox
-            \li background
-            \li
-            \li \image imagine/images/groupbox-background.9.png
-            \li
-        \row
-            \li
-            \li title
-            \li
-            \li \image imagine/images/groupbox-title.9.png
-            \li
-        \row
-            \li \l ItemDelegate
-            \li background
-            \li
-            \li \image imagine/images/itemdelegate-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/itemdelegate-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/itemdelegate-background-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/itemdelegate-background-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/itemdelegate-background-hovered.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted
-            \li \image imagine/images/itemdelegate-background-highlighted.9.png
-            \li
-        \row
-            \li \l Menu
-            \li background
-            \li
-            \li \image imagine/images/menu-background.9.png
-            \li
-        \row
-            \li \l MenuItem
-            \li background
-            \li
-            \li \image imagine/images/menuitem-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted
-            \li \image imagine/images/menuitem-background-highlighted.9.png
-            \li
-        \row
-            \li
-            \li arrow
-            \li
-            \li \image imagine/images/menuitem-arrow.png
-            \li
-        \row
-            \li
-            \li arrow
-            \li mirrored
-            \li \image imagine/images/menuitem-arrow-mirrored.png
-            \li
-        \row
-            \li
-            \li arrow
-            \li disabled
-            \li \image imagine/images/menuitem-arrow-disabled.png
-            \li
-        \row
-            \li
-            \li arrow
-            \li mirrored, disabled
-            \li \image imagine/images/menuitem-arrow-mirrored-disabled.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li
-            \li \image imagine/images/menuitem-indicator.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li disabled
-            \li \image imagine/images/menuitem-indicator-disabled.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li pressed
-            \li \image imagine/images/menuitem-indicator-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked
-            \li \image imagine/images/menuitem-indicator-checked.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, pressed
-            \li \image imagine/images/menuitem-indicator-checked-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, focused
-            \li \image imagine/images/menuitem-indicator-checked-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, hovered
-            \li \image imagine/images/menuitem-indicator-checked-hovered.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li focused
-            \li \image imagine/images/menuitem-indicator-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li hovered
-            \li \image imagine/images/menuitem-indicator-hovered.png
-            \li
-        \row
-            \li \l MenuSeparator
-            \li separator
-            \li
-            \li \image imagine/images/menuseparator-separator.9.png
-            \li
-        \row
-            \li \l Page
-            \li background
-            \li
-            \li \image imagine/images/page-background.png
-            \li \l {sup1}{See footnote} \sup 1
-        \row
-            \li \l PageIndicator
-            \li delegate
-            \li
-            \li \image imagine/images/pageindicator-delegate.png
-            \li
-        \row
-            \li
-            \li delegate
-            \li disabled
-            \li \image imagine/images/pageindicator-delegate-disabled.png
-            \li
-        \row
-            \li
-            \li delegate
-            \li disabled, current
-            \li \image imagine/images/pageindicator-delegate-disabled-current.png
-            \li
-        \row
-            \li
-            \li delegate
-            \li pressed
-            \li \image imagine/images/pageindicator-delegate-pressed.png
-            \li
-        \row
-            \li
-            \li delegate
-            \li current
-            \li \image imagine/images/pageindicator-delegate-current.png
-            \li
-        \row
-            \li \l Pane
-            \li background
-            \li
-            \li \image imagine/images/pane-background.9.png
-            \li
-        \row
-            \li \l Popup
-            \li background
-            \li
-            \li \image imagine/images/popup-background.9.png
-            \li \l {sup1}{See footnote} \sup 1
-        \row
-            \li
-            \li overlay
-            \li
-            \li \image imagine/images/popup-overlay.png
-            \li \l {sup1}{See footnote} \sup 1
-        \row
-            \li
-            \li overlay
-            \li modal
-            \li \image imagine/images/popup-overlay-modal.png
-            \li
-        \row
-            \li \l ProgressBar
-            \li background
-            \li
-            \li \image imagine/images/progressbar-background.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li
-            \li \image imagine/images/progressbar-progress.png
-            \li
-        \row
-            \li
-            \li mask
-            \li
-            \li \image imagine/images/progressbar-mask.9.png
-            \li
-        \row
-            \li \l RadioButton
-            \li indicator
-            \li
-            \li \image imagine/images/radiobutton-indicator.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li disabled
-            \li \image imagine/images/radiobutton-indicator-disabled.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li pressed
-            \li \image imagine/images/radiobutton-indicator-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked
-            \li \image imagine/images/radiobutton-indicator-checked.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, focused
-            \li \image imagine/images/radiobutton-indicator-checked-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, hovered
-            \li \image imagine/images/radiobutton-indicator-checked-hovered.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, pressed
-            \li \image imagine/images/radiobutton-indicator-checked-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li focused
-            \li \image imagine/images/radiobutton-indicator-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li hovered
-            \li \image imagine/images/radiobutton-indicator-hovered.png
-            \li
-        \row
-            \li \l RadioDelegate
-            \li background
-            \li
-            \li \image imagine/images/radiodelegate-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/radiodelegate-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/radiodelegate-background-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/radiodelegate-background-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/radiodelegate-background-hovered.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li
-            \li \image imagine/images/radiodelegate-indicator.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li disabled
-            \li \image imagine/images/radiodelegate-indicator-disabled.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li pressed
-            \li \image imagine/images/radiodelegate-indicator-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked
-            \li \image imagine/images/radiodelegate-indicator-checked.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, focused
-            \li \image imagine/images/radiodelegate-indicator-checked-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, hovered
-            \li \image imagine/images/radiodelegate-indicator-checked-hovered.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, pressed
-            \li \image imagine/images/radiodelegate-indicator-checked-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li focused
-            \li \image imagine/images/radiodelegate-indicator-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li hovered
-            \li \image imagine/images/radiodelegate-indicator-hovered.png
-            \li
-        \row
-            \li \l RangeSlider
-            \li background
-            \li vertical
-            \li \image imagine/images/rangeslider-background-vertical.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li horizontal
-            \li \image imagine/images/rangeslider-background-horizontal.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li vertical
-            \li \image imagine/images/rangeslider-progress-vertical.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li vertical, disabled
-            \li \image imagine/images/rangeslider-progress-vertical-disabled.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li horizontal
-            \li \image imagine/images/rangeslider-progress-horizontal.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li horizontal, disabled
-            \li \image imagine/images/rangeslider-progress-horizontal-disabled.9.png
-            \li
-        \row
-            \li
-            \li handle
-            \li
-            \li \image imagine/images/rangeslider-handle.png
-            \li
-        \row
-            \li
-            \li handle
-            \li disabled
-            \li \image imagine/images/rangeslider-handle-disabled.png
-            \li
-        \row
-            \li
-            \li handle
-            \li focused
-            \li \image imagine/images/rangeslider-handle-focused.png
-            \li
-        \row
-            \li
-            \li handle
-            \li focused, hovered
-            \li \image imagine/images/rangeslider-handle-focused-hovered.png
-            \li
-        \row
-            \li
-            \li handle
-            \li focused, pressed
-            \li \image imagine/images/rangeslider-handle-focused-pressed.png
-            \li
-        \row
-            \li
-            \li handle
-            \li hovered
-            \li \image imagine/images/rangeslider-handle-hovered.png
-            \li
-        \row
-            \li
-            \li handle
-            \li pressed
-            \li \image imagine/images/rangeslider-handle-pressed.png
-            \li
-        \row
-            \li \l RoundButton
-            \li background
-            \li
-            \li \image imagine/images/roundbutton-background.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/roundbutton-background-disabled.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled, checked
-            \li \image imagine/images/roundbutton-background-disabled-checked.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/roundbutton-background-focused.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/roundbutton-background-pressed.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked
-            \li \image imagine/images/roundbutton-background-checked.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked, focused
-            \li \image imagine/images/roundbutton-background-checked-focused.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked, hovered
-            \li \image imagine/images/roundbutton-background-checked-hovered.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted
-            \li \image imagine/images/roundbutton-background-highlighted.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted, pressed
-            \li \image imagine/images/roundbutton-background-highlighted-pressed.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted, focused
-            \li \image imagine/images/roundbutton-background-highlighted-focused.png
-            \li
-        \row
-            \li
-            \li background
-            \li highlighted, hovered
-            \li \image imagine/images/roundbutton-background-highlighted-hovered.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/roundbutton-background-hovered.png
-            \li
-        \row
-            \li \l ScrollBar
-            \li handle
-            \li
-            \li \image imagine/images/scrollbar-handle.png
-            \li
-        \row
-            \li
-            \li handle
-            \li disabled
-            \li \image imagine/images/scrollbar-handle-disabled.png
-            \li
-        \row
-            \li
-            \li handle
-            \li interactive
-            \li \image imagine/images/scrollbar-handle-interactive.png
-            \li
-        \row
-            \li
-            \li handle
-            \li interactive, disabled
-            \li \image imagine/images/scrollbar-handle-interactive-disabled.png
-            \li
-        \row
-            \li
-            \li handle
-            \li interactive, pressed
-            \li \image imagine/images/scrollbar-handle-interactive-pressed.png
-            \li
-        \row
-            \li
-            \li handle
-            \li interactive, hovered
-            \li \image imagine/images/scrollbar-handle-interactive-hovered.png
-            \li
-        \row
-            \li \l ScrollIndicator
-            \li handle
-            \li
-            \li \image imagine/images/scrollindicator-handle.png
-            \li
-        \row
-            \li \l Slider
-            \li background
-            \li vertical
-            \li \image imagine/images/slider-background-vertical.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li horizontal
-            \li \image imagine/images/slider-background-horizontal.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li vertical
-            \li \image imagine/images/slider-progress-vertical.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li vertical, disabled
-            \li \image imagine/images/slider-progress-vertical-disabled.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li horizontal
-            \li \image imagine/images/slider-progress-horizontal.9.png
-            \li
-        \row
-            \li
-            \li progress
-            \li horizontal, disabled
-            \li \image imagine/images/slider-progress-horizontal-disabled.9.png
-            \li
-        \row
-            \li
-            \li handle
-            \li
-            \li \image imagine/images/slider-handle.png
-            \li
-        \row
-            \li
-            \li handle
-            \li disabled
-            \li \image imagine/images/slider-handle-disabled.png
-            \li
-        \row
-            \li
-            \li handle
-            \li focused
-            \li \image imagine/images/slider-handle-focused.png
-            \li
-        \row
-            \li
-            \li handle
-            \li focused, hovered
-            \li \image imagine/images/slider-handle-focused-hovered.png
-            \li
-        \row
-            \li
-            \li handle
-            \li focused, pressed
-            \li \image imagine/images/slider-handle-focused-pressed.png
-            \li
-        \row
-            \li
-            \li handle
-            \li hovered
-            \li \image imagine/images/slider-handle-hovered.png
-            \li
-        \row
-            \li
-            \li handle
-            \li pressed
-            \li \image imagine/images/slider-handle-pressed.png
-            \li
-        \row
-            \li \l SpinBox
-            \li background
-            \li
-            \li \image imagine/images/spinbox-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/spinbox-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/spinbox-background-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li editable
-            \li \image imagine/images/spinbox-background-editable.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up
-            \li \image imagine/images/spinbox-indicator-up.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up, disabled
-            \li \image imagine/images/spinbox-indicator-up-disabled.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up, pressed
-            \li \image imagine/images/spinbox-indicator-up-pressed.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up, focused
-            \li \image imagine/images/spinbox-indicator-up-focused.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up, mirrored
-            \li \image imagine/images/spinbox-indicator-up-mirrored.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up, hovered
-            \li \image imagine/images/spinbox-indicator-up-hovered.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up, editable
-            \li \image imagine/images/spinbox-indicator-up-editable.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up, editable, pressed
-            \li \image imagine/images/spinbox-indicator-up-editable-pressed.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up, editable, focused
-            \li \image imagine/images/spinbox-indicator-up-editable-focused.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up, editable, mirrored
-            \li \image imagine/images/spinbox-indicator-up-editable-mirrored.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li up, editable, hovered
-            \li \image imagine/images/spinbox-indicator-up-editable-hovered.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down
-            \li \image imagine/images/spinbox-indicator-down.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down, disabled
-            \li \image imagine/images/spinbox-indicator-down-disabled.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down, pressed
-            \li \image imagine/images/spinbox-indicator-down-pressed.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down, focused
-            \li \image imagine/images/spinbox-indicator-down-focused.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down, mirrored
-            \li \image imagine/images/spinbox-indicator-down-mirrored.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down, hovered
-            \li \image imagine/images/spinbox-indicator-down-hovered.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down, editable
-            \li \image imagine/images/spinbox-indicator-down-editable.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down, editable, pressed
-            \li \image imagine/images/spinbox-indicator-down-editable-pressed.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down, editable, focused
-            \li \image imagine/images/spinbox-indicator-down-editable-focused.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down, editable, mirrored
-            \li \image imagine/images/spinbox-indicator-down-editable-mirrored.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li down, editable, hovered
-            \li \image imagine/images/spinbox-indicator-down-editable-hovered.9.png
-            \li
-        \row
-            \li \l SwipeDelegate
-            \li background
-            \li
-            \li \image imagine/images/swipedelegate-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/swipedelegate-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/swipedelegate-background-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/swipedelegate-background-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/swipedelegate-background-hovered.9.png
-            \li
-        \row
-            \li \l Switch
-            \li indicator
-            \li
-            \li \image imagine/images/switch-indicator.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li disabled
-            \li \image imagine/images/switch-indicator-disabled.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li pressed
-            \li \image imagine/images/switch-indicator-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked
-            \li \image imagine/images/switch-indicator-checked.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, focused
-            \li \image imagine/images/switch-indicator-checked-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, hovered
-            \li \image imagine/images/switch-indicator-checked-hovered.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, pressed
-            \li \image imagine/images/switch-indicator-checked-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li focused
-            \li \image imagine/images/switch-indicator-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li hovered
-            \li \image imagine/images/switch-indicator-hovered.png
-            \li
-        \row
-            \li
-            \li handle
-            \li
-            \li \image imagine/images/switch-handle.png
-            \li
-        \row
-            \li
-            \li handle
-            \li disabled
-            \li \image imagine/images/switch-handle-disabled.png
-            \li
-        \row
-            \li
-            \li handle
-            \li pressed
-            \li \image imagine/images/switch-handle-pressed.png
-            \li
-        \row
-            \li \l SwitchDelegate
-            \li background
-            \li
-            \li \image imagine/images/switchdelegate-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/switchdelegate-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/switchdelegate-background-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/switchdelegate-background-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/switchdelegate-background-hovered.9.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li
-            \li \image imagine/images/switchdelegate-indicator.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li disabled
-            \li \image imagine/images/switchdelegate-indicator-disabled.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li pressed
-            \li \image imagine/images/switchdelegate-indicator-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked
-            \li \image imagine/images/switchdelegate-indicator-checked.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, focused
-            \li \image imagine/images/switchdelegate-indicator-checked-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, hovered
-            \li \image imagine/images/switchdelegate-indicator-checked-hovered.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li checked, pressed
-            \li \image imagine/images/switchdelegate-indicator-checked-pressed.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li focused
-            \li \image imagine/images/switchdelegate-indicator-focused.png
-            \li
-        \row
-            \li
-            \li indicator
-            \li hovered
-            \li \image imagine/images/switchdelegate-indicator-hovered.png
-            \li
-        \row
-            \li
-            \li handle
-            \li
-            \li \image imagine/images/switchdelegate-handle.png
-            \li
-        \row
-            \li
-            \li handle
-            \li disabled
-            \li \image imagine/images/switchdelegate-handle-disabled.png
-            \li
-        \row
-            \li \l TabBar
-            \li background
-            \li
-            \li \image imagine/images/tabbar-background.png
-            \li
-        \row
-            \li \l TabButton
-            \li background
-            \li
-            \li \image imagine/images/tabbutton-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/tabbutton-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/tabbutton-background-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked
-            \li \image imagine/images/tabbutton-background-checked.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/tabbutton-background-hovered.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled, checked
-            \li \image imagine/images/tabbutton-background-disabled-checked.9.png
-            \li
-        \row
-            \li \l TextArea
-            \li background
-            \li
-            \li \image imagine/images/textarea-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/textarea-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/textarea-background-focused.9.png
-            \li
-        \row
-            \li \l TextField
-            \li background
-            \li
-            \li \image imagine/images/textfield-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled
-            \li \image imagine/images/textfield-background-disabled.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/textfield-background-focused.9.png
-            \li
-        \row
-            \li \l ToolBar
-            \li background
-            \li
-            \li \image imagine/images/toolbar-background.png
-            \li
-        \row
-            \li \l ToolButton
-            \li background
-            \li
-            \li \image imagine/images/toolbutton-background.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li disabled, checked
-            \li \image imagine/images/toolbutton-background-disabled-checked.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li focused
-            \li \image imagine/images/toolbutton-background-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li pressed
-            \li \image imagine/images/toolbutton-background-pressed.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked
-            \li \image imagine/images/toolbutton-background-checked.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked, focused
-            \li \image imagine/images/toolbutton-background-checked-focused.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li checked, hovered
-            \li \image imagine/images/toolbutton-background-checked-hovered.9.png
-            \li
-        \row
-            \li
-            \li background
-            \li hovered
-            \li \image imagine/images/toolbutton-background-hovered.9.png
-            \li
-        \row
-            \li \l ToolSeparator
-            \li separator
-            \li horizontal
-            \li \image imagine/images/toolseparator-separator-horizontal.9.png
-            \li
-        \row
-            \li
-            \li separator
-            \li vertical
-            \li \image imagine/images/toolseparator-separator-vertical.9.png
-            \li
-        \row
-            \li \l ToolTip
-            \li background
-            \li
-            \li \image imagine/images/tooltip-background.9.png
-            \li
-    \endtable
-
-    \target sup1
-    \sup 1 A 1x1 image containing one color, stretched to fill the control.
-
-    \section2 9-Patch Images
-
-    The Imagine style uses \l
-    {https://developer.android.com/guide/topics/graphics/2d-graphics.html#nine-patch}{9-patch
-    images} in order to give designers control over how a particular element
-    responds to being resized. Here is an example of a 9-patch image that
-    represents a \l {Button}'s \l {Control::}{background}, alongside a
-    magnified version (to make it easier to see the 9-patch lines):
-
-    \image qtquickcontrols2-imagine-9-patch-4x.png
-
-    The content of the image is 44 pixels wide by 32 pixels high. Every 9-patch
-    image needs a one pixel thick line (collectively referred to as
-    "9-patch lines") around every side, so the actual size of the image becomes
-    46 pixels wide by 34 pixels high. Note that the 9-patch lines must be one
-    pixel thick regardless of the target DPI of the image. For example,
-    the 9-patch lines for button-background.9.png and button-background@2x.9.png
-    must both be one pixel thick.
-
-    The 9-patch lines must be black, and the remaining areas must be transparent
-    or white:
-
-    \image qtquickcontrols2-imagine-9-patch-size.png
-
-    \section3 Stretchable Areas
-
-    The 9-patch lines on the top and left edges determine which parts of the
-    image are stretched when it is resized.
-
-    Below are examples of the 9-patch image being resized to one and a half
-    times its original size in various dimensions:
-
-    \image qtquickcontrols2-imagine-9-patch-resized-stretchable.png
-
-    Notice how the the rounded corners keep their original size, as they are
-    outside the range of the lines.
-
-    \section3 Padding Areas
-
-    The 9-patch lines on the right and bottom edges determine how much space
-    is available for the control's \l {Control::}{contentItem}, which means it
-    can also be thought of as controlling the \l {Control::}{padding}. For a
-    diagram that illustrates padding, see \l {Control Layout}.
-
-    Below are more examples of the 9-patch image being resized, but this time
-    demonstrating how the padding 9-patch lines work.
-
-    \image qtquickcontrols2-imagine-9-patch-resized-padding.png
-
-    The \c contentItem can take up as much space as it needs within the shaded
-    areas. If the padding lines are left out, the \c contentItem will take as
-    much space as it needs without exceeding the stretchable areas.
-
-    \section3 Inset Areas
-
-    In some cases it is necessary for a control to have a drop shadow, for
-    example. However, if we were to add a drop shadow to the button above, it
-    would affect its size, which presents problems for both layouting and
-    mouse/touch input boundaries.
-
-    Inset areas accounts for this by telling the control that a certain area of
-    the 9-patch image should go outside of the control:
-
-    \image qtquickcontrols2-imagine-9-patch-inset.png
-
-    In the image below, the dashed line represents the button's clickable area,
-    as well as the space that it will take up in a layout. The shadow is marked
-    by the striped area behind it:
-
-    \image qtquickcontrols2-imagine-9-patch-inset-boundaries.png
-
-    \section3 Exporting 9-Patch Images
-
-    Various vector and bitmap editors can be used to create 9-patch images
-    suitable for use with the Imagine style. The following sections briefly
-    explain the export process for each editor, and the last section explains
-    how to ensure the exported images are 9-patch-conformant.
-
-    \section4 Affinity Designer
-
-    See Affinity's \l {https://affinity.help/publisher/en-US.lproj/pages/Publishing/exportSettings.html}
-    {Export Settings} documentation.
-
-    \section4 Adobe Illustrator
-
-    See Adobe's
-    \l {https://helpx.adobe.com/in/illustrator/using/collect-assets-export-for-screens.html#panel}
-    {Asset Export panel} documentation.
-
-    \section4 Adobe Photoshop
-
-    See Adobe's
-    \l {https://helpx.adobe.com/photoshop/using/generate-assets-layers.html}
-    {Generate image assets from layers} documentation.
-
-    \section4 Inkscape
-
-    The \l {https://github.com/mitchcurtis/inkscape-9-patch-export}
-    {Inkscape 9-Patch Export Extension} can be used to export assets with
-    Inkscape.
-
-    \section4 Sketch
-
-    See Sketch's \l {https://sketchapp.com/docs/exporting/}{Exporting} documentation.
-
-    Qt Quick Controls also provides a
-    \l {http://code.qt.io/cgit/qt/qtdeclarative.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,
-    the plugin will automatically process images when they are exported.
-
-    \section4 Fixing 9-Patch Lines
-
-    When exporting 9-patch images in several DPI variants (\c {@2x}, \c {@3x},
-    etc.), the 9-patch lines will typically be scaled up along with the image.
-    There are several ways to fix this, but perhaps the simplest approach is
-    to use \l {https://www.imagemagick.org/script/mogrify.php}{ImageMagick's mogrify}
-    tool. The tool has a \c -shave feature that can be used to crop the image
-    to reduce the thickness of the 9-patch lines:
-
-    \badcode
-    mogrify -shave 1x1 -path path/to/images *@2x.9.png
-    mogrify -shave 2x2 -path path/to/images *@3x.9.png
-    mogrify -shave 3x3 -path path/to/images *@4x.9.png
-    \endcode
-
-    Regular DPI images (those without the \c @Nx prefix) are not affected, so it
-    is only necessary to run the command on images intended for high DPI displays.
-
-    \section2 Animated Images
-
-    The \l {https://developers.google.com/speed/webp/}{WebP} and GIF animated
-    image formats are supported by the Imagine style.
-
-    \section2 Customization
-
-    \section3 Path
-
-    The Imagine style allows customizing the \l {imagine-path-attached-prop}{path}
-    that is used to do the image asset selection. The path can be specified for any
-    window or item, and it automatically propagates to children in the same manner as
-    \l {Control::font}{fonts}. In the following example, the window and all three radio
-    buttons appear with dark image assets (files that are located in "qrc:/themes/dark").
-
-    \table
-        \row
-            \li
-                \qml
-                import QtQuick 2.12
-                import QtQuick.Controls 2.12
-                import QtQuick.Controls.Imagine 2.12
-
-                ApplicationWindow {
-                    visible: true
-
-                    Imagine.path: "qrc:/themes/dark"
-
-                    Column {
-                        anchors.centerIn: parent
-
-                        RadioButton { text: qsTr("Small") }
-                        RadioButton { text: qsTr("Medium"); checked: true }
-                        RadioButton { text: qsTr("Large") }
-                    }
-                }
-                \endqml
-            \li
-                \image qtquickcontrols2-imagine-customization-dark.png
-    \endtable
-
-    In addition to specifying the path in QML, it is also possible to specify
-    it via an \l {imagine-customization-environment-variable}{environment variable}
-    or in a \l {imagine-customization-configuration-file}{configuration file}.
-    Attributes specified in QML take precedence over all other methods.
-
-    \section4 Configuration File
-    \target imagine-customization-configuration-file
-
-    \include qquickimaginestyle.qdocinc conf
-
-    See \l {Qt Quick Controls Configuration File} for more details about the
-    configuration file.
-
-    \section4 Environment Variables
-    \target imagine-customization-environment-variable
-
-    \include qquickimaginestyle.qdocinc env
-
-    See \l {Supported Environment Variables in Qt Quick Controls} for the full
-    list of supported environment variables.
-
-    \section3 Palette
-
-    The Imagine style supports palette customization via the \l {Item::}{palette}
-    property and the \l {Palette Configuration}{qtquickcontrols2.conf} file.
-    As with other styles, the exact \l[QML]{Palette}{palette roles}
-    that the Imagine style uses are style-dependent. However, as most of the visual
-    appearance of controls (for example: backgrounds) are managed through image assets,
-    only the roles that are typically used for text will have an effect.
-
-    \section3 Font
-
-    Custom fonts can be set via the \l {Control::}{font} property and the
-    \l {Font Configuration}{configuration} file.
-
-    \section2 Dependency
-
-    The Imagine style must be separately imported to gain access to the
-    attributes that are specific to the Imagine style. It should be noted
-    that regardless of the references to the Imagine style, the same
-    application code runs with any other style. Imagine-specific attributes
-    only have an effect when the application is run with the Imagine style.
-
-    If the Imagine style is imported in a QML file that is always loaded, the
-    Imagine style must be deployed with the application in order to be able
-    to run the application regardless of which style the application is run with.
-    By using \l {Using File Selectors with Qt Quick Controls}{file selectors},
-    style-specific tweaks can be applied without creating a hard dependency to
-    a style.
-
-    \b {See also} \l {Styling Qt Quick Controls}
-
-    \section1 Attached Property Documentation
-
-    \styleproperty {Imagine.path} {string} {imagine-path-attached-prop}
-    \target imagine-path-attached-prop
-    This attached property holds the path to the image assets...
-
-    \code
-    Button {
-        Imagine.path: "qrc:/themes/dark"
-    }
-    \endcode
-
-    \endstyleproperty
-
-    \section1 Related Information
-
-    \list
-      \li \l{Styling Qt Quick Controls}
-      \li \l{Qt Quick Controls - Imagine Style Example: Automotive}{Automotive Example}
-      \li \l{Qt Quick Controls - Imagine Style Example: Music Player}{Music Player Example}
-    \endlist
-*/
diff --git a/src/quickcontrols2/qquickattachedpropertypropagator.cpp b/src/quickcontrols2/qquickattachedpropertypropagator.cpp
deleted file mode 100644
index 07bcb93d7f..0000000000
--- a/src/quickcontrols2/qquickattachedpropertypropagator.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-#include "qquickattachedpropertypropagator.h"
-
-#include <QtCore/qpointer.h>
-#include <QtQuick/qquickwindow.h>
-#include <QtQuick/private/qquickitem_p.h>
-#include <QtQuick/private/qquickitemchangelistener_p.h>
-#include <QtQuickTemplates2/private/qquickpopup_p.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QQuickAttachedPropertyPropagator
-    \brief The QQuickAttachedPropertyPropagator class provides a way to
-    propagate attached properties.
-    \inmodule QtQuickControls2
-    \since 6.5
-
-    In QML, it is possible to
-    \l {Attached Properties and Attached Signal Handlers}{attach properties and
-    signal handlers} to objects. \l {Providing Attached Properties} goes into more
-    detail about how to expose your own C++ attached types.
-
-    QQuickAttachedPropertyPropagator provides an API to propagate attached
-    properties from a parent object to its children, similar to
-    \l {Control::}{font} and \l {Item::}{palette} propagation. It supports
-    propagation through \l {Item}{items}, \l {Popup}{popups}, and
-    \l {Window}{windows}.
-
-    If propagation of properties is not important, consider using a
-    \l {QML_SINGLETON}{C++} or
-    \l {Contents of a Module Definition qmldir File}{QML} singleton instead,
-    as it is better suited for that use case, and is more efficient in that
-    it only requires one QObject.
-
-    To use QQuickAttachedPropertyPropagator:
-    \list
-    \li Derive from it
-    \li Call \l initialize() in the constructor
-    \li Define set/inherit/propagate/reset functions for each property as needed
-    \li Reimplement \l attachedParentChange() to handle property inheritance
-    \endlist
-
-    For an example that demonstrates this in depth, see
-    \l {Qt Quick Controls - Attached Style Properties Example}.
-
-    \sa {Styling Qt Quick Controls}
-*/
-
-static QQuickAttachedPropertyPropagator *attachedObject(const QMetaObject *type, QObject *object, bool create = false)
-{
-    if (!object)
-        return nullptr;
-    auto func = qmlAttachedPropertiesFunction(object, type);
-    return qobject_cast<QQuickAttachedPropertyPropagator *>(qmlAttachedPropertiesObject(object, func, create));
-}
-
-/*!
-    \internal
-
-    Tries to find a QQuickAttachedPropertyPropagator whose type is \a ourAttachedType
-    and is attached to an ancestor of \a objectWeAreAttachedTo.
-
-    QQuickAttachedPropertyPropagator needs to know who its parent attached object is in
-    order to inherit attached property values from it. This is called when an
-    instance of QQuickAttachedPropertyPropagator is created, and whenever
-    \c {objectWeAreAttachedTo}'s parent changes, for example.
-*/
-static QQuickAttachedPropertyPropagator *findAttachedParent(const QMetaObject *ourAttachedType, QObject *objectWeAreAttachedTo)
-{
-    QQuickItem *item = qobject_cast<QQuickItem *>(objectWeAreAttachedTo);
-    if (item) {
-        // lookup parent items and popups
-        QQuickItem *parent = item->parentItem();
-        while (parent) {
-            QQuickAttachedPropertyPropagator *attached = attachedObject(ourAttachedType, parent);
-            if (attached)
-                return attached;
-
-            QQuickPopup *popup = qobject_cast<QQuickPopup *>(parent->parent());
-            if (popup)
-                return attachedObject(ourAttachedType, popup);
-
-            parent = parent->parentItem();
-        }
-
-        // fallback to item's window
-        QQuickAttachedPropertyPropagator *attached = attachedObject(ourAttachedType, item->window());
-        if (attached)
-            return attached;
-    } else {
-        // lookup popup's window
-        QQuickPopup *popup = qobject_cast<QQuickPopup *>(objectWeAreAttachedTo);
-        if (popup)
-            return attachedObject(ourAttachedType, popup->popupItem()->window());
-    }
-
-    // lookup parent window
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(objectWeAreAttachedTo);
-    if (window) {
-        // It doesn't seem like a parent window can be anything but transient in Qt Quick.
-        QQuickWindow *parentWindow = qobject_cast<QQuickWindow *>(window->transientParent());
-        if (parentWindow) {
-            QQuickAttachedPropertyPropagator *attached = attachedObject(ourAttachedType, parentWindow);
-            if (attached)
-                return attached;
-        }
-    }
-
-    // fallback to engine (global)
-    if (objectWeAreAttachedTo) {
-        QQmlEngine *engine = qmlEngine(objectWeAreAttachedTo);
-        if (engine) {
-            QByteArray name = QByteArray("_q_") + ourAttachedType->className();
-            QQuickAttachedPropertyPropagator *attached = engine->property(name).value<QQuickAttachedPropertyPropagator *>();
-            if (!attached) {
-                attached = attachedObject(ourAttachedType, engine, true);
-                engine->setProperty(name, QVariant::fromValue(attached));
-            }
-            return attached;
-        }
-    }
-
-    return nullptr;
-}
-
-static QList<QQuickAttachedPropertyPropagator *> findAttachedChildren(const QMetaObject *type, QObject *object)
-{
-    QList<QQuickAttachedPropertyPropagator *> children;
-
-    QQuickItem *item = qobject_cast<QQuickItem *>(object);
-    if (!item) {
-        QQuickWindow *window = qobject_cast<QQuickWindow *>(object);
-        if (window)
-            item = window->contentItem();
-    }
-
-    if (!item)
-        return children;
-
-    // At this point, "item" could either be an item that the attached object is
-    // attached to directly, or the contentItem of a window that the attached object
-    // is attached to.
-
-    // Look for attached properties on items.
-    const auto childItems = item->childItems();
-    for (QQuickItem *child : childItems) {
-        QQuickAttachedPropertyPropagator *attached = attachedObject(type, child);
-        if (attached)
-            children += attached;
-        else
-            children += findAttachedChildren(type, child);
-    }
-
-    // Look for attached properties on windows. Windows declared in QML
-    // as children of a Window are QObject-parented to the contentItem (see
-    // QQuickWindowPrivate::data_append()). Windows declared as children
-    // of items are QObject-parented to those items.
-    const auto &windowChildren = item->children();
-    for (QObject *child : windowChildren) {
-        QQuickWindow *childWindow = qobject_cast<QQuickWindow *>(child);
-        if (childWindow) {
-            QQuickAttachedPropertyPropagator *attached = attachedObject(type, childWindow);
-            if (attached)
-                children += attached;
-        }
-    }
-
-    return children;
-}
-
-static QQuickItem *findAttachedItem(QObject *parent)
-{
-    QQuickItem *item = qobject_cast<QQuickItem *>(parent);
-    if (!item) {
-        QQuickPopup *popup = qobject_cast<QQuickPopup *>(parent);
-        if (popup)
-            item = popup->popupItem();
-    }
-    return item;
-}
-
-class QQuickAttachedPropertyPropagatorPrivate : public QObjectPrivate, public QQuickItemChangeListener
-{
-public:
-    Q_DECLARE_PUBLIC(QQuickAttachedPropertyPropagator)
-
-    static QQuickAttachedPropertyPropagatorPrivate *get(QQuickAttachedPropertyPropagator *attachedObject)
-    {
-        return attachedObject->d_func();
-    }
-
-    void attachTo(QObject *object);
-    void detachFrom(QObject *object);
-    void setAttachedParent(QQuickAttachedPropertyPropagator *parent);
-
-    void itemWindowChanged(QQuickWindow *window);
-    void itemParentChanged(QQuickItem *item, QQuickItem *parent) override;
-
-    QList<QQuickAttachedPropertyPropagator *> attachedChildren;
-    QPointer<QQuickAttachedPropertyPropagator> attachedParent;
-};
-
-void QQuickAttachedPropertyPropagatorPrivate::attachTo(QObject *object)
-{
-    QQuickItem *item = findAttachedItem(object);
-    if (item) {
-        connect(item, &QQuickItem::windowChanged, this, &QQuickAttachedPropertyPropagatorPrivate::itemWindowChanged);
-        QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Parent);
-    }
-}
-
-void QQuickAttachedPropertyPropagatorPrivate::detachFrom(QObject *object)
-{
-    QQuickItem *item = findAttachedItem(object);
-    if (item) {
-        disconnect(item, &QQuickItem::windowChanged, this, &QQuickAttachedPropertyPropagatorPrivate::itemWindowChanged);
-        QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Parent);
-    }
-}
-
-/*!
-    \internal
-
-    This function sets the attached parent of this attached object.
-
-    Currently it is called when:
-    \list
-    \li The target item's parent changes.
-    \li The target item's window changes.
-    \li The attached object is constructed, to set the attached parent
-        and the attached parent of the attached object children.
-    \li The attached object is destructed.
-    \endlist
-
-    \quotefromfile ../../examples/quickcontrols2/attachedstyleproperties/MyStyle/mystyle.cpp
-    \skipto MyStyle::resetTheme
-    \printuntil }
-*/
-void QQuickAttachedPropertyPropagatorPrivate::setAttachedParent(QQuickAttachedPropertyPropagator *parent)
-{
-    Q_Q(QQuickAttachedPropertyPropagator);
-    if (attachedParent == parent)
-        return;
-
-    QQuickAttachedPropertyPropagator *oldParent = attachedParent;
-    if (attachedParent)
-        QQuickAttachedPropertyPropagatorPrivate::get(attachedParent)->attachedChildren.removeOne(q);
-    attachedParent = parent;
-    if (parent)
-        QQuickAttachedPropertyPropagatorPrivate::get(parent)->attachedChildren.append(q);
-    q->attachedParentChange(parent, oldParent);
-}
-
-void QQuickAttachedPropertyPropagatorPrivate::itemWindowChanged(QQuickWindow *window)
-{
-    Q_Q(QQuickAttachedPropertyPropagator);
-    QQuickAttachedPropertyPropagator *attachedParent = nullptr;
-    QQuickItem *item = qobject_cast<QQuickItem *>(q->sender());
-    if (item)
-        attachedParent = findAttachedParent(q->metaObject(), item);
-    if (!attachedParent)
-        attachedParent = attachedObject(q->metaObject(), window);
-    setAttachedParent(attachedParent);
-}
-
-void QQuickAttachedPropertyPropagatorPrivate::itemParentChanged(QQuickItem *item, QQuickItem *parent)
-{
-    Q_Q(QQuickAttachedPropertyPropagator);
-    Q_UNUSED(parent);
-    setAttachedParent(findAttachedParent(q->metaObject(), item));
-}
-
-/*!
-    Constructs a QQuickAttachedPropertyPropagator with the given \a parent.
-
-    The \c parent will be used to find this object's
-    \l {attachedParent()}{attached parent}.
-
-    Derived classes should call \l initialize() in their constructor.
-*/
-QQuickAttachedPropertyPropagator::QQuickAttachedPropertyPropagator(QObject *parent)
-    : QObject(*(new QQuickAttachedPropertyPropagatorPrivate), parent)
-{
-    Q_D(QQuickAttachedPropertyPropagator);
-    d->attachTo(parent);
-}
-
-/*!
-    Destroys the QQuickAttachedPropertyPropagator.
-*/
-QQuickAttachedPropertyPropagator::~QQuickAttachedPropertyPropagator()
-{
-    Q_D(QQuickAttachedPropertyPropagator);
-    d->detachFrom(parent());
-    d->setAttachedParent(nullptr);
-}
-
-/*!
-    This function returns the attached children of this attached object.
-
-    The attached children are used when propagating property values:
-
-    \quotefromfile ../../examples/quickcontrols2/attachedstyleproperties/MyStyle/mystyle.cpp
-    \skipto MyStyle::propagateTheme
-    \printuntil }
-    \printuntil }
-*/
-QList<QQuickAttachedPropertyPropagator *> QQuickAttachedPropertyPropagator::attachedChildren() const
-{
-    Q_D(const QQuickAttachedPropertyPropagator);
-    return d->attachedChildren;
-}
-
-/*!
-    This function returns the attached parent of this attached object.
-
-    The attached parent is used when inheriting property values:
-
-    \quotefromfile ../../examples/quickcontrols2/attachedstyleproperties/MyStyle/mystyle.cpp
-    \skipto MyStyle::resetTheme
-    \printuntil }
-*/
-QQuickAttachedPropertyPropagator *QQuickAttachedPropertyPropagator::attachedParent() const
-{
-    Q_D(const QQuickAttachedPropertyPropagator);
-    return d->attachedParent;
-}
-
-/*!
-    Finds and sets the attached parent for this attached object, and then does
-    the same for its children. This must be called upon construction of the
-    attached object in order for propagation to work.
-
-    It can be useful to read global/default values before calling this
-    function. For example, before calling \c initialize(), the
-    \l {Imagine Style}{Imagine} style checks a static "globalsInitialized" flag
-    to see if it should read default values from \l QSettings. The values from
-    that file form the basis for any attached property values that have not
-    been explicitly set.
-
-    \quotefromfile ../../examples/quickcontrols2/attachedstyleproperties/MyStyle/mystyle.cpp
-    \skipto MyStyle::MyStyle
-    \printuntil }
-*/
-void QQuickAttachedPropertyPropagator::initialize()
-{
-    Q_D(QQuickAttachedPropertyPropagator);
-    QQuickAttachedPropertyPropagator *attachedParent = findAttachedParent(metaObject(), parent());
-    if (attachedParent)
-        d->setAttachedParent(attachedParent);
-
-    const QList<QQuickAttachedPropertyPropagator *> attachedChildren = findAttachedChildren(metaObject(), parent());
-    for (QQuickAttachedPropertyPropagator *child : attachedChildren)
-        QQuickAttachedPropertyPropagatorPrivate::get(child)->setAttachedParent(this);
-}
-
-/*!
-    This function is called whenever the attached parent of this
-    QQuickAttachedPropertyPropagator changes from \a oldParent to \a newParent.
-
-    Subclasses should reimplement this function to inherit attached properties
-    from \c newParent.
-
-    \quotefromfile ../../examples/quickcontrols2/attachedstyleproperties/MyStyle/mystyle.cpp
-    \skipto attachedParentChange
-    \printuntil }
-    \printuntil }
-*/
-void QQuickAttachedPropertyPropagator::attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent)
-{
-    Q_UNUSED(newParent);
-    Q_UNUSED(oldParent);
-}
-
-QT_END_NAMESPACE
-
-#include "moc_qquickattachedpropertypropagator.cpp"
diff --git a/src/quickcontrols2impl/CMakeLists.txt b/src/quickcontrolsimpl/CMakeLists.txt
index acbc91b15e..acbc91b15e 100644
--- a/src/quickcontrols2impl/CMakeLists.txt
+++ b/src/quickcontrolsimpl/CMakeLists.txt
diff --git a/src/quickcontrols2impl/qquickanimatednode.cpp b/src/quickcontrolsimpl/qquickanimatednode.cpp
index 542955235b..542955235b 100644
--- a/src/quickcontrols2impl/qquickanimatednode.cpp
+++ b/src/quickcontrolsimpl/qquickanimatednode.cpp
diff --git a/src/quickcontrols2impl/qquickanimatednode_p.h b/src/quickcontrolsimpl/qquickanimatednode_p.h
index a893e7eecc..a893e7eecc 100644
--- a/src/quickcontrols2impl/qquickanimatednode_p.h
+++ b/src/quickcontrolsimpl/qquickanimatednode_p.h
diff --git a/src/quickcontrols2impl/qquickchecklabel.cpp b/src/quickcontrolsimpl/qquickchecklabel.cpp
index c08cdcb521..c08cdcb521 100644
--- a/src/quickcontrols2impl/qquickchecklabel.cpp
+++ b/src/quickcontrolsimpl/qquickchecklabel.cpp
diff --git a/src/quickcontrols2impl/qquickchecklabel_p.h b/src/quickcontrolsimpl/qquickchecklabel_p.h
index 2419433c68..2419433c68 100644
--- a/src/quickcontrols2impl/qquickchecklabel_p.h
+++ b/src/quickcontrolsimpl/qquickchecklabel_p.h
diff --git a/src/quickcontrols2impl/qquickclippedtext.cpp b/src/quickcontrolsimpl/qquickclippedtext.cpp
index 8ee8d5eb3b..8ee8d5eb3b 100644
--- a/src/quickcontrols2impl/qquickclippedtext.cpp
+++ b/src/quickcontrolsimpl/qquickclippedtext.cpp
diff --git a/src/quickcontrols2impl/qquickclippedtext_p.h b/src/quickcontrolsimpl/qquickclippedtext_p.h
index 4ae1c05f3f..4ae1c05f3f 100644
--- a/src/quickcontrols2impl/qquickclippedtext_p.h
+++ b/src/quickcontrolsimpl/qquickclippedtext_p.h
diff --git a/src/quickcontrols2impl/qquickcolor.cpp b/src/quickcontrolsimpl/qquickcolor.cpp
index 68c1a62fd9..68c1a62fd9 100644
--- a/src/quickcontrols2impl/qquickcolor.cpp
+++ b/src/quickcontrolsimpl/qquickcolor.cpp
diff --git a/src/quickcontrols2impl/qquickcolor_p.h b/src/quickcontrolsimpl/qquickcolor_p.h
index 994b3e988d..994b3e988d 100644
--- a/src/quickcontrols2impl/qquickcolor_p.h
+++ b/src/quickcontrolsimpl/qquickcolor_p.h
diff --git a/src/quickcontrols2impl/qquickcolorimage.cpp b/src/quickcontrolsimpl/qquickcolorimage.cpp
index 5ad6d7d296..5ad6d7d296 100644
--- a/src/quickcontrols2impl/qquickcolorimage.cpp
+++ b/src/quickcontrolsimpl/qquickcolorimage.cpp
diff --git a/src/quickcontrols2impl/qquickcolorimage_p.h b/src/quickcontrolsimpl/qquickcolorimage_p.h
index c321438d8c..c321438d8c 100644
--- a/src/quickcontrols2impl/qquickcolorimage_p.h
+++ b/src/quickcontrolsimpl/qquickcolorimage_p.h
diff --git a/src/quickcontrols2impl/qquickiconimage.cpp b/src/quickcontrolsimpl/qquickiconimage.cpp
index f5a14f3110..f5a14f3110 100644
--- a/src/quickcontrols2impl/qquickiconimage.cpp
+++ b/src/quickcontrolsimpl/qquickiconimage.cpp
diff --git a/src/quickcontrols2impl/qquickiconimage_p.h b/src/quickcontrolsimpl/qquickiconimage_p.h
index d46bbab9f4..d46bbab9f4 100644
--- a/src/quickcontrols2impl/qquickiconimage_p.h
+++ b/src/quickcontrolsimpl/qquickiconimage_p.h
diff --git a/src/quickcontrols2impl/qquickiconimage_p_p.h b/src/quickcontrolsimpl/qquickiconimage_p_p.h
index 6b468fa15e..6b468fa15e 100644
--- a/src/quickcontrols2impl/qquickiconimage_p_p.h
+++ b/src/quickcontrolsimpl/qquickiconimage_p_p.h
diff --git a/src/quickcontrols2impl/qquickiconlabel.cpp b/src/quickcontrolsimpl/qquickiconlabel.cpp
index 7d1561795b..7d1561795b 100644
--- a/src/quickcontrols2impl/qquickiconlabel.cpp
+++ b/src/quickcontrolsimpl/qquickiconlabel.cpp
diff --git a/src/quickcontrols2impl/qquickiconlabel_p.h b/src/quickcontrolsimpl/qquickiconlabel_p.h
index ac3e452c74..ac3e452c74 100644
--- a/src/quickcontrols2impl/qquickiconlabel_p.h
+++ b/src/quickcontrolsimpl/qquickiconlabel_p.h
diff --git a/src/quickcontrols2impl/qquickiconlabel_p_p.h b/src/quickcontrolsimpl/qquickiconlabel_p_p.h
index 8efdd56e21..8efdd56e21 100644
--- a/src/quickcontrols2impl/qquickiconlabel_p_p.h
+++ b/src/quickcontrolsimpl/qquickiconlabel_p_p.h
diff --git a/src/quickcontrols2impl/qquickimageselector.cpp b/src/quickcontrolsimpl/qquickimageselector.cpp
index 35f6555684..35f6555684 100644
--- a/src/quickcontrols2impl/qquickimageselector.cpp
+++ b/src/quickcontrolsimpl/qquickimageselector.cpp
diff --git a/src/quickcontrols2impl/qquickimageselector_p.h b/src/quickcontrolsimpl/qquickimageselector_p.h
index 02eab385fb..02eab385fb 100644
--- a/src/quickcontrols2impl/qquickimageselector_p.h
+++ b/src/quickcontrolsimpl/qquickimageselector_p.h
diff --git a/src/quickcontrols2impl/qquickitemgroup.cpp b/src/quickcontrolsimpl/qquickitemgroup.cpp
index ea847d2da9..ea847d2da9 100644
--- a/src/quickcontrols2impl/qquickitemgroup.cpp
+++ b/src/quickcontrolsimpl/qquickitemgroup.cpp
diff --git a/src/quickcontrols2impl/qquickitemgroup_p.h b/src/quickcontrolsimpl/qquickitemgroup_p.h
index a1ce320d1c..a1ce320d1c 100644
--- a/src/quickcontrols2impl/qquickitemgroup_p.h
+++ b/src/quickcontrolsimpl/qquickitemgroup_p.h
diff --git a/src/quickcontrols2impl/qquickmnemoniclabel.cpp b/src/quickcontrolsimpl/qquickmnemoniclabel.cpp
index 982ffeeb66..982ffeeb66 100644
--- a/src/quickcontrols2impl/qquickmnemoniclabel.cpp
+++ b/src/quickcontrolsimpl/qquickmnemoniclabel.cpp
diff --git a/src/quickcontrols2impl/qquickmnemoniclabel_p.h b/src/quickcontrolsimpl/qquickmnemoniclabel_p.h
index 825df61e9c..825df61e9c 100644
--- a/src/quickcontrols2impl/qquickmnemoniclabel_p.h
+++ b/src/quickcontrolsimpl/qquickmnemoniclabel_p.h
diff --git a/src/quickcontrols2impl/qquickninepatchimage.cpp b/src/quickcontrolsimpl/qquickninepatchimage.cpp
index 3f8a9e03e9..3f8a9e03e9 100644
--- a/src/quickcontrols2impl/qquickninepatchimage.cpp
+++ b/src/quickcontrolsimpl/qquickninepatchimage.cpp
diff --git a/src/quickcontrols2impl/qquickninepatchimage_p.h b/src/quickcontrolsimpl/qquickninepatchimage_p.h
index 0c5777bcfa..0c5777bcfa 100644
--- a/src/quickcontrols2impl/qquickninepatchimage_p.h
+++ b/src/quickcontrolsimpl/qquickninepatchimage_p.h
diff --git a/src/quickcontrols2impl/qquickpaddedrectangle.cpp b/src/quickcontrolsimpl/qquickpaddedrectangle.cpp
index 5115161c31..5115161c31 100644
--- a/src/quickcontrols2impl/qquickpaddedrectangle.cpp
+++ b/src/quickcontrolsimpl/qquickpaddedrectangle.cpp
diff --git a/src/quickcontrols2impl/qquickpaddedrectangle_p.h b/src/quickcontrolsimpl/qquickpaddedrectangle_p.h
index c7cec6fe52..c7cec6fe52 100644
--- a/src/quickcontrols2impl/qquickpaddedrectangle_p.h
+++ b/src/quickcontrolsimpl/qquickpaddedrectangle_p.h
diff --git a/src/quickcontrols2impl/qquickplaceholdertext.cpp b/src/quickcontrolsimpl/qquickplaceholdertext.cpp
index 5f47a4087d..5f47a4087d 100644
--- a/src/quickcontrols2impl/qquickplaceholdertext.cpp
+++ b/src/quickcontrolsimpl/qquickplaceholdertext.cpp
diff --git a/src/quickcontrols2impl/qquickplaceholdertext_p.h b/src/quickcontrolsimpl/qquickplaceholdertext_p.h
index 81434cc65c..81434cc65c 100644
--- a/src/quickcontrols2impl/qquickplaceholdertext_p.h
+++ b/src/quickcontrolsimpl/qquickplaceholdertext_p.h
diff --git a/src/quickcontrols2impl/qquickplatformtheme.cpp b/src/quickcontrolsimpl/qquickplatformtheme.cpp
index c9f4fa9bdb..c9f4fa9bdb 100644
--- a/src/quickcontrols2impl/qquickplatformtheme.cpp
+++ b/src/quickcontrolsimpl/qquickplatformtheme.cpp
diff --git a/src/quickcontrols2impl/qquickplatformtheme_p.h b/src/quickcontrolsimpl/qquickplatformtheme_p.h
index 85cd81f50c..85cd81f50c 100644
--- a/src/quickcontrols2impl/qquickplatformtheme_p.h
+++ b/src/quickcontrolsimpl/qquickplatformtheme_p.h
diff --git a/src/quickcontrols2impl/qquicktumblerview.cpp b/src/quickcontrolsimpl/qquicktumblerview.cpp
index 785791d117..785791d117 100644
--- a/src/quickcontrols2impl/qquicktumblerview.cpp
+++ b/src/quickcontrolsimpl/qquicktumblerview.cpp
diff --git a/src/quickcontrols2impl/qquicktumblerview_p.h b/src/quickcontrolsimpl/qquicktumblerview_p.h
index f9e01f2821..f9e01f2821 100644
--- a/src/quickcontrols2impl/qquicktumblerview_p.h
+++ b/src/quickcontrolsimpl/qquicktumblerview_p.h
diff --git a/src/quickcontrols2impl/qtquickcontrols2foreign.cpp b/src/quickcontrolsimpl/qtquickcontrols2foreign.cpp
index e55cd304c3..e55cd304c3 100644
--- a/src/quickcontrols2impl/qtquickcontrols2foreign.cpp
+++ b/src/quickcontrolsimpl/qtquickcontrols2foreign.cpp
diff --git a/src/quickcontrols2impl/qtquickcontrols2foreign_p.h b/src/quickcontrolsimpl/qtquickcontrols2foreign_p.h
index b447478cd8..b447478cd8 100644
--- a/src/quickcontrols2impl/qtquickcontrols2foreign_p.h
+++ b/src/quickcontrolsimpl/qtquickcontrols2foreign_p.h
diff --git a/src/quickcontrols2impl/qtquickcontrols2implglobal_p.h b/src/quickcontrolsimpl/qtquickcontrols2implglobal_p.h
index 45214c88ec..45214c88ec 100644
--- a/src/quickcontrols2impl/qtquickcontrols2implglobal_p.h
+++ b/src/quickcontrolsimpl/qtquickcontrols2implglobal_p.h
diff --git a/src/quickdialogs/CMakeLists.txt b/src/quickdialogs/CMakeLists.txt
new file mode 100644
index 0000000000..2cff983428
--- /dev/null
+++ b/src/quickdialogs/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_subdirectory(quickdialogsutils)
+add_subdirectory(quickdialogsquickimpl)
+add_subdirectory(quickdialogs)
diff --git a/src/quickdialogs2/quickdialogs2/CMakeLists.txt b/src/quickdialogs/quickdialogs/CMakeLists.txt
index 529d021d3c..529d021d3c 100644
--- a/src/quickdialogs2/quickdialogs2/CMakeLists.txt
+++ b/src/quickdialogs/quickdialogs/CMakeLists.txt
diff --git a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-colordialog-gtk.png b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-colordialog-gtk.png
index 12197f7f74..12197f7f74 100644
--- a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-colordialog-gtk.png
+++ b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-colordialog-gtk.png
diff --git a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-filedialog-gtk.png b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-filedialog-gtk.png
index 9360d747a2..9360d747a2 100644
--- a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-filedialog-gtk.png
+++ b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-filedialog-gtk.png
diff --git a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-folderdialog-gtk.png b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-folderdialog-gtk.png
index 45f0585c5d..45f0585c5d 100644
--- a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-folderdialog-gtk.png
+++ b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-folderdialog-gtk.png
diff --git a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-fontdialog-gtk.png b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-fontdialog-gtk.png
index 0c6217bdb4..0c6217bdb4 100644
--- a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-fontdialog-gtk.png
+++ b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-fontdialog-gtk.png
diff --git a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-messagedialog-android.png b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-messagedialog-android.png
index 3986694f7d..3986694f7d 100644
--- a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-messagedialog-android.png
+++ b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-messagedialog-android.png
diff --git a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-messagedialog-informative-android.png b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-messagedialog-informative-android.png
index b2d3cd37cb..b2d3cd37cb 100644
--- a/src/quickdialogs2/quickdialogs2/doc/images/qtquickdialogs-messagedialog-informative-android.png
+++ b/src/quickdialogs/quickdialogs/doc/images/qtquickdialogs-messagedialog-informative-android.png
diff --git a/src/quickdialogs2/quickdialogs2/doc/qtquickdialogs.qdocconf b/src/quickdialogs/quickdialogs/doc/qtquickdialogs.qdocconf
index d4f7595f0f..d4f7595f0f 100644
--- a/src/quickdialogs2/quickdialogs2/doc/qtquickdialogs.qdocconf
+++ b/src/quickdialogs/quickdialogs/doc/qtquickdialogs.qdocconf
diff --git a/src/quickdialogs2/quickdialogs2/doc/snippets/qtquickdialogs-filedialog.qml b/src/quickdialogs/quickdialogs/doc/snippets/qtquickdialogs-filedialog.qml
index ab3f33f910..ab3f33f910 100644
--- a/src/quickdialogs2/quickdialogs2/doc/snippets/qtquickdialogs-filedialog.qml
+++ b/src/quickdialogs/quickdialogs/doc/snippets/qtquickdialogs-filedialog.qml
diff --git a/src/quickdialogs2/quickdialogs2/doc/src/includes/fallback.qdocinc b/src/quickdialogs/quickdialogs/doc/src/includes/fallback.qdocinc
index f3a4a1805b..f3a4a1805b 100644
--- a/src/quickdialogs2/quickdialogs2/doc/src/includes/fallback.qdocinc
+++ b/src/quickdialogs/quickdialogs/doc/src/includes/fallback.qdocinc
diff --git a/src/quickdialogs2/quickdialogs2/doc/src/qtquickdialogs-index.qdoc b/src/quickdialogs/quickdialogs/doc/src/qtquickdialogs-index.qdoc
index bb9f9fc026..bb9f9fc026 100644
--- a/src/quickdialogs2/quickdialogs2/doc/src/qtquickdialogs-index.qdoc
+++ b/src/quickdialogs/quickdialogs/doc/src/qtquickdialogs-index.qdoc
diff --git a/src/quickdialogs2/quickdialogs2/doc/src/qtquickdialogs-qmltypes.qdoc b/src/quickdialogs/quickdialogs/doc/src/qtquickdialogs-qmltypes.qdoc
index 422b824ec3..422b824ec3 100644
--- a/src/quickdialogs2/quickdialogs2/doc/src/qtquickdialogs-qmltypes.qdoc
+++ b/src/quickdialogs/quickdialogs/doc/src/qtquickdialogs-qmltypes.qdoc
diff --git a/src/quickdialogs2/quickdialogs2/qquickabstractdialog.cpp b/src/quickdialogs/quickdialogs/qquickabstractdialog.cpp
index 857a75c7bd..857a75c7bd 100644
--- a/src/quickdialogs2/quickdialogs2/qquickabstractdialog.cpp
+++ b/src/quickdialogs/quickdialogs/qquickabstractdialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2/qquickabstractdialog_p.h b/src/quickdialogs/quickdialogs/qquickabstractdialog_p.h
index f1d046eb89..f1d046eb89 100644
--- a/src/quickdialogs2/quickdialogs2/qquickabstractdialog_p.h
+++ b/src/quickdialogs/quickdialogs/qquickabstractdialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2/qquickcolordialog.cpp b/src/quickdialogs/quickdialogs/qquickcolordialog.cpp
index e91965e69d..e91965e69d 100644
--- a/src/quickdialogs2/quickdialogs2/qquickcolordialog.cpp
+++ b/src/quickdialogs/quickdialogs/qquickcolordialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2/qquickcolordialog_p.h b/src/quickdialogs/quickdialogs/qquickcolordialog_p.h
index 9b424d6b7e..9b424d6b7e 100644
--- a/src/quickdialogs2/quickdialogs2/qquickcolordialog_p.h
+++ b/src/quickdialogs/quickdialogs/qquickcolordialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2/qquickfiledialog.cpp b/src/quickdialogs/quickdialogs/qquickfiledialog.cpp
index 6b1cdb860c..6b1cdb860c 100644
--- a/src/quickdialogs2/quickdialogs2/qquickfiledialog.cpp
+++ b/src/quickdialogs/quickdialogs/qquickfiledialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2/qquickfiledialog_p.h b/src/quickdialogs/quickdialogs/qquickfiledialog_p.h
index 7214c907f3..7214c907f3 100644
--- a/src/quickdialogs2/quickdialogs2/qquickfiledialog_p.h
+++ b/src/quickdialogs/quickdialogs/qquickfiledialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2/qquickfolderdialog.cpp b/src/quickdialogs/quickdialogs/qquickfolderdialog.cpp
index 692a68c7a6..692a68c7a6 100644
--- a/src/quickdialogs2/quickdialogs2/qquickfolderdialog.cpp
+++ b/src/quickdialogs/quickdialogs/qquickfolderdialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2/qquickfolderdialog_p.h b/src/quickdialogs/quickdialogs/qquickfolderdialog_p.h
index e1231ab3a5..e1231ab3a5 100644
--- a/src/quickdialogs2/quickdialogs2/qquickfolderdialog_p.h
+++ b/src/quickdialogs/quickdialogs/qquickfolderdialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2/qquickfontdialog.cpp b/src/quickdialogs/quickdialogs/qquickfontdialog.cpp
index ff3e73b3c2..ff3e73b3c2 100644
--- a/src/quickdialogs2/quickdialogs2/qquickfontdialog.cpp
+++ b/src/quickdialogs/quickdialogs/qquickfontdialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2/qquickfontdialog_p.h b/src/quickdialogs/quickdialogs/qquickfontdialog_p.h
index f5df6d2a9f..f5df6d2a9f 100644
--- a/src/quickdialogs2/quickdialogs2/qquickfontdialog_p.h
+++ b/src/quickdialogs/quickdialogs/qquickfontdialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2/qquickmessagedialog.cpp b/src/quickdialogs/quickdialogs/qquickmessagedialog.cpp
index 10f7abe17b..10f7abe17b 100644
--- a/src/quickdialogs2/quickdialogs2/qquickmessagedialog.cpp
+++ b/src/quickdialogs/quickdialogs/qquickmessagedialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2/qquickmessagedialog_p.h b/src/quickdialogs/quickdialogs/qquickmessagedialog_p.h
index 40a2b6da8d..40a2b6da8d 100644
--- a/src/quickdialogs2/quickdialogs2/qquickmessagedialog_p.h
+++ b/src/quickdialogs/quickdialogs/qquickmessagedialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2/qtquickdialogs2foreign.cpp b/src/quickdialogs/quickdialogs/qtquickdialogs2foreign.cpp
index 78e7dc7ffd..78e7dc7ffd 100644
--- a/src/quickdialogs2/quickdialogs2/qtquickdialogs2foreign.cpp
+++ b/src/quickdialogs/quickdialogs/qtquickdialogs2foreign.cpp
diff --git a/src/quickdialogs2/quickdialogs2/qtquickdialogs2foreign_p.h b/src/quickdialogs/quickdialogs/qtquickdialogs2foreign_p.h
index 34df201b51..34df201b51 100644
--- a/src/quickdialogs2/quickdialogs2/qtquickdialogs2foreign_p.h
+++ b/src/quickdialogs/quickdialogs/qtquickdialogs2foreign_p.h
diff --git a/src/quickdialogs2/quickdialogs2/qtquickdialogs2global_p.h b/src/quickdialogs/quickdialogs/qtquickdialogs2global_p.h
index 85f9ce6dc4..85f9ce6dc4 100644
--- a/src/quickdialogs2/quickdialogs2/qtquickdialogs2global_p.h
+++ b/src/quickdialogs/quickdialogs/qtquickdialogs2global_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt b/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
index c4ccceef39..c4ccceef39 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt
+++ b/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/checkers.png b/src/quickdialogs/quickdialogsquickimpl/images/checkers.png
index 55ed3f6cf2..55ed3f6cf2 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/checkers.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/checkers.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-round.png b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-round.png
index aaa5a3e431..aaa5a3e431 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-round.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-round.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-round.svg b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-round.svg
index 013cedefa3..013cedefa3 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-round.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-round.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-round@2x.png b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-round@2x.png
index 3f66fe172b..3f66fe172b 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-round@2x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-round@2x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-round@3x.png b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-round@3x.png
index 24d9f6a64e..24d9f6a64e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-round@3x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-round@3x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-round@4x.png b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-round@4x.png
index 1dc83ef09f..1dc83ef09f 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-round@4x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-round@4x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-square.png b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-square.png
index 1f7ac63e7f..1f7ac63e7f 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-square.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-square.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-square.svg b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-square.svg
index 9663673470..9663673470 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-square.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-square.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-square@2x.png b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-square@2x.png
index 524872c1e9..524872c1e9 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-square@2x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-square@2x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-square@3x.png b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-square@3x.png
index 33bce847c8..33bce847c8 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-square@3x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-square@3x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-square@4x.png b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-square@4x.png
index 185c3eb7ae..185c3eb7ae 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/crumb-separator-icon-square@4x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/crumb-separator-icon-square@4x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/eye-dropper.png b/src/quickdialogs/quickdialogsquickimpl/images/eye-dropper.png
index 6aefbc8f59..6aefbc8f59 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/eye-dropper.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/eye-dropper.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/eye-dropper.svg b/src/quickdialogs/quickdialogsquickimpl/images/eye-dropper.svg
index dced09c5d0..dced09c5d0 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/eye-dropper.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/eye-dropper.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/eye-dropper@2x.png b/src/quickdialogs/quickdialogsquickimpl/images/eye-dropper@2x.png
index 69a2dac2cc..69a2dac2cc 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/eye-dropper@2x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/eye-dropper@2x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/eye-dropper@3x.png b/src/quickdialogs/quickdialogsquickimpl/images/eye-dropper@3x.png
index 2cf32fd0cb..2cf32fd0cb 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/eye-dropper@3x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/eye-dropper@3x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/eye-dropper@4x.png b/src/quickdialogs/quickdialogsquickimpl/images/eye-dropper@4x.png
index 2a6ed16458..2a6ed16458 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/eye-dropper@4x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/eye-dropper@4x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-round.png b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-round.png
index c2a4928daf..c2a4928daf 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-round.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-round.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-round.svg b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-round.svg
index 7ac6a23b5c..7ac6a23b5c 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-round.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-round.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-round@2x.png b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-round@2x.png
index 86af70d1cf..86af70d1cf 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-round@2x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-round@2x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-round@3x.png b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-round@3x.png
index 06fea29ed0..06fea29ed0 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-round@3x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-round@3x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-round@4x.png b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-round@4x.png
index 09f8787314..09f8787314 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-round@4x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-round@4x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-square.png b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-square.png
index 9e8f3ddd8f..9e8f3ddd8f 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-square.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-square.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-square.svg b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-square.svg
index 107afa385e..107afa385e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-square.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-square.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-square@2x.png b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-square@2x.png
index 8d33067744..8d33067744 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-square@2x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-square@2x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-square@3x.png b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-square@3x.png
index 2987d2caed..2987d2caed 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-square@3x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-square@3x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-square@4x.png b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-square@4x.png
index 69d76176e9..69d76176e9 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/file-icon-square@4x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/file-icon-square@4x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-round.png b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-round.png
index 60bc6c72c1..60bc6c72c1 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-round.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-round.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-round.svg b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-round.svg
index ba6b627644..ba6b627644 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-round.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-round.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-round@2x.png b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-round@2x.png
index e28734374f..e28734374f 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-round@2x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-round@2x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-round@3x.png b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-round@3x.png
index 5ee70a955e..5ee70a955e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-round@3x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-round@3x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-round@4x.png b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-round@4x.png
index 47d28a4b75..47d28a4b75 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-round@4x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-round@4x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-square.png b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-square.png
index b84a90aecb..b84a90aecb 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-square.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-square.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-square.svg b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-square.svg
index 0002b5ac8e..0002b5ac8e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-square.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-square.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-square@2x.png b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-square@2x.png
index 9bf320bbf0..9bf320bbf0 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-square@2x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-square@2x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-square@3x.png b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-square@3x.png
index 9f12edb6ee..9f12edb6ee 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-square@3x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-square@3x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-square@4x.png b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-square@4x.png
index 9ec5b389bd..9ec5b389bd 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/folder-icon-square@4x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/folder-icon-square@4x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-disabled.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-disabled.9.png
index ce48ee7422..ce48ee7422 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-disabled.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-disabled.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-disabled@2x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-disabled@2x.9.png
index c7abb65c3f..c7abb65c3f 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-disabled@2x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-disabled@2x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-disabled@3x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-disabled@3x.9.png
index 46b84d7da4..46b84d7da4 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-disabled@3x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-disabled@3x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-disabled@4x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-disabled@4x.9.png
index f4dfd338f9..f4dfd338f9 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-disabled@4x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-disabled@4x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-focused.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-focused.9.png
index 39fa866442..39fa866442 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-focused.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-focused.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-focused@2x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-focused@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-focused@2x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-focused@2x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-focused@3x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-focused@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-focused@3x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-focused@3x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-focused@4x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-focused@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-focused@4x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-focused@4x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-highlighted.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-highlighted.9.png
index 6f565e8be2..6f565e8be2 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-highlighted.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-highlighted.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-highlighted@2x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-highlighted@2x.9.png
index 9fd0a434bb..9fd0a434bb 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-highlighted@2x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-highlighted@2x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-highlighted@3x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-highlighted@3x.9.png
index 62b7435b84..62b7435b84 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-highlighted@3x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-highlighted@3x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-highlighted@4x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-highlighted@4x.9.png
index 96444b8905..96444b8905 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-highlighted@4x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-highlighted@4x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-pressed.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-pressed.9.png
index 39fa866442..39fa866442 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-pressed.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-pressed.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-pressed@2x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-pressed@2x.9.png
index 6b61562c14..6b61562c14 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-pressed@2x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-pressed@2x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-pressed@3x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-pressed@3x.9.png
index e46c0bf1d9..e46c0bf1d9 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-pressed@3x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-pressed@3x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-pressed@4x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-pressed@4x.9.png
index 010444e8e1..010444e8e1 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background-pressed@4x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background-pressed@4x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background.9.png
index cef1bafab3..cef1bafab3 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background.svg b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background.svg
index acecfcc9ac..acecfcc9ac 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background@2x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background@2x.9.png
index 5a136a0ca9..5a136a0ca9 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background@2x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background@2x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background@3x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background@3x.9.png
index f47a366b7b..f47a366b7b 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background@3x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background@3x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background@4x.9.png b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background@4x.9.png
index 9ecb680f20..9ecb680f20 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/imagine/filedialogdelegate-background@4x.9.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/imagine/filedialogdelegate-background@4x.9.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-round.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-round.png
index a4b7bc0383..a4b7bc0383 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-round.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-round.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-round.svg b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-round.svg
index fd05395798..fd05395798 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-round.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-round.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-round@2x.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-round@2x.png
index 25ee970a17..25ee970a17 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-round@2x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-round@2x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-round@3x.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-round@3x.png
index 486f2f46a9..486f2f46a9 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-round@3x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-round@3x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-round@4x.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-round@4x.png
index 585402531c..585402531c 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-round@4x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-round@4x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-square.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-square.png
index f7d4151a5a..f7d4151a5a 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-square.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-square.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-square.svg b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-square.svg
index 93fc45bae4..93fc45bae4 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-square.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-square.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-square@2x.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-square@2x.png
index 2e2a3d94eb..2e2a3d94eb 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-square@2x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-square@2x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-square@3x.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-square@3x.png
index 8965148c90..8965148c90 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-square@3x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-square@3x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-square@4x.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-square@4x.png
index 0a56bbcc0a..0a56bbcc0a 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-square@4x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-square@4x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-thick-square.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-thick-square.png
index 3f9f87624a..3f9f87624a 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-thick-square.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-thick-square.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-thick-square.svg b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-thick-square.svg
index dd20777be7..dd20777be7 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-thick-square.svg
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-thick-square.svg
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-thick-square@2x.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-thick-square@2x.png
index b4efe13228..b4efe13228 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-thick-square@2x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-thick-square@2x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-thick-square@3x.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-thick-square@3x.png
index 2e8302b1f0..2e8302b1f0 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-thick-square@3x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-thick-square@3x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-thick-square@4x.png b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-thick-square@4x.png
index 5cf05ab305..5cf05ab305 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/images/up-icon-thick-square@4x.png
+++ b/src/quickdialogs/quickdialogsquickimpl/images/up-icon-thick-square@4x.png
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/ColorDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/ColorDialog.qml
index 591ac46a84..591ac46a84 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/ColorDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/ColorDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FileDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FileDialog.qml
index a928a4b0cc..a928a4b0cc 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FileDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FileDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FileDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FileDialogDelegate.qml
index 475528d2ec..475528d2ec 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FileDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FileDialogDelegate.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FolderBreadcrumbBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FolderBreadcrumbBar.qml
index 75f1963368..75f1963368 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FolderBreadcrumbBar.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FolderBreadcrumbBar.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FolderDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FolderDialog.qml
index fbe0fa9c19..fbe0fa9c19 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FolderDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FolderDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FolderDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FolderDialogDelegate.qml
index e18f0de3ec..e18f0de3ec 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FolderDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FolderDialogDelegate.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FontDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FontDialog.qml
index cca4e96ee6..cca4e96ee6 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/FontDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/FontDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/MessageDialog.qml
index cb3eb1cc64..cb3eb1cc64 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/MessageDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/ColorDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/ColorDialog.qml
index 641453bca5..641453bca5 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/ColorDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/ColorDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FileDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FileDialog.qml
index 664965e571..664965e571 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FileDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FileDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FileDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FileDialogDelegate.qml
index 30094a7d9d..30094a7d9d 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FileDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FileDialogDelegate.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FolderBreadcrumbBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FolderBreadcrumbBar.qml
index 8becba5108..8becba5108 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FolderBreadcrumbBar.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FolderBreadcrumbBar.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FolderDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FolderDialog.qml
index d0af142afa..d0af142afa 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FolderDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FolderDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FolderDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FolderDialogDelegate.qml
index 64195c725a..64195c725a 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FolderDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FolderDialogDelegate.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FontDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FontDialog.qml
index 87660b87b0..87660b87b0 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FontDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/FontDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/MessageDialog.qml
index 9ec3a550da..9ec3a550da 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/MessageDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/ColorDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/ColorDialog.qml
index 313e8645b4..313e8645b4 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/ColorDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/ColorDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FileDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialog.qml
index cd2c513c2e..cd2c513c2e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FileDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FileDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialogDelegate.qml
index c96231345d..c96231345d 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FileDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialogDelegate.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FolderBreadcrumbBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FolderBreadcrumbBar.qml
index f049304407..f049304407 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FolderBreadcrumbBar.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FolderBreadcrumbBar.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FolderDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FolderDialog.qml
index 4e33a067f0..4e33a067f0 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FolderDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FolderDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FolderDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FolderDialogDelegate.qml
index 8b3e6af33e..8b3e6af33e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FolderDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FolderDialogDelegate.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FontDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FontDialog.qml
index 2322a6542b..2322a6542b 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/FontDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FontDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/MessageDialog.qml
index a678503d6c..a678503d6c 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/MessageDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/MessageDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/ColorDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/ColorDialog.qml
index d13b751652..d13b751652 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/ColorDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/ColorDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FileDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialog.qml
index c029b06293..c029b06293 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FileDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FileDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialogDelegate.qml
index 7650ec7a34..7650ec7a34 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FileDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialogDelegate.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FolderBreadcrumbBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FolderBreadcrumbBar.qml
index 4e730c7d00..4e730c7d00 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FolderBreadcrumbBar.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FolderBreadcrumbBar.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FolderDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FolderDialog.qml
index 9ae0a50d21..9ae0a50d21 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FolderDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FolderDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FolderDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FolderDialogDelegate.qml
index 97da6d739e..97da6d739e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FolderDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FolderDialogDelegate.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FontDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FontDialog.qml
index aa9f38c5ee..aa9f38c5ee 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/FontDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FontDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml
index ac63d281d1..ac63d281d1 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/ColorDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/ColorDialog.qml
index c8395bacd0..c8395bacd0 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/ColorDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/ColorDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/ColorInputs.qml b/src/quickdialogs/quickdialogsquickimpl/qml/ColorInputs.qml
index 8fc0e0df07..8fc0e0df07 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/ColorInputs.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/ColorInputs.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/FileDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FileDialog.qml
index 0f25dee35b..0f25dee35b 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/FileDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FileDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/FileDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FileDialogDelegate.qml
index 3abe35f43e..3abe35f43e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/FileDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FileDialogDelegate.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/FileDialogDelegateLabel.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FileDialogDelegateLabel.qml
index ac543e735d..ac543e735d 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/FileDialogDelegateLabel.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FileDialogDelegateLabel.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/FolderBreadcrumbBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FolderBreadcrumbBar.qml
index 1ee10dadad..1ee10dadad 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/FolderBreadcrumbBar.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FolderBreadcrumbBar.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/FolderDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialog.qml
index 7df617584d..7df617584d 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/FolderDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/FolderDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialogDelegate.qml
index 750a581a5d..750a581a5d 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/FolderDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialogDelegate.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/FolderDialogDelegateLabel.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialogDelegateLabel.qml
index ada6fdd632..ada6fdd632 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/FolderDialogDelegateLabel.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialogDelegateLabel.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/FontDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FontDialog.qml
index 2643b88e3b..2643b88e3b 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/FontDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FontDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/FontDialogContent.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FontDialogContent.qml
index a2b4ae043e..a2b4ae043e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/FontDialogContent.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FontDialogContent.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/HueGradient.qml b/src/quickdialogs/quickdialogsquickimpl/qml/HueGradient.qml
index a32a336bad..a32a336bad 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/HueGradient.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/HueGradient.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml
index 5dc7ee7873..5dc7ee7873 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/PickerHandle.qml b/src/quickdialogs/quickdialogsquickimpl/qml/PickerHandle.qml
index cdea430c40..cdea430c40 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/PickerHandle.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/PickerHandle.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/SaturationLightnessPicker.qml b/src/quickdialogs/quickdialogsquickimpl/qml/SaturationLightnessPicker.qml
index 6f4316a659..6f4316a659 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/SaturationLightnessPicker.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/SaturationLightnessPicker.qml
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickabstractcolorpicker.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickabstractcolorpicker.cpp
index 4606c00502..4606c00502 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickabstractcolorpicker.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickabstractcolorpicker.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickabstractcolorpicker_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickabstractcolorpicker_p.h
index b29e488b3a..b29e488b3a 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickabstractcolorpicker_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickabstractcolorpicker_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickabstractcolorpicker_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickabstractcolorpicker_p_p.h
index 73878a1cc0..73878a1cc0 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickabstractcolorpicker_p_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickabstractcolorpicker_p_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolordialogimpl.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl.cpp
index 6f13403766..6f13403766 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolordialogimpl.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolordialogimpl_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p.h
index 110298b5f2..110298b5f2 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolordialogimpl_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolordialogimpl_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p_p.h
index b7c4dc8e2c..b7c4dc8e2c 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolordialogimpl_p_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolordialogutils.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogutils.cpp
index 0a123f84a6..0a123f84a6 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolordialogutils.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogutils.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolordialogutils_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogutils_p.h
index 6b5c2e026c..6b5c2e026c 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolordialogutils_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogutils_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolorinputs.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickcolorinputs.cpp
index cc3743c494..cc3743c494 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolorinputs.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickcolorinputs.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolorinputs_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickcolorinputs_p.h
index 4827627d6f..4827627d6f 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickcolorinputs_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickcolorinputs_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory.cpp
index 9a63fb0718..9a63fb0718 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory_p.h
index 5072c9e1cb..5072c9e1cb 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogdelegate.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogdelegate.cpp
index 71b1fccbc5..71b1fccbc5 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogdelegate.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogdelegate.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogdelegate_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogdelegate_p.h
index 36804497d7..36804497d7 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogdelegate_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogdelegate_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogimpl.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl.cpp
index 72f2ea25cf..72f2ea25cf 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogimpl.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogimpl_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p.h
index 4c64c5e4dd..4c64c5e4dd 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogimpl_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogimpl_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p_p.h
index 6f3cc55e86..6f3cc55e86 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogimpl_p_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderbreadcrumbbar.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickfolderbreadcrumbbar.cpp
index a78833f470..a78833f470 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderbreadcrumbbar.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfolderbreadcrumbbar.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderbreadcrumbbar_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfolderbreadcrumbbar_p.h
index d210112b33..d210112b33 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderbreadcrumbbar_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfolderbreadcrumbbar_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderbreadcrumbbar_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfolderbreadcrumbbar_p_p.h
index 2e1288dc0b..2e1288dc0b 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderbreadcrumbbar_p_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfolderbreadcrumbbar_p_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderdialogimpl.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl.cpp
index 25d82a17aa..25d82a17aa 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderdialogimpl.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderdialogimpl_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p.h
index 021ef5479a..021ef5479a 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderdialogimpl_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderdialogimpl_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p_p.h
index b5abda79ad..b5abda79ad 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderdialogimpl_p_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfontdialogimpl.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl.cpp
index 5dcde5a81e..5dcde5a81e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfontdialogimpl.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfontdialogimpl_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p.h
index 6c30eb2474..6c30eb2474 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfontdialogimpl_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfontdialogimpl_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p_p.h
index cd2ceb49b4..cd2ceb49b4 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfontdialogimpl_p_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickmessagedialogimpl.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl.cpp
index d80011d127..d80011d127 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickmessagedialogimpl.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickmessagedialogimpl_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p.h
index c7871b8d11..c7871b8d11 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickmessagedialogimpl_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickmessagedialogimpl_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p_p.h
index dca7ad218c..dca7ad218c 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickmessagedialogimpl_p_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformcolordialog.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickplatformcolordialog.cpp
index 205b4e0b1b..205b4e0b1b 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformcolordialog.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformcolordialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformcolordialog_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickplatformcolordialog_p.h
index fa4aef9be2..fa4aef9be2 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformcolordialog_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformcolordialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfiledialog.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfiledialog.cpp
index 1c9174a8e4..1c9174a8e4 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfiledialog.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfiledialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfiledialog_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfiledialog_p.h
index 0e0dedf71a..0e0dedf71a 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfiledialog_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfiledialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfolderdialog.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfolderdialog.cpp
index d0ccea353e..d0ccea353e 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfolderdialog.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfolderdialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfolderdialog_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfolderdialog_p.h
index 73e2b2899b..73e2b2899b 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfolderdialog_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfolderdialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfontdialog.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfontdialog.cpp
index 4ef0b1bec6..4ef0b1bec6 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfontdialog.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfontdialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfontdialog_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfontdialog_p.h
index ec7ecc7bfe..ec7ecc7bfe 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfontdialog_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfontdialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformmessagedialog.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickplatformmessagedialog.cpp
index a9f1e858ed..a9f1e858ed 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformmessagedialog.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformmessagedialog.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformmessagedialog_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickplatformmessagedialog_p.h
index 86e44dd85d..86e44dd85d 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformmessagedialog_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformmessagedialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquicksaturationlightnesspicker.cpp b/src/quickdialogs/quickdialogsquickimpl/qquicksaturationlightnesspicker.cpp
index bacdf915d0..bacdf915d0 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquicksaturationlightnesspicker.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquicksaturationlightnesspicker.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquicksaturationlightnesspicker_p.h b/src/quickdialogs/quickdialogsquickimpl/qquicksaturationlightnesspicker_p.h
index 1263e9173f..1263e9173f 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquicksaturationlightnesspicker_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qquicksaturationlightnesspicker_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qtquickdialogs2quickimplforeign.cpp b/src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplforeign.cpp
index 6a05b15c27..6a05b15c27 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qtquickdialogs2quickimplforeign.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplforeign.cpp
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qtquickdialogs2quickimplforeign_p.h b/src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplforeign_p.h
index 26537b29cb..26537b29cb 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qtquickdialogs2quickimplforeign_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplforeign_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qtquickdialogs2quickimplglobal_p.h b/src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplglobal_p.h
index ec593f048d..ec593f048d 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qtquickdialogs2quickimplglobal_p.h
+++ b/src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplglobal_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/shaders/SaturationLightness.frag b/src/quickdialogs/quickdialogsquickimpl/shaders/SaturationLightness.frag
index eb69d83ca6..eb69d83ca6 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/shaders/SaturationLightness.frag
+++ b/src/quickdialogs/quickdialogsquickimpl/shaders/SaturationLightness.frag
diff --git a/src/quickdialogs2/quickdialogs2utils/CMakeLists.txt b/src/quickdialogs/quickdialogsutils/CMakeLists.txt
index 32c175241b..32c175241b 100644
--- a/src/quickdialogs2/quickdialogs2utils/CMakeLists.txt
+++ b/src/quickdialogs/quickdialogsutils/CMakeLists.txt
diff --git a/src/quickdialogs2/quickdialogs2utils/qquickdialogtype_p.h b/src/quickdialogs/quickdialogsutils/qquickdialogtype_p.h
index 1778ef3a14..1778ef3a14 100644
--- a/src/quickdialogs2/quickdialogs2utils/qquickdialogtype_p.h
+++ b/src/quickdialogs/quickdialogsutils/qquickdialogtype_p.h
diff --git a/src/quickdialogs2/quickdialogs2utils/qquickfilenamefilter.cpp b/src/quickdialogs/quickdialogsutils/qquickfilenamefilter.cpp
index 537ca1f058..537ca1f058 100644
--- a/src/quickdialogs2/quickdialogs2utils/qquickfilenamefilter.cpp
+++ b/src/quickdialogs/quickdialogsutils/qquickfilenamefilter.cpp
diff --git a/src/quickdialogs2/quickdialogs2utils/qquickfilenamefilter_p.h b/src/quickdialogs/quickdialogsutils/qquickfilenamefilter_p.h
index 20722f01fa..20722f01fa 100644
--- a/src/quickdialogs2/quickdialogs2utils/qquickfilenamefilter_p.h
+++ b/src/quickdialogs/quickdialogsutils/qquickfilenamefilter_p.h
diff --git a/src/quickdialogs2/quickdialogs2utils/qtquickdialogs2utilsglobal_p.h b/src/quickdialogs/quickdialogsutils/qtquickdialogs2utilsglobal_p.h
index 6a59111d14..6a59111d14 100644
--- a/src/quickdialogs2/quickdialogs2utils/qtquickdialogs2utilsglobal_p.h
+++ b/src/quickdialogs/quickdialogsutils/qtquickdialogs2utilsglobal_p.h
diff --git a/src/quickdialogs2/CMakeLists.txt b/src/quickdialogs2/CMakeLists.txt
deleted file mode 100644
index 1e5c02f107..0000000000
--- a/src/quickdialogs2/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-add_subdirectory(quickdialogs2utils)
-add_subdirectory(quickdialogs2quickimpl)
-add_subdirectory(quickdialogs2)
diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates/CMakeLists.txt
index dce08b6e19..dce08b6e19 100644
--- a/src/quicktemplates2/CMakeLists.txt
+++ b/src/quicktemplates/CMakeLists.txt
diff --git a/src/quicktemplates2/accessible/qaccessiblequickpage.cpp b/src/quicktemplates/accessible/qaccessiblequickpage.cpp
index 6a15f3a3b3..6a15f3a3b3 100644
--- a/src/quicktemplates2/accessible/qaccessiblequickpage.cpp
+++ b/src/quicktemplates/accessible/qaccessiblequickpage.cpp
diff --git a/src/quicktemplates2/accessible/qaccessiblequickpage_p.h b/src/quicktemplates/accessible/qaccessiblequickpage_p.h
index e3d12188e5..e3d12188e5 100644
--- a/src/quicktemplates2/accessible/qaccessiblequickpage_p.h
+++ b/src/quicktemplates/accessible/qaccessiblequickpage_p.h
diff --git a/src/quicktemplates2/configure.cmake b/src/quicktemplates/configure.cmake
index 3b9cb00fc2..3b9cb00fc2 100644
--- a/src/quicktemplates2/configure.cmake
+++ b/src/quicktemplates/configure.cmake
diff --git a/src/quicktemplates2/doc/src/qtquicktemplates2-index.qdoc b/src/quicktemplates/doc/src/qtquicktemplates2-index.qdoc
index 49d4c96b44..49d4c96b44 100644
--- a/src/quicktemplates2/doc/src/qtquicktemplates2-index.qdoc
+++ b/src/quicktemplates/doc/src/qtquicktemplates2-index.qdoc
diff --git a/src/quicktemplates2/doc/src/qtquicktemplates2-qmltypes.qdoc b/src/quicktemplates/doc/src/qtquicktemplates2-qmltypes.qdoc
index c2c183ae72..c2c183ae72 100644
--- a/src/quicktemplates2/doc/src/qtquicktemplates2-qmltypes.qdoc
+++ b/src/quicktemplates/doc/src/qtquicktemplates2-qmltypes.qdoc
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates/qquickabstractbutton.cpp
index 5c2ecd2923..5c2ecd2923 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates/qquickabstractbutton.cpp
diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates/qquickabstractbutton_p.h
index 8907cfefd8..8907cfefd8 100644
--- a/src/quicktemplates2/qquickabstractbutton_p.h
+++ b/src/quicktemplates/qquickabstractbutton_p.h
diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates/qquickabstractbutton_p_p.h
index 9fcb5f5583..9fcb5f5583 100644
--- a/src/quicktemplates2/qquickabstractbutton_p_p.h
+++ b/src/quicktemplates/qquickabstractbutton_p_p.h
diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates/qquickaction.cpp
index 2ff5fd4a48..2ff5fd4a48 100644
--- a/src/quicktemplates2/qquickaction.cpp
+++ b/src/quicktemplates/qquickaction.cpp
diff --git a/src/quicktemplates2/qquickaction_p.h b/src/quicktemplates/qquickaction_p.h
index c4dd818af6..c4dd818af6 100644
--- a/src/quicktemplates2/qquickaction_p.h
+++ b/src/quicktemplates/qquickaction_p.h
diff --git a/src/quicktemplates2/qquickaction_p_p.h b/src/quicktemplates/qquickaction_p_p.h
index 8bee904220..8bee904220 100644
--- a/src/quicktemplates2/qquickaction_p_p.h
+++ b/src/quicktemplates/qquickaction_p_p.h
diff --git a/src/quicktemplates2/qquickactiongroup.cpp b/src/quicktemplates/qquickactiongroup.cpp
index 5e088f3924..5e088f3924 100644
--- a/src/quicktemplates2/qquickactiongroup.cpp
+++ b/src/quicktemplates/qquickactiongroup.cpp
diff --git a/src/quicktemplates2/qquickactiongroup_p.h b/src/quicktemplates/qquickactiongroup_p.h
index 2cd8edbe77..2cd8edbe77 100644
--- a/src/quicktemplates2/qquickactiongroup_p.h
+++ b/src/quicktemplates/qquickactiongroup_p.h
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates/qquickapplicationwindow.cpp
index b0997aff0b..b0997aff0b 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates/qquickapplicationwindow.cpp
diff --git a/src/quicktemplates2/qquickapplicationwindow_p.h b/src/quicktemplates/qquickapplicationwindow_p.h
index 283b192b81..283b192b81 100644
--- a/src/quicktemplates2/qquickapplicationwindow_p.h
+++ b/src/quicktemplates/qquickapplicationwindow_p.h
diff --git a/src/quicktemplates2/qquickbusyindicator.cpp b/src/quicktemplates/qquickbusyindicator.cpp
index bd51a33096..bd51a33096 100644
--- a/src/quicktemplates2/qquickbusyindicator.cpp
+++ b/src/quicktemplates/qquickbusyindicator.cpp
diff --git a/src/quicktemplates2/qquickbusyindicator_p.h b/src/quicktemplates/qquickbusyindicator_p.h
index 46206b7d78..46206b7d78 100644
--- a/src/quicktemplates2/qquickbusyindicator_p.h
+++ b/src/quicktemplates/qquickbusyindicator_p.h
diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates/qquickbutton.cpp
index d7f514d1a1..d7f514d1a1 100644
--- a/src/quicktemplates2/qquickbutton.cpp
+++ b/src/quicktemplates/qquickbutton.cpp
diff --git a/src/quicktemplates2/qquickbutton_p.h b/src/quicktemplates/qquickbutton_p.h
index 1092274ee6..1092274ee6 100644
--- a/src/quicktemplates2/qquickbutton_p.h
+++ b/src/quicktemplates/qquickbutton_p.h
diff --git a/src/quicktemplates2/qquickbutton_p_p.h b/src/quicktemplates/qquickbutton_p_p.h
index d204c56a22..d204c56a22 100644
--- a/src/quicktemplates2/qquickbutton_p_p.h
+++ b/src/quicktemplates/qquickbutton_p_p.h
diff --git a/src/quicktemplates2/qquickbuttongroup.cpp b/src/quicktemplates/qquickbuttongroup.cpp
index 89a64720dc..89a64720dc 100644
--- a/src/quicktemplates2/qquickbuttongroup.cpp
+++ b/src/quicktemplates/qquickbuttongroup.cpp
diff --git a/src/quicktemplates2/qquickbuttongroup_p.h b/src/quicktemplates/qquickbuttongroup_p.h
index 6bdd619c1c..6bdd619c1c 100644
--- a/src/quicktemplates2/qquickbuttongroup_p.h
+++ b/src/quicktemplates/qquickbuttongroup_p.h
diff --git a/src/quicktemplates2/qquickcalendar.cpp b/src/quicktemplates/qquickcalendar.cpp
index 205bd3c38b..205bd3c38b 100644
--- a/src/quicktemplates2/qquickcalendar.cpp
+++ b/src/quicktemplates/qquickcalendar.cpp
diff --git a/src/quicktemplates2/qquickcalendar_p.h b/src/quicktemplates/qquickcalendar_p.h
index 37dac5595a..37dac5595a 100644
--- a/src/quicktemplates2/qquickcalendar_p.h
+++ b/src/quicktemplates/qquickcalendar_p.h
diff --git a/src/quicktemplates2/qquickcalendarmodel.cpp b/src/quicktemplates/qquickcalendarmodel.cpp
index 62d54b296c..62d54b296c 100644
--- a/src/quicktemplates2/qquickcalendarmodel.cpp
+++ b/src/quicktemplates/qquickcalendarmodel.cpp
diff --git a/src/quicktemplates2/qquickcalendarmodel_p.h b/src/quicktemplates/qquickcalendarmodel_p.h
index e9dbf6d075..e9dbf6d075 100644
--- a/src/quicktemplates2/qquickcalendarmodel_p.h
+++ b/src/quicktemplates/qquickcalendarmodel_p.h
diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates/qquickcheckbox.cpp
index 1c6dc11eea..1c6dc11eea 100644
--- a/src/quicktemplates2/qquickcheckbox.cpp
+++ b/src/quicktemplates/qquickcheckbox.cpp
diff --git a/src/quicktemplates2/qquickcheckbox_p.h b/src/quicktemplates/qquickcheckbox_p.h
index 5adeb44ede..5adeb44ede 100644
--- a/src/quicktemplates2/qquickcheckbox_p.h
+++ b/src/quicktemplates/qquickcheckbox_p.h
diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates/qquickcheckdelegate.cpp
index 18ed8e747c..18ed8e747c 100644
--- a/src/quicktemplates2/qquickcheckdelegate.cpp
+++ b/src/quicktemplates/qquickcheckdelegate.cpp
diff --git a/src/quicktemplates2/qquickcheckdelegate_p.h b/src/quicktemplates/qquickcheckdelegate_p.h
index 8c7c3e8c74..8c7c3e8c74 100644
--- a/src/quicktemplates2/qquickcheckdelegate_p.h
+++ b/src/quicktemplates/qquickcheckdelegate_p.h
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates/qquickcombobox.cpp
index f90cf0254f..f90cf0254f 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates/qquickcombobox.cpp
diff --git a/src/quicktemplates2/qquickcombobox_p.h b/src/quicktemplates/qquickcombobox_p.h
index 5342e7ed64..5342e7ed64 100644
--- a/src/quicktemplates2/qquickcombobox_p.h
+++ b/src/quicktemplates/qquickcombobox_p.h
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates/qquickcontainer.cpp
index 45bdfcc5b3..45bdfcc5b3 100644
--- a/src/quicktemplates2/qquickcontainer.cpp
+++ b/src/quicktemplates/qquickcontainer.cpp
diff --git a/src/quicktemplates2/qquickcontainer_p.h b/src/quicktemplates/qquickcontainer_p.h
index 7fdf606571..7fdf606571 100644
--- a/src/quicktemplates2/qquickcontainer_p.h
+++ b/src/quicktemplates/qquickcontainer_p.h
diff --git a/src/quicktemplates2/qquickcontainer_p_p.h b/src/quicktemplates/qquickcontainer_p_p.h
index 84fe62a75d..84fe62a75d 100644
--- a/src/quicktemplates2/qquickcontainer_p_p.h
+++ b/src/quicktemplates/qquickcontainer_p_p.h
diff --git a/src/quicktemplates2/qquickcontentitem.cpp b/src/quicktemplates/qquickcontentitem.cpp
index d658f2521a..d658f2521a 100644
--- a/src/quicktemplates2/qquickcontentitem.cpp
+++ b/src/quicktemplates/qquickcontentitem.cpp
diff --git a/src/quicktemplates2/qquickcontentitem_p.h b/src/quicktemplates/qquickcontentitem_p.h
index 446489ee70..446489ee70 100644
--- a/src/quicktemplates2/qquickcontentitem_p.h
+++ b/src/quicktemplates/qquickcontentitem_p.h
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates/qquickcontrol.cpp
index 0f6d02ccbd..0f6d02ccbd 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates/qquickcontrol.cpp
diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates/qquickcontrol_p.h
index a607a159f3..a607a159f3 100644
--- a/src/quicktemplates2/qquickcontrol_p.h
+++ b/src/quicktemplates/qquickcontrol_p.h
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates/qquickcontrol_p_p.h
index 1832427a67..1832427a67 100644
--- a/src/quicktemplates2/qquickcontrol_p_p.h
+++ b/src/quicktemplates/qquickcontrol_p_p.h
diff --git a/src/quicktemplates2/qquickdayofweekmodel.cpp b/src/quicktemplates/qquickdayofweekmodel.cpp
index 477abbae3b..477abbae3b 100644
--- a/src/quicktemplates2/qquickdayofweekmodel.cpp
+++ b/src/quicktemplates/qquickdayofweekmodel.cpp
diff --git a/src/quicktemplates2/qquickdayofweekmodel_p.h b/src/quicktemplates/qquickdayofweekmodel_p.h
index ba80a43077..ba80a43077 100644
--- a/src/quicktemplates2/qquickdayofweekmodel_p.h
+++ b/src/quicktemplates/qquickdayofweekmodel_p.h
diff --git a/src/quicktemplates2/qquickdayofweekrow.cpp b/src/quicktemplates/qquickdayofweekrow.cpp
index 032ea4a069..032ea4a069 100644
--- a/src/quicktemplates2/qquickdayofweekrow.cpp
+++ b/src/quicktemplates/qquickdayofweekrow.cpp
diff --git a/src/quicktemplates2/qquickdayofweekrow_p.h b/src/quicktemplates/qquickdayofweekrow_p.h
index 3b5c062196..3b5c062196 100644
--- a/src/quicktemplates2/qquickdayofweekrow_p.h
+++ b/src/quicktemplates/qquickdayofweekrow_p.h
diff --git a/src/quicktemplates2/qquickdeferredexecute.cpp b/src/quicktemplates/qquickdeferredexecute.cpp
index ebb0528ec7..ebb0528ec7 100644
--- a/src/quicktemplates2/qquickdeferredexecute.cpp
+++ b/src/quicktemplates/qquickdeferredexecute.cpp
diff --git a/src/quicktemplates2/qquickdeferredexecute_p_p.h b/src/quicktemplates/qquickdeferredexecute_p_p.h
index beecb3636b..beecb3636b 100644
--- a/src/quicktemplates2/qquickdeferredexecute_p_p.h
+++ b/src/quicktemplates/qquickdeferredexecute_p_p.h
diff --git a/src/quicktemplates2/qquickdeferredpointer_p_p.h b/src/quicktemplates/qquickdeferredpointer_p_p.h
index cd5a87e508..cd5a87e508 100644
--- a/src/quicktemplates2/qquickdeferredpointer_p_p.h
+++ b/src/quicktemplates/qquickdeferredpointer_p_p.h
diff --git a/src/quicktemplates2/qquickdelaybutton.cpp b/src/quicktemplates/qquickdelaybutton.cpp
index ad83313fed..ad83313fed 100644
--- a/src/quicktemplates2/qquickdelaybutton.cpp
+++ b/src/quicktemplates/qquickdelaybutton.cpp
diff --git a/src/quicktemplates2/qquickdelaybutton_p.h b/src/quicktemplates/qquickdelaybutton_p.h
index ea8a8b6720..ea8a8b6720 100644
--- a/src/quicktemplates2/qquickdelaybutton_p.h
+++ b/src/quicktemplates/qquickdelaybutton_p.h
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates/qquickdial.cpp
index dd1e6b5bfe..dd1e6b5bfe 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates/qquickdial.cpp
diff --git a/src/quicktemplates2/qquickdial_p.h b/src/quicktemplates/qquickdial_p.h
index c716b9671b..c716b9671b 100644
--- a/src/quicktemplates2/qquickdial_p.h
+++ b/src/quicktemplates/qquickdial_p.h
diff --git a/src/quicktemplates2/qquickdialog.cpp b/src/quicktemplates/qquickdialog.cpp
index 94e35d2fb1..94e35d2fb1 100644
--- a/src/quicktemplates2/qquickdialog.cpp
+++ b/src/quicktemplates/qquickdialog.cpp
diff --git a/src/quicktemplates2/qquickdialog_p.h b/src/quicktemplates/qquickdialog_p.h
index a350c5d923..a350c5d923 100644
--- a/src/quicktemplates2/qquickdialog_p.h
+++ b/src/quicktemplates/qquickdialog_p.h
diff --git a/src/quicktemplates2/qquickdialog_p_p.h b/src/quicktemplates/qquickdialog_p_p.h
index 2d0121892a..2d0121892a 100644
--- a/src/quicktemplates2/qquickdialog_p_p.h
+++ b/src/quicktemplates/qquickdialog_p_p.h
diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates/qquickdialogbuttonbox.cpp
index 9b39f9e1ab..9b39f9e1ab 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox.cpp
+++ b/src/quicktemplates/qquickdialogbuttonbox.cpp
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p.h b/src/quicktemplates/qquickdialogbuttonbox_p.h
index 02cdd3bb63..02cdd3bb63 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox_p.h
+++ b/src/quicktemplates/qquickdialogbuttonbox_p.h
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h b/src/quicktemplates/qquickdialogbuttonbox_p_p.h
index f2d9ff6b2d..f2d9ff6b2d 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h
+++ b/src/quicktemplates/qquickdialogbuttonbox_p_p.h
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates/qquickdrawer.cpp
index caef208545..caef208545 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates/qquickdrawer.cpp
diff --git a/src/quicktemplates2/qquickdrawer_p.h b/src/quicktemplates/qquickdrawer_p.h
index ec42117f20..ec42117f20 100644
--- a/src/quicktemplates2/qquickdrawer_p.h
+++ b/src/quicktemplates/qquickdrawer_p.h
diff --git a/src/quicktemplates2/qquickdrawer_p_p.h b/src/quicktemplates/qquickdrawer_p_p.h
index 224e557839..224e557839 100644
--- a/src/quicktemplates2/qquickdrawer_p_p.h
+++ b/src/quicktemplates/qquickdrawer_p_p.h
diff --git a/src/quicktemplates2/qquickframe.cpp b/src/quicktemplates/qquickframe.cpp
index 8fb516a283..8fb516a283 100644
--- a/src/quicktemplates2/qquickframe.cpp
+++ b/src/quicktemplates/qquickframe.cpp
diff --git a/src/quicktemplates2/qquickframe_p.h b/src/quicktemplates/qquickframe_p.h
index 94c98685f4..94c98685f4 100644
--- a/src/quicktemplates2/qquickframe_p.h
+++ b/src/quicktemplates/qquickframe_p.h
diff --git a/src/quicktemplates2/qquickframe_p_p.h b/src/quicktemplates/qquickframe_p_p.h
index bb7eabf12a..bb7eabf12a 100644
--- a/src/quicktemplates2/qquickframe_p_p.h
+++ b/src/quicktemplates/qquickframe_p_p.h
diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates/qquickgroupbox.cpp
index db319b9bab..db319b9bab 100644
--- a/src/quicktemplates2/qquickgroupbox.cpp
+++ b/src/quicktemplates/qquickgroupbox.cpp
diff --git a/src/quicktemplates2/qquickgroupbox_p.h b/src/quicktemplates/qquickgroupbox_p.h
index 5fc6284fea..5fc6284fea 100644
--- a/src/quicktemplates2/qquickgroupbox_p.h
+++ b/src/quicktemplates/qquickgroupbox_p.h
diff --git a/src/quicktemplates2/qquickheaderview.cpp b/src/quicktemplates/qquickheaderview.cpp
index 69587c6485..69587c6485 100644
--- a/src/quicktemplates2/qquickheaderview.cpp
+++ b/src/quicktemplates/qquickheaderview.cpp
diff --git a/src/quicktemplates2/qquickheaderview_p.h b/src/quicktemplates/qquickheaderview_p.h
index 8e4ea10a57..8e4ea10a57 100644
--- a/src/quicktemplates2/qquickheaderview_p.h
+++ b/src/quicktemplates/qquickheaderview_p.h
diff --git a/src/quicktemplates2/qquickheaderview_p_p.h b/src/quicktemplates/qquickheaderview_p_p.h
index 32be4bde78..32be4bde78 100644
--- a/src/quicktemplates2/qquickheaderview_p_p.h
+++ b/src/quicktemplates/qquickheaderview_p_p.h
diff --git a/src/quicktemplates2/qquickicon.cpp b/src/quicktemplates/qquickicon.cpp
index 140dbd113b..140dbd113b 100644
--- a/src/quicktemplates2/qquickicon.cpp
+++ b/src/quicktemplates/qquickicon.cpp
diff --git a/src/quicktemplates2/qquickicon_p.h b/src/quicktemplates/qquickicon_p.h
index 737b28ad89..737b28ad89 100644
--- a/src/quicktemplates2/qquickicon_p.h
+++ b/src/quicktemplates/qquickicon_p.h
diff --git a/src/quicktemplates2/qquickindicatorbutton_p.cpp b/src/quicktemplates/qquickindicatorbutton_p.cpp
index 96b51aa218..96b51aa218 100644
--- a/src/quicktemplates2/qquickindicatorbutton_p.cpp
+++ b/src/quicktemplates/qquickindicatorbutton_p.cpp
diff --git a/src/quicktemplates2/qquickindicatorbutton_p.h b/src/quicktemplates/qquickindicatorbutton_p.h
index be5259211d..be5259211d 100644
--- a/src/quicktemplates2/qquickindicatorbutton_p.h
+++ b/src/quicktemplates/qquickindicatorbutton_p.h
diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates/qquickitemdelegate.cpp
index d6b639d46c..d6b639d46c 100644
--- a/src/quicktemplates2/qquickitemdelegate.cpp
+++ b/src/quicktemplates/qquickitemdelegate.cpp
diff --git a/src/quicktemplates2/qquickitemdelegate_p.h b/src/quicktemplates/qquickitemdelegate_p.h
index 4716edc849..4716edc849 100644
--- a/src/quicktemplates2/qquickitemdelegate_p.h
+++ b/src/quicktemplates/qquickitemdelegate_p.h
diff --git a/src/quicktemplates2/qquickitemdelegate_p_p.h b/src/quicktemplates/qquickitemdelegate_p_p.h
index f1af3daf94..f1af3daf94 100644
--- a/src/quicktemplates2/qquickitemdelegate_p_p.h
+++ b/src/quicktemplates/qquickitemdelegate_p_p.h
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates/qquicklabel.cpp
index 088207af6a..088207af6a 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates/qquicklabel.cpp
diff --git a/src/quicktemplates2/qquicklabel_p.h b/src/quicktemplates/qquicklabel_p.h
index 5e564baad7..5e564baad7 100644
--- a/src/quicktemplates2/qquicklabel_p.h
+++ b/src/quicktemplates/qquicklabel_p.h
diff --git a/src/quicktemplates2/qquicklabel_p_p.h b/src/quicktemplates/qquicklabel_p_p.h
index 03ee6acef2..03ee6acef2 100644
--- a/src/quicktemplates2/qquicklabel_p_p.h
+++ b/src/quicktemplates/qquicklabel_p_p.h
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates/qquickmenu.cpp
index cc0cc36675..cc0cc36675 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates/qquickmenu.cpp
diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates/qquickmenu_p.h
index 351272ed05..351272ed05 100644
--- a/src/quicktemplates2/qquickmenu_p.h
+++ b/src/quicktemplates/qquickmenu_p.h
diff --git a/src/quicktemplates2/qquickmenu_p_p.h b/src/quicktemplates/qquickmenu_p_p.h
index 509614d2d1..509614d2d1 100644
--- a/src/quicktemplates2/qquickmenu_p_p.h
+++ b/src/quicktemplates/qquickmenu_p_p.h
diff --git a/src/quicktemplates2/qquickmenubar.cpp b/src/quicktemplates/qquickmenubar.cpp
index 624347822c..624347822c 100644
--- a/src/quicktemplates2/qquickmenubar.cpp
+++ b/src/quicktemplates/qquickmenubar.cpp
diff --git a/src/quicktemplates2/qquickmenubar_p.h b/src/quicktemplates/qquickmenubar_p.h
index 2b206a41b1..2b206a41b1 100644
--- a/src/quicktemplates2/qquickmenubar_p.h
+++ b/src/quicktemplates/qquickmenubar_p.h
diff --git a/src/quicktemplates2/qquickmenubar_p_p.h b/src/quicktemplates/qquickmenubar_p_p.h
index 2ac3af00ed..2ac3af00ed 100644
--- a/src/quicktemplates2/qquickmenubar_p_p.h
+++ b/src/quicktemplates/qquickmenubar_p_p.h
diff --git a/src/quicktemplates2/qquickmenubaritem.cpp b/src/quicktemplates/qquickmenubaritem.cpp
index 6e78b74913..6e78b74913 100644
--- a/src/quicktemplates2/qquickmenubaritem.cpp
+++ b/src/quicktemplates/qquickmenubaritem.cpp
diff --git a/src/quicktemplates2/qquickmenubaritem_p.h b/src/quicktemplates/qquickmenubaritem_p.h
index 87faba2e35..87faba2e35 100644
--- a/src/quicktemplates2/qquickmenubaritem_p.h
+++ b/src/quicktemplates/qquickmenubaritem_p.h
diff --git a/src/quicktemplates2/qquickmenubaritem_p_p.h b/src/quicktemplates/qquickmenubaritem_p_p.h
index c2dcdd4222..c2dcdd4222 100644
--- a/src/quicktemplates2/qquickmenubaritem_p_p.h
+++ b/src/quicktemplates/qquickmenubaritem_p_p.h
diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates/qquickmenuitem.cpp
index 2632affe9b..2632affe9b 100644
--- a/src/quicktemplates2/qquickmenuitem.cpp
+++ b/src/quicktemplates/qquickmenuitem.cpp
diff --git a/src/quicktemplates2/qquickmenuitem_p.h b/src/quicktemplates/qquickmenuitem_p.h
index f38c437dbd..f38c437dbd 100644
--- a/src/quicktemplates2/qquickmenuitem_p.h
+++ b/src/quicktemplates/qquickmenuitem_p.h
diff --git a/src/quicktemplates2/qquickmenuitem_p_p.h b/src/quicktemplates/qquickmenuitem_p_p.h
index 63bcfa33f6..63bcfa33f6 100644
--- a/src/quicktemplates2/qquickmenuitem_p_p.h
+++ b/src/quicktemplates/qquickmenuitem_p_p.h
diff --git a/src/quicktemplates2/qquickmenuseparator.cpp b/src/quicktemplates/qquickmenuseparator.cpp
index 12b985b744..12b985b744 100644
--- a/src/quicktemplates2/qquickmenuseparator.cpp
+++ b/src/quicktemplates/qquickmenuseparator.cpp
diff --git a/src/quicktemplates2/qquickmenuseparator_p.h b/src/quicktemplates/qquickmenuseparator_p.h
index abf3221461..abf3221461 100644
--- a/src/quicktemplates2/qquickmenuseparator_p.h
+++ b/src/quicktemplates/qquickmenuseparator_p.h
diff --git a/src/quicktemplates2/qquickmonthgrid.cpp b/src/quicktemplates/qquickmonthgrid.cpp
index c7edc583bd..c7edc583bd 100644
--- a/src/quicktemplates2/qquickmonthgrid.cpp
+++ b/src/quicktemplates/qquickmonthgrid.cpp
diff --git a/src/quicktemplates2/qquickmonthgrid_p.h b/src/quicktemplates/qquickmonthgrid_p.h
index 9c5ffad030..9c5ffad030 100644
--- a/src/quicktemplates2/qquickmonthgrid_p.h
+++ b/src/quicktemplates/qquickmonthgrid_p.h
diff --git a/src/quicktemplates2/qquickmonthmodel.cpp b/src/quicktemplates/qquickmonthmodel.cpp
index 0910ea9be7..0910ea9be7 100644
--- a/src/quicktemplates2/qquickmonthmodel.cpp
+++ b/src/quicktemplates/qquickmonthmodel.cpp
diff --git a/src/quicktemplates2/qquickmonthmodel_p.h b/src/quicktemplates/qquickmonthmodel_p.h
index 8d1c0fc062..8d1c0fc062 100644
--- a/src/quicktemplates2/qquickmonthmodel_p.h
+++ b/src/quicktemplates/qquickmonthmodel_p.h
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates/qquickoverlay.cpp
index 3b5e4afd1d..3b5e4afd1d 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates/qquickoverlay.cpp
diff --git a/src/quicktemplates2/qquickoverlay_p.h b/src/quicktemplates/qquickoverlay_p.h
index 47f7e62615..47f7e62615 100644
--- a/src/quicktemplates2/qquickoverlay_p.h
+++ b/src/quicktemplates/qquickoverlay_p.h
diff --git a/src/quicktemplates2/qquickoverlay_p_p.h b/src/quicktemplates/qquickoverlay_p_p.h
index ba2ea3cdbb..ba2ea3cdbb 100644
--- a/src/quicktemplates2/qquickoverlay_p_p.h
+++ b/src/quicktemplates/qquickoverlay_p_p.h
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates/qquickpage.cpp
index 6ada004c40..6ada004c40 100644
--- a/src/quicktemplates2/qquickpage.cpp
+++ b/src/quicktemplates/qquickpage.cpp
diff --git a/src/quicktemplates2/qquickpage_p.h b/src/quicktemplates/qquickpage_p.h
index b7ce7e9bc9..b7ce7e9bc9 100644
--- a/src/quicktemplates2/qquickpage_p.h
+++ b/src/quicktemplates/qquickpage_p.h
diff --git a/src/quicktemplates2/qquickpage_p_p.h b/src/quicktemplates/qquickpage_p_p.h
index b38b9dc3f4..b38b9dc3f4 100644
--- a/src/quicktemplates2/qquickpage_p_p.h
+++ b/src/quicktemplates/qquickpage_p_p.h
diff --git a/src/quicktemplates2/qquickpageindicator.cpp b/src/quicktemplates/qquickpageindicator.cpp
index de0bb137c1..de0bb137c1 100644
--- a/src/quicktemplates2/qquickpageindicator.cpp
+++ b/src/quicktemplates/qquickpageindicator.cpp
diff --git a/src/quicktemplates2/qquickpageindicator_p.h b/src/quicktemplates/qquickpageindicator_p.h
index d6c648716c..d6c648716c 100644
--- a/src/quicktemplates2/qquickpageindicator_p.h
+++ b/src/quicktemplates/qquickpageindicator_p.h
diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates/qquickpane.cpp
index 05e5c90883..05e5c90883 100644
--- a/src/quicktemplates2/qquickpane.cpp
+++ b/src/quicktemplates/qquickpane.cpp
diff --git a/src/quicktemplates2/qquickpane_p.h b/src/quicktemplates/qquickpane_p.h
index d059e629d4..d059e629d4 100644
--- a/src/quicktemplates2/qquickpane_p.h
+++ b/src/quicktemplates/qquickpane_p.h
diff --git a/src/quicktemplates2/qquickpane_p_p.h b/src/quicktemplates/qquickpane_p_p.h
index 7a8e68a068..7a8e68a068 100644
--- a/src/quicktemplates2/qquickpane_p_p.h
+++ b/src/quicktemplates/qquickpane_p_p.h
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates/qquickpopup.cpp
index 65d395247e..65d395247e 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates/qquickpopup.cpp
diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates/qquickpopup_p.h
index ee9003d627..ee9003d627 100644
--- a/src/quicktemplates2/qquickpopup_p.h
+++ b/src/quicktemplates/qquickpopup_p.h
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates/qquickpopup_p_p.h
index 639639f4c1..639639f4c1 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates/qquickpopup_p_p.h
diff --git a/src/quicktemplates2/qquickpopupanchors.cpp b/src/quicktemplates/qquickpopupanchors.cpp
index 963dd21aa4..963dd21aa4 100644
--- a/src/quicktemplates2/qquickpopupanchors.cpp
+++ b/src/quicktemplates/qquickpopupanchors.cpp
diff --git a/src/quicktemplates2/qquickpopupanchors_p.h b/src/quicktemplates/qquickpopupanchors_p.h
index 589e2d6c8b..589e2d6c8b 100644
--- a/src/quicktemplates2/qquickpopupanchors_p.h
+++ b/src/quicktemplates/qquickpopupanchors_p.h
diff --git a/src/quicktemplates2/qquickpopupanchors_p_p.h b/src/quicktemplates/qquickpopupanchors_p_p.h
index 7371bc5194..7371bc5194 100644
--- a/src/quicktemplates2/qquickpopupanchors_p_p.h
+++ b/src/quicktemplates/qquickpopupanchors_p_p.h
diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates/qquickpopupitem.cpp
index 157046ca51..157046ca51 100644
--- a/src/quicktemplates2/qquickpopupitem.cpp
+++ b/src/quicktemplates/qquickpopupitem.cpp
diff --git a/src/quicktemplates2/qquickpopupitem_p_p.h b/src/quicktemplates/qquickpopupitem_p_p.h
index 77b7695421..77b7695421 100644
--- a/src/quicktemplates2/qquickpopupitem_p_p.h
+++ b/src/quicktemplates/qquickpopupitem_p_p.h
diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates/qquickpopuppositioner.cpp
index 0e05e189c9..0e05e189c9 100644
--- a/src/quicktemplates2/qquickpopuppositioner.cpp
+++ b/src/quicktemplates/qquickpopuppositioner.cpp
diff --git a/src/quicktemplates2/qquickpopuppositioner_p_p.h b/src/quicktemplates/qquickpopuppositioner_p_p.h
index c8e20b4b28..c8e20b4b28 100644
--- a/src/quicktemplates2/qquickpopuppositioner_p_p.h
+++ b/src/quicktemplates/qquickpopuppositioner_p_p.h
diff --git a/src/quicktemplates2/qquickpresshandler.cpp b/src/quicktemplates/qquickpresshandler.cpp
index d752bb36f1..d752bb36f1 100644
--- a/src/quicktemplates2/qquickpresshandler.cpp
+++ b/src/quicktemplates/qquickpresshandler.cpp
diff --git a/src/quicktemplates2/qquickpresshandler_p_p.h b/src/quicktemplates/qquickpresshandler_p_p.h
index adbed66a30..adbed66a30 100644
--- a/src/quicktemplates2/qquickpresshandler_p_p.h
+++ b/src/quicktemplates/qquickpresshandler_p_p.h
diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates/qquickprogressbar.cpp
index 3bdd1baaec..3bdd1baaec 100644
--- a/src/quicktemplates2/qquickprogressbar.cpp
+++ b/src/quicktemplates/qquickprogressbar.cpp
diff --git a/src/quicktemplates2/qquickprogressbar_p.h b/src/quicktemplates/qquickprogressbar_p.h
index 99e356b525..99e356b525 100644
--- a/src/quicktemplates2/qquickprogressbar_p.h
+++ b/src/quicktemplates/qquickprogressbar_p.h
diff --git a/src/quicktemplates2/qquickradiobutton.cpp b/src/quicktemplates/qquickradiobutton.cpp
index eb19c3edd8..eb19c3edd8 100644
--- a/src/quicktemplates2/qquickradiobutton.cpp
+++ b/src/quicktemplates/qquickradiobutton.cpp
diff --git a/src/quicktemplates2/qquickradiobutton_p.h b/src/quicktemplates/qquickradiobutton_p.h
index 8d70290270..8d70290270 100644
--- a/src/quicktemplates2/qquickradiobutton_p.h
+++ b/src/quicktemplates/qquickradiobutton_p.h
diff --git a/src/quicktemplates2/qquickradiodelegate.cpp b/src/quicktemplates/qquickradiodelegate.cpp
index 585d19df99..585d19df99 100644
--- a/src/quicktemplates2/qquickradiodelegate.cpp
+++ b/src/quicktemplates/qquickradiodelegate.cpp
diff --git a/src/quicktemplates2/qquickradiodelegate_p.h b/src/quicktemplates/qquickradiodelegate_p.h
index 574c87032c..574c87032c 100644
--- a/src/quicktemplates2/qquickradiodelegate_p.h
+++ b/src/quicktemplates/qquickradiodelegate_p.h
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates/qquickrangeslider.cpp
index 1386c6db62..1386c6db62 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates/qquickrangeslider.cpp
diff --git a/src/quicktemplates2/qquickrangeslider_p.h b/src/quicktemplates/qquickrangeslider_p.h
index 577bbe165f..577bbe165f 100644
--- a/src/quicktemplates2/qquickrangeslider_p.h
+++ b/src/quicktemplates/qquickrangeslider_p.h
diff --git a/src/quicktemplates2/qquickroundbutton.cpp b/src/quicktemplates/qquickroundbutton.cpp
index 335e1fce47..335e1fce47 100644
--- a/src/quicktemplates2/qquickroundbutton.cpp
+++ b/src/quicktemplates/qquickroundbutton.cpp
diff --git a/src/quicktemplates2/qquickroundbutton_p.h b/src/quicktemplates/qquickroundbutton_p.h
index bf589b673e..bf589b673e 100644
--- a/src/quicktemplates2/qquickroundbutton_p.h
+++ b/src/quicktemplates/qquickroundbutton_p.h
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates/qquickscrollbar.cpp
index 5715d7fbd0..5715d7fbd0 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates/qquickscrollbar.cpp
diff --git a/src/quicktemplates2/qquickscrollbar_p.h b/src/quicktemplates/qquickscrollbar_p.h
index 6e4eade1f8..6e4eade1f8 100644
--- a/src/quicktemplates2/qquickscrollbar_p.h
+++ b/src/quicktemplates/qquickscrollbar_p.h
diff --git a/src/quicktemplates2/qquickscrollbar_p_p.h b/src/quicktemplates/qquickscrollbar_p_p.h
index cad54882d2..cad54882d2 100644
--- a/src/quicktemplates2/qquickscrollbar_p_p.h
+++ b/src/quicktemplates/qquickscrollbar_p_p.h
diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates/qquickscrollindicator.cpp
index 9017890b8e..9017890b8e 100644
--- a/src/quicktemplates2/qquickscrollindicator.cpp
+++ b/src/quicktemplates/qquickscrollindicator.cpp
diff --git a/src/quicktemplates2/qquickscrollindicator_p.h b/src/quicktemplates/qquickscrollindicator_p.h
index 1af6407690..1af6407690 100644
--- a/src/quicktemplates2/qquickscrollindicator_p.h
+++ b/src/quicktemplates/qquickscrollindicator_p.h
diff --git a/src/quicktemplates2/qquickscrollview.cpp b/src/quicktemplates/qquickscrollview.cpp
index b78ca920f4..b78ca920f4 100644
--- a/src/quicktemplates2/qquickscrollview.cpp
+++ b/src/quicktemplates/qquickscrollview.cpp
diff --git a/src/quicktemplates2/qquickscrollview_p.h b/src/quicktemplates/qquickscrollview_p.h
index 927de4365c..927de4365c 100644
--- a/src/quicktemplates2/qquickscrollview_p.h
+++ b/src/quicktemplates/qquickscrollview_p.h
diff --git a/src/quicktemplates2/qquickselectionrectangle.cpp b/src/quicktemplates/qquickselectionrectangle.cpp
index 612b53dca2..612b53dca2 100644
--- a/src/quicktemplates2/qquickselectionrectangle.cpp
+++ b/src/quicktemplates/qquickselectionrectangle.cpp
diff --git a/src/quicktemplates2/qquickselectionrectangle_p.h b/src/quicktemplates/qquickselectionrectangle_p.h
index 2cf3c22062..2cf3c22062 100644
--- a/src/quicktemplates2/qquickselectionrectangle_p.h
+++ b/src/quicktemplates/qquickselectionrectangle_p.h
diff --git a/src/quicktemplates2/qquickselectionrectangle_p_p.h b/src/quicktemplates/qquickselectionrectangle_p_p.h
index 4144550aa7..4144550aa7 100644
--- a/src/quicktemplates2/qquickselectionrectangle_p_p.h
+++ b/src/quicktemplates/qquickselectionrectangle_p_p.h
diff --git a/src/quicktemplates2/qquickshortcutcontext.cpp b/src/quicktemplates/qquickshortcutcontext.cpp
index 2d07eb44f9..2d07eb44f9 100644
--- a/src/quicktemplates2/qquickshortcutcontext.cpp
+++ b/src/quicktemplates/qquickshortcutcontext.cpp
diff --git a/src/quicktemplates2/qquickshortcutcontext_p_p.h b/src/quicktemplates/qquickshortcutcontext_p_p.h
index efeb541dda..efeb541dda 100644
--- a/src/quicktemplates2/qquickshortcutcontext_p_p.h
+++ b/src/quicktemplates/qquickshortcutcontext_p_p.h
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates/qquickslider.cpp
index 28445fe733..28445fe733 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates/qquickslider.cpp
diff --git a/src/quicktemplates2/qquickslider_p.h b/src/quicktemplates/qquickslider_p.h
index 8452d4dad9..8452d4dad9 100644
--- a/src/quicktemplates2/qquickslider_p.h
+++ b/src/quicktemplates/qquickslider_p.h
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates/qquickspinbox.cpp
index 867d72f550..867d72f550 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates/qquickspinbox.cpp
diff --git a/src/quicktemplates2/qquickspinbox_p.h b/src/quicktemplates/qquickspinbox_p.h
index f616ed7e01..f616ed7e01 100644
--- a/src/quicktemplates2/qquickspinbox_p.h
+++ b/src/quicktemplates/qquickspinbox_p.h
diff --git a/src/quicktemplates2/qquicksplitview.cpp b/src/quicktemplates/qquicksplitview.cpp
index 2ca9923860..2ca9923860 100644
--- a/src/quicktemplates2/qquicksplitview.cpp
+++ b/src/quicktemplates/qquicksplitview.cpp
diff --git a/src/quicktemplates2/qquicksplitview_p.h b/src/quicktemplates/qquicksplitview_p.h
index 12bba3a856..12bba3a856 100644
--- a/src/quicktemplates2/qquicksplitview_p.h
+++ b/src/quicktemplates/qquicksplitview_p.h
diff --git a/src/quicktemplates2/qquicksplitview_p_p.h b/src/quicktemplates/qquicksplitview_p_p.h
index 86316ecfe9..86316ecfe9 100644
--- a/src/quicktemplates2/qquicksplitview_p_p.h
+++ b/src/quicktemplates/qquicksplitview_p_p.h
diff --git a/src/quicktemplates2/qquickstackelement.cpp b/src/quicktemplates/qquickstackelement.cpp
index f8001a2980..f8001a2980 100644
--- a/src/quicktemplates2/qquickstackelement.cpp
+++ b/src/quicktemplates/qquickstackelement.cpp
diff --git a/src/quicktemplates2/qquickstackelement_p_p.h b/src/quicktemplates/qquickstackelement_p_p.h
index 00b150805d..00b150805d 100644
--- a/src/quicktemplates2/qquickstackelement_p_p.h
+++ b/src/quicktemplates/qquickstackelement_p_p.h
diff --git a/src/quicktemplates2/qquickstacktransition.cpp b/src/quicktemplates/qquickstacktransition.cpp
index 790b03a677..790b03a677 100644
--- a/src/quicktemplates2/qquickstacktransition.cpp
+++ b/src/quicktemplates/qquickstacktransition.cpp
diff --git a/src/quicktemplates2/qquickstacktransition_p_p.h b/src/quicktemplates/qquickstacktransition_p_p.h
index e68f1bb7a1..e68f1bb7a1 100644
--- a/src/quicktemplates2/qquickstacktransition_p_p.h
+++ b/src/quicktemplates/qquickstacktransition_p_p.h
diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates/qquickstackview.cpp
index 1b16c6e581..1b16c6e581 100644
--- a/src/quicktemplates2/qquickstackview.cpp
+++ b/src/quicktemplates/qquickstackview.cpp
diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates/qquickstackview_p.cpp
index 99127d84b6..99127d84b6 100644
--- a/src/quicktemplates2/qquickstackview_p.cpp
+++ b/src/quicktemplates/qquickstackview_p.cpp
diff --git a/src/quicktemplates2/qquickstackview_p.h b/src/quicktemplates/qquickstackview_p.h
index b36976a395..b36976a395 100644
--- a/src/quicktemplates2/qquickstackview_p.h
+++ b/src/quicktemplates/qquickstackview_p.h
diff --git a/src/quicktemplates2/qquickstackview_p_p.h b/src/quicktemplates/qquickstackview_p_p.h
index 2b86458edc..2b86458edc 100644
--- a/src/quicktemplates2/qquickstackview_p_p.h
+++ b/src/quicktemplates/qquickstackview_p_p.h
diff --git a/src/quicktemplates2/qquickswipe_p.h b/src/quicktemplates/qquickswipe_p.h
index 4694948763..4694948763 100644
--- a/src/quicktemplates2/qquickswipe_p.h
+++ b/src/quicktemplates/qquickswipe_p.h
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates/qquickswipedelegate.cpp
index 42343d1072..42343d1072 100644
--- a/src/quicktemplates2/qquickswipedelegate.cpp
+++ b/src/quicktemplates/qquickswipedelegate.cpp
diff --git a/src/quicktemplates2/qquickswipedelegate_p.h b/src/quicktemplates/qquickswipedelegate_p.h
index 2fadabe09f..2fadabe09f 100644
--- a/src/quicktemplates2/qquickswipedelegate_p.h
+++ b/src/quicktemplates/qquickswipedelegate_p.h
diff --git a/src/quicktemplates2/qquickswipedelegate_p_p.h b/src/quicktemplates/qquickswipedelegate_p_p.h
index 4963bb0ff7..4963bb0ff7 100644
--- a/src/quicktemplates2/qquickswipedelegate_p_p.h
+++ b/src/quicktemplates/qquickswipedelegate_p_p.h
diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates/qquickswipeview.cpp
index b9ca6208d1..b9ca6208d1 100644
--- a/src/quicktemplates2/qquickswipeview.cpp
+++ b/src/quicktemplates/qquickswipeview.cpp
diff --git a/src/quicktemplates2/qquickswipeview_p.h b/src/quicktemplates/qquickswipeview_p.h
index 84e4b51b2a..84e4b51b2a 100644
--- a/src/quicktemplates2/qquickswipeview_p.h
+++ b/src/quicktemplates/qquickswipeview_p.h
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates/qquickswitch.cpp
index fadea992a6..fadea992a6 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates/qquickswitch.cpp
diff --git a/src/quicktemplates2/qquickswitch_p.h b/src/quicktemplates/qquickswitch_p.h
index 9044b066b9..9044b066b9 100644
--- a/src/quicktemplates2/qquickswitch_p.h
+++ b/src/quicktemplates/qquickswitch_p.h
diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates/qquickswitchdelegate.cpp
index 3e52f531fa..3e52f531fa 100644
--- a/src/quicktemplates2/qquickswitchdelegate.cpp
+++ b/src/quicktemplates/qquickswitchdelegate.cpp
diff --git a/src/quicktemplates2/qquickswitchdelegate_p.h b/src/quicktemplates/qquickswitchdelegate_p.h
index d6a6c830b3..d6a6c830b3 100644
--- a/src/quicktemplates2/qquickswitchdelegate_p.h
+++ b/src/quicktemplates/qquickswitchdelegate_p.h
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates/qquicktabbar.cpp
index a1dfc9068c..a1dfc9068c 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates/qquicktabbar.cpp
diff --git a/src/quicktemplates2/qquicktabbar_p.h b/src/quicktemplates/qquicktabbar_p.h
index f062a01b1a..f062a01b1a 100644
--- a/src/quicktemplates2/qquicktabbar_p.h
+++ b/src/quicktemplates/qquicktabbar_p.h
diff --git a/src/quicktemplates2/qquicktabbutton.cpp b/src/quicktemplates/qquicktabbutton.cpp
index c3450ce164..c3450ce164 100644
--- a/src/quicktemplates2/qquicktabbutton.cpp
+++ b/src/quicktemplates/qquicktabbutton.cpp
diff --git a/src/quicktemplates2/qquicktabbutton_p.h b/src/quicktemplates/qquicktabbutton_p.h
index 7b2fbdb2fe..7b2fbdb2fe 100644
--- a/src/quicktemplates2/qquicktabbutton_p.h
+++ b/src/quicktemplates/qquicktabbutton_p.h
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates/qquicktextarea.cpp
index 0572746d14..0572746d14 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates/qquicktextarea.cpp
diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates/qquicktextarea_p.h
index 5bd10af21e..5bd10af21e 100644
--- a/src/quicktemplates2/qquicktextarea_p.h
+++ b/src/quicktemplates/qquicktextarea_p.h
diff --git a/src/quicktemplates2/qquicktextarea_p_p.h b/src/quicktemplates/qquicktextarea_p_p.h
index 243b350866..243b350866 100644
--- a/src/quicktemplates2/qquicktextarea_p_p.h
+++ b/src/quicktemplates/qquicktextarea_p_p.h
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates/qquicktextfield.cpp
index 3e6d2a48a7..3e6d2a48a7 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates/qquicktextfield.cpp
diff --git a/src/quicktemplates2/qquicktextfield_p.h b/src/quicktemplates/qquicktextfield_p.h
index c5bc9ce0bd..c5bc9ce0bd 100644
--- a/src/quicktemplates2/qquicktextfield_p.h
+++ b/src/quicktemplates/qquicktextfield_p.h
diff --git a/src/quicktemplates2/qquicktextfield_p_p.h b/src/quicktemplates/qquicktextfield_p_p.h
index 8c6752776d..8c6752776d 100644
--- a/src/quicktemplates2/qquicktextfield_p_p.h
+++ b/src/quicktemplates/qquicktextfield_p_p.h
diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates/qquicktheme.cpp
index 612863ada7..612863ada7 100644
--- a/src/quicktemplates2/qquicktheme.cpp
+++ b/src/quicktemplates/qquicktheme.cpp
diff --git a/src/quicktemplates2/qquicktheme_p.h b/src/quicktemplates/qquicktheme_p.h
index a29961226a..a29961226a 100644
--- a/src/quicktemplates2/qquicktheme_p.h
+++ b/src/quicktemplates/qquicktheme_p.h
diff --git a/src/quicktemplates2/qquicktheme_p_p.h b/src/quicktemplates/qquicktheme_p_p.h
index a18957bd0d..a18957bd0d 100644
--- a/src/quicktemplates2/qquicktheme_p_p.h
+++ b/src/quicktemplates/qquicktheme_p_p.h
diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates/qquicktoolbar.cpp
index f804684fa7..f804684fa7 100644
--- a/src/quicktemplates2/qquicktoolbar.cpp
+++ b/src/quicktemplates/qquicktoolbar.cpp
diff --git a/src/quicktemplates2/qquicktoolbar_p.h b/src/quicktemplates/qquicktoolbar_p.h
index f896361ea0..f896361ea0 100644
--- a/src/quicktemplates2/qquicktoolbar_p.h
+++ b/src/quicktemplates/qquicktoolbar_p.h
diff --git a/src/quicktemplates2/qquicktoolbutton.cpp b/src/quicktemplates/qquicktoolbutton.cpp
index 4b0a978878..4b0a978878 100644
--- a/src/quicktemplates2/qquicktoolbutton.cpp
+++ b/src/quicktemplates/qquicktoolbutton.cpp
diff --git a/src/quicktemplates2/qquicktoolbutton_p.h b/src/quicktemplates/qquicktoolbutton_p.h
index e470ae816d..e470ae816d 100644
--- a/src/quicktemplates2/qquicktoolbutton_p.h
+++ b/src/quicktemplates/qquicktoolbutton_p.h
diff --git a/src/quicktemplates2/qquicktoolseparator.cpp b/src/quicktemplates/qquicktoolseparator.cpp
index 2ac2173085..2ac2173085 100644
--- a/src/quicktemplates2/qquicktoolseparator.cpp
+++ b/src/quicktemplates/qquicktoolseparator.cpp
diff --git a/src/quicktemplates2/qquicktoolseparator_p.h b/src/quicktemplates/qquicktoolseparator_p.h
index 85930a3506..85930a3506 100644
--- a/src/quicktemplates2/qquicktoolseparator_p.h
+++ b/src/quicktemplates/qquicktoolseparator_p.h
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates/qquicktooltip.cpp
index 7703d57b53..7703d57b53 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates/qquicktooltip.cpp
diff --git a/src/quicktemplates2/qquicktooltip_p.h b/src/quicktemplates/qquicktooltip_p.h
index 979df38a31..979df38a31 100644
--- a/src/quicktemplates2/qquicktooltip_p.h
+++ b/src/quicktemplates/qquicktooltip_p.h
diff --git a/src/quicktemplates2/qquicktreeviewdelegate.cpp b/src/quicktemplates/qquicktreeviewdelegate.cpp
index f21b215dfe..f21b215dfe 100644
--- a/src/quicktemplates2/qquicktreeviewdelegate.cpp
+++ b/src/quicktemplates/qquicktreeviewdelegate.cpp
diff --git a/src/quicktemplates2/qquicktreeviewdelegate_p.h b/src/quicktemplates/qquicktreeviewdelegate_p.h
index de85f7c2cd..de85f7c2cd 100644
--- a/src/quicktemplates2/qquicktreeviewdelegate_p.h
+++ b/src/quicktemplates/qquicktreeviewdelegate_p.h
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates/qquicktumbler.cpp
index 434f90ad3a..434f90ad3a 100644
--- a/src/quicktemplates2/qquicktumbler.cpp
+++ b/src/quicktemplates/qquicktumbler.cpp
diff --git a/src/quicktemplates2/qquicktumbler_p.h b/src/quicktemplates/qquicktumbler_p.h
index 02ea3049fd..02ea3049fd 100644
--- a/src/quicktemplates2/qquicktumbler_p.h
+++ b/src/quicktemplates/qquicktumbler_p.h
diff --git a/src/quicktemplates2/qquicktumbler_p_p.h b/src/quicktemplates/qquicktumbler_p_p.h
index e53381c470..e53381c470 100644
--- a/src/quicktemplates2/qquicktumbler_p_p.h
+++ b/src/quicktemplates/qquicktumbler_p_p.h
diff --git a/src/quicktemplates2/qquickvelocitycalculator.cpp b/src/quicktemplates/qquickvelocitycalculator.cpp
index 8c7dbd7d6c..8c7dbd7d6c 100644
--- a/src/quicktemplates2/qquickvelocitycalculator.cpp
+++ b/src/quicktemplates/qquickvelocitycalculator.cpp
diff --git a/src/quicktemplates2/qquickvelocitycalculator_p_p.h b/src/quicktemplates/qquickvelocitycalculator_p_p.h
index c7e51e38e7..c7e51e38e7 100644
--- a/src/quicktemplates2/qquickvelocitycalculator_p_p.h
+++ b/src/quicktemplates/qquickvelocitycalculator_p_p.h
diff --git a/src/quicktemplates2/qquickweeknumbercolumn.cpp b/src/quicktemplates/qquickweeknumbercolumn.cpp
index 925e4b4b34..925e4b4b34 100644
--- a/src/quicktemplates2/qquickweeknumbercolumn.cpp
+++ b/src/quicktemplates/qquickweeknumbercolumn.cpp
diff --git a/src/quicktemplates2/qquickweeknumbercolumn_p.h b/src/quicktemplates/qquickweeknumbercolumn_p.h
index 7ea6255319..7ea6255319 100644
--- a/src/quicktemplates2/qquickweeknumbercolumn_p.h
+++ b/src/quicktemplates/qquickweeknumbercolumn_p.h
diff --git a/src/quicktemplates2/qquickweeknumbermodel.cpp b/src/quicktemplates/qquickweeknumbermodel.cpp
index 57891ead4a..57891ead4a 100644
--- a/src/quicktemplates2/qquickweeknumbermodel.cpp
+++ b/src/quicktemplates/qquickweeknumbermodel.cpp
diff --git a/src/quicktemplates2/qquickweeknumbermodel_p.h b/src/quicktemplates/qquickweeknumbermodel_p.h
index f00fd5a073..f00fd5a073 100644
--- a/src/quicktemplates2/qquickweeknumbermodel_p.h
+++ b/src/quicktemplates/qquickweeknumbermodel_p.h
diff --git a/src/quicktemplates2/qt_cmdline.cmake b/src/quicktemplates/qt_cmdline.cmake
index e69de29bb2..e69de29bb2 100644
--- a/src/quicktemplates2/qt_cmdline.cmake
+++ b/src/quicktemplates/qt_cmdline.cmake
diff --git a/src/quicktemplates2/qtquicktemplates2global.cpp b/src/quicktemplates/qtquicktemplates2global.cpp
index e65eba230e..e65eba230e 100644
--- a/src/quicktemplates2/qtquicktemplates2global.cpp
+++ b/src/quicktemplates/qtquicktemplates2global.cpp
diff --git a/src/quicktemplates2/qtquicktemplates2global_p.h b/src/quicktemplates/qtquicktemplates2global_p.h
index bca84663c6..bca84663c6 100644
--- a/src/quicktemplates2/qtquicktemplates2global_p.h
+++ b/src/quicktemplates/qtquicktemplates2global_p.h
diff --git a/src/quicktemplates2/qtquicktemplates2plugin.cpp b/src/quicktemplates/qtquicktemplates2plugin.cpp
index 14cc72dd6f..14cc72dd6f 100644
--- a/src/quicktemplates2/qtquicktemplates2plugin.cpp
+++ b/src/quicktemplates/qtquicktemplates2plugin.cpp
diff --git a/sync.profile b/sync.profile
index b7e81f09d7..d35bb5f440 100644
--- a/sync.profile
+++ b/sync.profile
@@ -24,13 +24,13 @@
     "QtLabsQmlModels" => "$basedir/src/labs/models",
     "QtLabsSharedImage" => "$basedir/src/labs/sharedimage",
     "QtQmlXmlListModel" => "$basedir/src/qmlxmllistmodel",
-    "QtQuickControls2" => "$basedir/src/quickcontrols2",
-    "QtQuickControls2Impl" => "$basedir/src/quickcontrols2impl",
+    "QtQuickControls2" => "$basedir/src/quickcontrols",
+    "QtQuickControls2Impl" => "$basedir/src/quickcontrolsimpl",
     "QtQuickControlsTestUtils" => "$basedir/src/quickcontrolstestutils",
-    "QtQuickDialogs2" => "$basedir/src/quickdialogs2/quickdialogs2",
-    "QtQuickDialogs2Utils" => "$basedir/src/quickdialogs2/quickdialogs2utils",
-    "QtQuickDialogs2QuickImpl" => "$basedir/src/quickdialogs2/quickdialogs2quickimpl",
-    "QtQuickTemplates2" => "$basedir/src/quicktemplates2"
+    "QtQuickDialogs2" => "$basedir/src/quickdialogs/quickdialogs",
+    "QtQuickDialogs2Utils" => "$basedir/src/quickdialogs/quickdialogsutils",
+    "QtQuickDialogs2QuickImpl" => "$basedir/src/quickdialogs/quickdialogsquickimpl",
+    "QtQuickTemplates2" => "$basedir/src/quicktemplates"
 );
 %inject_headers = (
     "$basedir/src/qml" => [ "^qqmljsgrammar_p.h", "^qqmljsparser_p.h", "^qml_compile_hash_p.h" ],
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 1793aa464a..1f80a6e2e8 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -34,6 +34,6 @@ if(TARGET Qt::QmlDomPrivate AND NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(qmlls)
 endif()
 if(TARGET Qt::QuickTemplates2)
-    add_subdirectory(quickcontrols2)
+    add_subdirectory(quickcontrols)
     add_subdirectory(quickdialogs)
 endif()
diff --git a/tests/auto/qml/qmlformat/tst_qmlformat.cpp b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
index 450e50465e..ab67ee9fdb 100644
--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
@@ -139,7 +139,7 @@ void TestQmlformat::initTestCase()
     // Optional chains are not permitted on the left-hand-side in assignments
     m_invalidFiles << "tests/auto/qml/qqmllanguage/data/optionalChaining.LHS.qml";
     // object literal with = assignements
-    m_invalidFiles << "tests/auto/quickcontrols2/controls/data/tst_scrollbar.qml";
+    m_invalidFiles << "tests/auto/quickcontrols/controls/data/tst_scrollbar.qml";
 
     // These files rely on exact formatting
     m_invalidFiles << "tests/auto/qml/qqmlecmascript/data/incrDecrSemicolon1.qml";
diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index 473b363004..de27fe92cb 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -60,9 +60,9 @@ tst_examples::tst_examples()
     excludedDirs << "snippets/qml/visualdatamodel_rootindex";
     excludedDirs << "snippets/qml/qtbinding";
     excludedDirs << "snippets/qml/imports";
-    excludedDirs << "examples/quickcontrols2/imagine";
-    excludedDirs << "examples/quickcontrols2/texteditor";
-    excludedDirs << "examples/quickcontrols2/ios/todolist"; // Must be run via executable.
+    excludedDirs << "examples/quickcontrols/imagine";
+    excludedDirs << "examples/quickcontrols/texteditor";
+    excludedDirs << "examples/quickcontrols/ios/todolist"; // Must be run via executable.
     excludedFiles << "snippets/qml/image-ext.qml";
     excludedFiles << "examples/quick/shapes/content/main.qml"; // relies on resources
     excludedFiles << "examples/quick/shapes/content/interactive.qml"; // relies on resources
diff --git a/tests/auto/quickcontrols2/CMakeLists.txt b/tests/auto/quickcontrols/CMakeLists.txt
index 10a5604649..10a5604649 100644
--- a/tests/auto/quickcontrols2/CMakeLists.txt
+++ b/tests/auto/quickcontrols/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/accessibility/BLACKLIST b/tests/auto/quickcontrols/accessibility/BLACKLIST
index fe7a87f847..fe7a87f847 100644
--- a/tests/auto/quickcontrols2/accessibility/BLACKLIST
+++ b/tests/auto/quickcontrols/accessibility/BLACKLIST
diff --git a/tests/auto/quickcontrols/accessibility/CMakeLists.txt b/tests/auto/quickcontrols/accessibility/CMakeLists.txt
new file mode 100644
index 0000000000..b6f89cb964
--- /dev/null
+++ b/tests/auto/quickcontrols/accessibility/CMakeLists.txt
@@ -0,0 +1,61 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from accessibility.pro.
+
+if(NOT QT_FEATURE_accessibility)
+    return()
+endif()
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_accessibility LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_accessibility Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_accessibility
+    SOURCES
+        tst_accessibility.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:accessibility.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+# _REQUIREMENTS = "qtConfig(accessibility)"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_accessibility CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/abstractbutton.qml b/tests/auto/quickcontrols/accessibility/data/defaults/abstractbutton.qml
index 29d6b3c0a0..29d6b3c0a0 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/abstractbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/abstractbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/busyindicator.qml b/tests/auto/quickcontrols/accessibility/data/defaults/busyindicator.qml
index baaa9ba80b..baaa9ba80b 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/busyindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/busyindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/button.qml b/tests/auto/quickcontrols/accessibility/data/defaults/button.qml
index 0359b3ac15..0359b3ac15 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/button.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/button.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/checkbox.qml b/tests/auto/quickcontrols/accessibility/data/defaults/checkbox.qml
index c912be5791..c912be5791 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/checkbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/checkbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/checkdelegate.qml b/tests/auto/quickcontrols/accessibility/data/defaults/checkdelegate.qml
index df62bc89d5..df62bc89d5 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/checkdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/checkdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/combobox.qml b/tests/auto/quickcontrols/accessibility/data/defaults/combobox.qml
index bfeac723da..bfeac723da 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/combobox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/combobox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/container.qml b/tests/auto/quickcontrols/accessibility/data/defaults/container.qml
index 7d29fec426..7d29fec426 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/container.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/container.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/control.qml b/tests/auto/quickcontrols/accessibility/data/defaults/control.qml
index 280cfd2962..280cfd2962 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/control.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/control.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/dial.qml b/tests/auto/quickcontrols/accessibility/data/defaults/dial.qml
index d7e700b5df..d7e700b5df 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/dial.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/dial.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/dialog.qml b/tests/auto/quickcontrols/accessibility/data/defaults/dialog.qml
index d88fd36d8e..d88fd36d8e 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/dialog.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/dialog.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/drawer.qml b/tests/auto/quickcontrols/accessibility/data/defaults/drawer.qml
index 60a35171b2..60a35171b2 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/drawer.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/drawer.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/frame.qml b/tests/auto/quickcontrols/accessibility/data/defaults/frame.qml
index b70ccb556c..b70ccb556c 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/frame.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/frame.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/groupbox.qml b/tests/auto/quickcontrols/accessibility/data/defaults/groupbox.qml
index 24f3a294b8..24f3a294b8 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/groupbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/groupbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/itemdelegate.qml b/tests/auto/quickcontrols/accessibility/data/defaults/itemdelegate.qml
index 5ec95fe07e..5ec95fe07e 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/itemdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/itemdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/label.qml b/tests/auto/quickcontrols/accessibility/data/defaults/label.qml
index 5f6a98cd74..5f6a98cd74 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/label.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/label.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/menu.qml b/tests/auto/quickcontrols/accessibility/data/defaults/menu.qml
index 07fef72849..07fef72849 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/menu.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/menu.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/menuitem.qml b/tests/auto/quickcontrols/accessibility/data/defaults/menuitem.qml
index 194fa988c8..194fa988c8 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/menuitem.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/menuitem.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/page.qml b/tests/auto/quickcontrols/accessibility/data/defaults/page.qml
index cd1f78e170..cd1f78e170 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/page.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/page.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/pageindicator.qml b/tests/auto/quickcontrols/accessibility/data/defaults/pageindicator.qml
index d64d565706..d64d565706 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/pageindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/pageindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/pane.qml b/tests/auto/quickcontrols/accessibility/data/defaults/pane.qml
index 765c98a394..765c98a394 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/pane.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/pane.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/popup.qml b/tests/auto/quickcontrols/accessibility/data/defaults/popup.qml
index c599bd4c0b..c599bd4c0b 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/popup.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/popup.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/progressbar.qml b/tests/auto/quickcontrols/accessibility/data/defaults/progressbar.qml
index b3e287c33c..b3e287c33c 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/progressbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/progressbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/radiobutton.qml b/tests/auto/quickcontrols/accessibility/data/defaults/radiobutton.qml
index d796b37e17..d796b37e17 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/radiobutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/radiobutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/radiodelegate.qml b/tests/auto/quickcontrols/accessibility/data/defaults/radiodelegate.qml
index d002b98532..d002b98532 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/radiodelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/radiodelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/rangeslider.qml b/tests/auto/quickcontrols/accessibility/data/defaults/rangeslider.qml
index 7bd364c443..7bd364c443 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/rangeslider.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/rangeslider.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/roundbutton.qml b/tests/auto/quickcontrols/accessibility/data/defaults/roundbutton.qml
index 6c78c0a47d..6c78c0a47d 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/roundbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/roundbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollbar.qml b/tests/auto/quickcontrols/accessibility/data/defaults/scrollbar.qml
index c36b1534b1..c36b1534b1 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/scrollbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollindicator.qml b/tests/auto/quickcontrols/accessibility/data/defaults/scrollindicator.qml
index 5b2f44b674..5b2f44b674 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/scrollindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/slider.qml b/tests/auto/quickcontrols/accessibility/data/defaults/slider.qml
index fd60a19844..fd60a19844 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/slider.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/slider.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/spinbox.qml b/tests/auto/quickcontrols/accessibility/data/defaults/spinbox.qml
index 159e1f4676..159e1f4676 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/spinbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/spinbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/stackview.qml b/tests/auto/quickcontrols/accessibility/data/defaults/stackview.qml
index bd540b91a0..bd540b91a0 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/stackview.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/stackview.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/swipedelegate.qml b/tests/auto/quickcontrols/accessibility/data/defaults/swipedelegate.qml
index d3724d4dc2..d3724d4dc2 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/swipedelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/swipedelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/swipeview.qml b/tests/auto/quickcontrols/accessibility/data/defaults/swipeview.qml
index 9eb8221666..9eb8221666 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/swipeview.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/swipeview.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/switch.qml b/tests/auto/quickcontrols/accessibility/data/defaults/switch.qml
index 00213086aa..00213086aa 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/switch.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/switch.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/switchdelegate.qml b/tests/auto/quickcontrols/accessibility/data/defaults/switchdelegate.qml
index 9f71ed6848..9f71ed6848 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/switchdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/switchdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbar.qml b/tests/auto/quickcontrols/accessibility/data/defaults/tabbar.qml
index 423bfea903..423bfea903 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/tabbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbutton.qml b/tests/auto/quickcontrols/accessibility/data/defaults/tabbutton.qml
index ab9ea8ae2c..ab9ea8ae2c 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/tabbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/textarea.qml b/tests/auto/quickcontrols/accessibility/data/defaults/textarea.qml
index 9a1f31d029..9a1f31d029 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/textarea.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/textarea.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/textfield.qml b/tests/auto/quickcontrols/accessibility/data/defaults/textfield.qml
index 42a16bae78..42a16bae78 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/textfield.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/textfield.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbar.qml b/tests/auto/quickcontrols/accessibility/data/defaults/toolbar.qml
index 01b93d7d91..01b93d7d91 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/toolbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbutton.qml b/tests/auto/quickcontrols/accessibility/data/defaults/toolbutton.qml
index 40e1152edc..40e1152edc 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/toolbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tooltip.qml b/tests/auto/quickcontrols/accessibility/data/defaults/tooltip.qml
index f1c3cebee5..f1c3cebee5 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tooltip.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/tooltip.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tumbler.qml b/tests/auto/quickcontrols/accessibility/data/defaults/tumbler.qml
index e3db175bd2..e3db175bd2 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tumbler.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/tumbler.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/ordering/page.qml b/tests/auto/quickcontrols/accessibility/data/ordering/page.qml
index 8efafe3232..8efafe3232 100644
--- a/tests/auto/quickcontrols2/accessibility/data/ordering/page.qml
+++ b/tests/auto/quickcontrols/accessibility/data/ordering/page.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/abstractbutton.qml b/tests/auto/quickcontrols/accessibility/data/override/abstractbutton.qml
index ac8efe2601..ac8efe2601 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/abstractbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/abstractbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/busyindicator.qml b/tests/auto/quickcontrols/accessibility/data/override/busyindicator.qml
index 439788d121..439788d121 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/busyindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/busyindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/button.qml b/tests/auto/quickcontrols/accessibility/data/override/button.qml
index 578af86c78..578af86c78 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/button.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/button.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/checkbox.qml b/tests/auto/quickcontrols/accessibility/data/override/checkbox.qml
index 5df735091e..5df735091e 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/checkbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/checkbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/checkdelegate.qml b/tests/auto/quickcontrols/accessibility/data/override/checkdelegate.qml
index 43f65d5083..43f65d5083 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/checkdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/checkdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/combobox.qml b/tests/auto/quickcontrols/accessibility/data/override/combobox.qml
index fa6ed3b4bf..fa6ed3b4bf 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/combobox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/combobox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/container.qml b/tests/auto/quickcontrols/accessibility/data/override/container.qml
index 4e73f341d6..4e73f341d6 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/container.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/container.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/control.qml b/tests/auto/quickcontrols/accessibility/data/override/control.qml
index 9c2be4617f..9c2be4617f 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/control.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/control.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/dial.qml b/tests/auto/quickcontrols/accessibility/data/override/dial.qml
index 8dbf0e3764..8dbf0e3764 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/dial.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/dial.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/dialog.qml b/tests/auto/quickcontrols/accessibility/data/override/dialog.qml
index d1f3197196..d1f3197196 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/dialog.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/dialog.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/drawer.qml b/tests/auto/quickcontrols/accessibility/data/override/drawer.qml
index 02e973e2cc..02e973e2cc 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/drawer.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/drawer.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/frame.qml b/tests/auto/quickcontrols/accessibility/data/override/frame.qml
index 55086b35c0..55086b35c0 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/frame.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/frame.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/groupbox.qml b/tests/auto/quickcontrols/accessibility/data/override/groupbox.qml
index d09d0845c9..d09d0845c9 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/groupbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/groupbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/itemdelegate.qml b/tests/auto/quickcontrols/accessibility/data/override/itemdelegate.qml
index 2f32cb7514..2f32cb7514 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/itemdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/itemdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/label.qml b/tests/auto/quickcontrols/accessibility/data/override/label.qml
index 5c1310f875..5c1310f875 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/label.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/label.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/menu.qml b/tests/auto/quickcontrols/accessibility/data/override/menu.qml
index 57a1b3d61f..57a1b3d61f 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/menu.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/menu.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/menuitem.qml b/tests/auto/quickcontrols/accessibility/data/override/menuitem.qml
index e1c064f3b5..e1c064f3b5 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/menuitem.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/menuitem.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/page.qml b/tests/auto/quickcontrols/accessibility/data/override/page.qml
index b3b87e8ab6..b3b87e8ab6 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/page.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/page.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/pageindicator.qml b/tests/auto/quickcontrols/accessibility/data/override/pageindicator.qml
index f366464df7..f366464df7 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/pageindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/pageindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/pane.qml b/tests/auto/quickcontrols/accessibility/data/override/pane.qml
index 7b57e9a9f5..7b57e9a9f5 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/pane.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/pane.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/popup.qml b/tests/auto/quickcontrols/accessibility/data/override/popup.qml
index 9d8d58550a..9d8d58550a 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/popup.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/popup.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/progressbar.qml b/tests/auto/quickcontrols/accessibility/data/override/progressbar.qml
index 58bd2ae1bd..58bd2ae1bd 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/progressbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/progressbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/radiobutton.qml b/tests/auto/quickcontrols/accessibility/data/override/radiobutton.qml
index 3c555256b8..3c555256b8 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/radiobutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/radiobutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/radiodelegate.qml b/tests/auto/quickcontrols/accessibility/data/override/radiodelegate.qml
index 883f963c5c..883f963c5c 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/radiodelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/radiodelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/rangeslider.qml b/tests/auto/quickcontrols/accessibility/data/override/rangeslider.qml
index 675c34aad1..675c34aad1 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/rangeslider.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/rangeslider.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/roundbutton.qml b/tests/auto/quickcontrols/accessibility/data/override/roundbutton.qml
index a793ee2833..a793ee2833 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/roundbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/roundbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/scrollbar.qml b/tests/auto/quickcontrols/accessibility/data/override/scrollbar.qml
index 6b3e613c42..6b3e613c42 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/scrollbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/scrollbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/scrollindicator.qml b/tests/auto/quickcontrols/accessibility/data/override/scrollindicator.qml
index 5cc1e5d4b8..5cc1e5d4b8 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/scrollindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/scrollindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/slider.qml b/tests/auto/quickcontrols/accessibility/data/override/slider.qml
index 9239f8db99..9239f8db99 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/slider.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/slider.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/spinbox.qml b/tests/auto/quickcontrols/accessibility/data/override/spinbox.qml
index 327f2a6d4a..327f2a6d4a 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/spinbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/spinbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/stackview.qml b/tests/auto/quickcontrols/accessibility/data/override/stackview.qml
index dd3b8342f7..dd3b8342f7 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/stackview.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/stackview.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/swipedelegate.qml b/tests/auto/quickcontrols/accessibility/data/override/swipedelegate.qml
index bc97fc93bc..bc97fc93bc 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/swipedelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/swipedelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/swipeview.qml b/tests/auto/quickcontrols/accessibility/data/override/swipeview.qml
index 809b536210..809b536210 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/swipeview.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/swipeview.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/switch.qml b/tests/auto/quickcontrols/accessibility/data/override/switch.qml
index 18e3eb70ce..18e3eb70ce 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/switch.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/switch.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/switchdelegate.qml b/tests/auto/quickcontrols/accessibility/data/override/switchdelegate.qml
index 0c66f9e9e9..0c66f9e9e9 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/switchdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/switchdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tabbar.qml b/tests/auto/quickcontrols/accessibility/data/override/tabbar.qml
index a959f68cae..a959f68cae 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/tabbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/tabbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tabbutton.qml b/tests/auto/quickcontrols/accessibility/data/override/tabbutton.qml
index 1530a2d1bc..1530a2d1bc 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/tabbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/tabbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/textarea.qml b/tests/auto/quickcontrols/accessibility/data/override/textarea.qml
index 2b1422252f..2b1422252f 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/textarea.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/textarea.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/textfield.qml b/tests/auto/quickcontrols/accessibility/data/override/textfield.qml
index 42098b6640..42098b6640 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/textfield.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/textfield.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/toolbar.qml b/tests/auto/quickcontrols/accessibility/data/override/toolbar.qml
index 97406f8ca5..97406f8ca5 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/toolbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/toolbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/toolbutton.qml b/tests/auto/quickcontrols/accessibility/data/override/toolbutton.qml
index 5ecb427baf..5ecb427baf 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/toolbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/toolbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tooltip.qml b/tests/auto/quickcontrols/accessibility/data/override/tooltip.qml
index 1a4c3a994f..1a4c3a994f 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/tooltip.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/tooltip.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tumbler.qml b/tests/auto/quickcontrols/accessibility/data/override/tumbler.qml
index 947f66cd70..947f66cd70 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/tumbler.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/tumbler.qml
diff --git a/tests/auto/quickcontrols2/accessibility/tst_accessibility.cpp b/tests/auto/quickcontrols/accessibility/tst_accessibility.cpp
index 40ee98691d..40ee98691d 100644
--- a/tests/auto/quickcontrols2/accessibility/tst_accessibility.cpp
+++ b/tests/auto/quickcontrols/accessibility/tst_accessibility.cpp
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt
index 1b41ce037f..1b41ce037f 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt
index 4c7accb315..4c7accb315 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt
index fdac69d643..fdac69d643 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt
index 07ba810c43..07ba810c43 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt
index db7b454b59..db7b454b59 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt
index 21b78d6349..21b78d6349 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/cmake/CMakeLists.txt b/tests/auto/quickcontrols/cmake/CMakeLists.txt
index 93ecd12386..93ecd12386 100644
--- a/tests/auto/quickcontrols2/cmake/CMakeLists.txt
+++ b/tests/auto/quickcontrols/cmake/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/CMakeLists.txt b/tests/auto/quickcontrols/controls/CMakeLists.txt
index 6984315b5a..6984315b5a 100644
--- a/tests/auto/quickcontrols2/controls/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/basic/BLACKLIST b/tests/auto/quickcontrols/controls/basic/BLACKLIST
index b643dd1d9c..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/basic/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/basic/CMakeLists.txt b/tests/auto/quickcontrols/controls/basic/CMakeLists.txt
index b391d278ae..b391d278ae 100644
--- a/tests/auto/quickcontrols2/controls/basic/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/basic/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/basic/dependencies.qml b/tests/auto/quickcontrols/controls/basic/dependencies.qml
index f7d87422b5..f7d87422b5 100644
--- a/tests/auto/quickcontrols2/controls/basic/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/basic/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/basic/dummy_imports.qml b/tests/auto/quickcontrols/controls/basic/dummy_imports.qml
index 66e184f138..66e184f138 100644
--- a/tests/auto/quickcontrols2/controls/basic/dummy_imports.qml
+++ b/tests/auto/quickcontrols/controls/basic/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/controls/basic/tst_basic.cpp b/tests/auto/quickcontrols/controls/basic/tst_basic.cpp
index 47cd9a393e..47cd9a393e 100644
--- a/tests/auto/quickcontrols2/controls/basic/tst_basic.cpp
+++ b/tests/auto/quickcontrols/controls/basic/tst_basic.cpp
diff --git a/tests/auto/quickcontrols2/controls/data/SignalSequenceSpy.qml b/tests/auto/quickcontrols/controls/data/SignalSequenceSpy.qml
index 5e536248a8..5e536248a8 100644
--- a/tests/auto/quickcontrols2/controls/data/SignalSequenceSpy.qml
+++ b/tests/auto/quickcontrols/controls/data/SignalSequenceSpy.qml
diff --git a/tests/auto/quickcontrols2/controls/data/TestItem.qml b/tests/auto/quickcontrols/controls/data/TestItem.qml
index c36ddc2f11..c36ddc2f11 100644
--- a/tests/auto/quickcontrols2/controls/data/TestItem.qml
+++ b/tests/auto/quickcontrols/controls/data/TestItem.qml
diff --git a/tests/auto/quickcontrols2/controls/data/TumblerDatePicker.qml b/tests/auto/quickcontrols/controls/data/TumblerDatePicker.qml
index c1b12e8fbc..c1b12e8fbc 100644
--- a/tests/auto/quickcontrols2/controls/data/TumblerDatePicker.qml
+++ b/tests/auto/quickcontrols/controls/data/TumblerDatePicker.qml
diff --git a/tests/auto/quickcontrols2/controls/data/TumblerListView.qml b/tests/auto/quickcontrols/controls/data/TumblerListView.qml
index a794f255db..a794f255db 100644
--- a/tests/auto/quickcontrols2/controls/data/TumblerListView.qml
+++ b/tests/auto/quickcontrols/controls/data/TumblerListView.qml
diff --git a/tests/auto/quickcontrols2/controls/data/TumblerPathView.qml b/tests/auto/quickcontrols/controls/data/TumblerPathView.qml
index 26de69dab2..26de69dab2 100644
--- a/tests/auto/quickcontrols2/controls/data/TumblerPathView.qml
+++ b/tests/auto/quickcontrols/controls/data/TumblerPathView.qml
diff --git a/tests/auto/quickcontrols2/controls/data/splitview/fillItemInMiddle.qml b/tests/auto/quickcontrols/controls/data/splitview/fillItemInMiddle.qml
index 1849e66e1c..1849e66e1c 100644
--- a/tests/auto/quickcontrols2/controls/data/splitview/fillItemInMiddle.qml
+++ b/tests/auto/quickcontrols/controls/data/splitview/fillItemInMiddle.qml
diff --git a/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnLeft.qml b/tests/auto/quickcontrols/controls/data/splitview/fillItemOnLeft.qml
index 8307a05951..8307a05951 100644
--- a/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnLeft.qml
+++ b/tests/auto/quickcontrols/controls/data/splitview/fillItemOnLeft.qml
diff --git a/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnTop.qml b/tests/auto/quickcontrols/controls/data/splitview/fillItemOnTop.qml
index 41ce0f386e..41ce0f386e 100644
--- a/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnTop.qml
+++ b/tests/auto/quickcontrols/controls/data/splitview/fillItemOnTop.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_abstractbutton.qml b/tests/auto/quickcontrols/controls/data/tst_abstractbutton.qml
index 663b152c70..663b152c70 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_abstractbutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_action.qml b/tests/auto/quickcontrols/controls/data/tst_action.qml
index 845a6507af..845a6507af 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_action.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_action.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_actiongroup.qml b/tests/auto/quickcontrols/controls/data/tst_actiongroup.qml
index 4b5fdc7d65..4b5fdc7d65 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_actiongroup.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_actiongroup.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_busyindicator.qml b/tests/auto/quickcontrols/controls/data/tst_busyindicator.qml
index a50fd1bfab..a50fd1bfab 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_busyindicator.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_busyindicator.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_button.qml b/tests/auto/quickcontrols/controls/data/tst_button.qml
index 9ddfa0885d..9ddfa0885d 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_button.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_button.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_buttongroup.qml b/tests/auto/quickcontrols/controls/data/tst_buttongroup.qml
index 2ae86d1737..2ae86d1737 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_buttongroup.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_buttongroup.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_calendarmodel.qml b/tests/auto/quickcontrols/controls/data/tst_calendarmodel.qml
index 19070e074d..19070e074d 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_calendarmodel.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_calendarmodel.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_checkbox.qml b/tests/auto/quickcontrols/controls/data/tst_checkbox.qml
index 5991ae9008..5991ae9008 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_checkbox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_checkbox.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_checkdelegate.qml b/tests/auto/quickcontrols/controls/data/tst_checkdelegate.qml
index d3e0910e83..d3e0910e83 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_checkdelegate.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_checkdelegate.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_combobox.qml b/tests/auto/quickcontrols/controls/data/tst_combobox.qml
index 058a07a070..058a07a070 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_combobox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_combobox.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_container.qml b/tests/auto/quickcontrols/controls/data/tst_container.qml
index 9988625744..9988625744 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_container.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_container.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_control.qml b/tests/auto/quickcontrols/controls/data/tst_control.qml
index 0747943421..0747943421 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_control.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_control.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_dayofweekrow.qml b/tests/auto/quickcontrols/controls/data/tst_dayofweekrow.qml
index 67403e240a..67403e240a 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_dayofweekrow.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_dayofweekrow.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_delaybutton.qml b/tests/auto/quickcontrols/controls/data/tst_delaybutton.qml
index e2abe389ca..e2abe389ca 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_delaybutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_delaybutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_dial.qml b/tests/auto/quickcontrols/controls/data/tst_dial.qml
index 3fcf8c7e88..3fcf8c7e88 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_dial.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_dial.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_dialog.qml b/tests/auto/quickcontrols/controls/data/tst_dialog.qml
index 76ff95a32a..76ff95a32a 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_dialog.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_dialog.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_dialogbuttonbox.qml b/tests/auto/quickcontrols/controls/data/tst_dialogbuttonbox.qml
index 6eb339a192..6eb339a192 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_dialogbuttonbox.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_frame.qml b/tests/auto/quickcontrols/controls/data/tst_frame.qml
index bef46f7650..bef46f7650 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_frame.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_frame.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_groupbox.qml b/tests/auto/quickcontrols/controls/data/tst_groupbox.qml
index b5867dd956..b5867dd956 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_groupbox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_groupbox.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_itemdelegate.qml b/tests/auto/quickcontrols/controls/data/tst_itemdelegate.qml
index 9d4847b4b1..9d4847b4b1 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_itemdelegate.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_itemdelegate.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_label.qml b/tests/auto/quickcontrols/controls/data/tst_label.qml
index 853d5ba686..853d5ba686 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_label.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_label.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_menuitem.qml b/tests/auto/quickcontrols/controls/data/tst_menuitem.qml
index d1ed076705..d1ed076705 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_menuitem.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_menuitem.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_monthgrid.qml b/tests/auto/quickcontrols/controls/data/tst_monthgrid.qml
index 5b1081675e..5b1081675e 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_monthgrid.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_monthgrid.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_page.qml b/tests/auto/quickcontrols/controls/data/tst_page.qml
index ca816d963b..ca816d963b 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_page.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_page.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_pageindicator.qml b/tests/auto/quickcontrols/controls/data/tst_pageindicator.qml
index 837972cdc2..837972cdc2 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_pageindicator.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_pageindicator.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_pane.qml b/tests/auto/quickcontrols/controls/data/tst_pane.qml
index f823031c79..f823031c79 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_pane.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_pane.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_popup.qml b/tests/auto/quickcontrols/controls/data/tst_popup.qml
index 9c1d63ffe4..9c1d63ffe4 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_popup.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_popup.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_progressbar.qml b/tests/auto/quickcontrols/controls/data/tst_progressbar.qml
index 6484df815a..6484df815a 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_progressbar.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_progressbar.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_radiobutton.qml b/tests/auto/quickcontrols/controls/data/tst_radiobutton.qml
index 08caac977d..08caac977d 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_radiobutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_radiobutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_radiodelegate.qml b/tests/auto/quickcontrols/controls/data/tst_radiodelegate.qml
index fe89838bda..fe89838bda 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_radiodelegate.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_radiodelegate.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml b/tests/auto/quickcontrols/controls/data/tst_rangeslider.qml
index 91e366c819..91e366c819 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_rangeslider.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_roundbutton.qml b/tests/auto/quickcontrols/controls/data/tst_roundbutton.qml
index dfdd62086d..dfdd62086d 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_roundbutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_roundbutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_scrollbar.qml b/tests/auto/quickcontrols/controls/data/tst_scrollbar.qml
index f26d8f5cb0..f26d8f5cb0 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_scrollbar.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_scrollbar.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_scrollindicator.qml b/tests/auto/quickcontrols/controls/data/tst_scrollindicator.qml
index d87e29f980..d87e29f980 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_scrollindicator.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_scrollindicator.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_scrollview.qml b/tests/auto/quickcontrols/controls/data/tst_scrollview.qml
index e5600830a8..e5600830a8 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_scrollview.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_scrollview.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_selectionrectangle.qml b/tests/auto/quickcontrols/controls/data/tst_selectionrectangle.qml
index 9203528d07..9203528d07 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_selectionrectangle.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_selectionrectangle.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_slider.qml b/tests/auto/quickcontrols/controls/data/tst_slider.qml
index df3eb71ae2..df3eb71ae2 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_slider.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_slider.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_spinbox.qml b/tests/auto/quickcontrols/controls/data/tst_spinbox.qml
index df30ef4beb..df30ef4beb 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_spinbox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_spinbox.qml
diff --git a/tests/auto/quickcontrols/controls/data/tst_splitview.qml b/tests/auto/quickcontrols/controls/data/tst_splitview.qml
new file mode 100644
index 0000000000..37d05d1130
--- /dev/null
+++ b/tests/auto/quickcontrols/controls/data/tst_splitview.qml
@@ -0,0 +1,2584 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+import QtCore
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Window
+import QtTest
+import Qt.test.controls
+
+TestCase {
+    id: testCase
+    width: 400
+    height: 400
+    visible: true
+    when: windowShown
+    name: "SplitView"
+
+    function initTestCase() {
+        // For the serialization tests.
+        Qt.application.name = "qtquickcontrols-splitview-auto-test"
+        Qt.application.domain = "org.qt-project"
+        Qt.application.organization = "QtProject"
+    }
+
+    function findHandles(splitView) {
+        var handles = []
+        for (var i = 0; i < splitView.children.length; ++i) {
+            var child = splitView.children[i]
+            if (child.objectName.toLowerCase().indexOf("handle") !== -1)
+                handles.push(child)
+        }
+        return handles
+    }
+
+    function compareSizes(control, expectedGeometries, context) {
+        if (context === undefined)
+            context = ""
+        else
+            context = " (" + context + ")"
+
+        compare(control.count, Math.floor(expectedGeometries.length / 2) + 1,
+            "Mismatch in actual vs expected number of split items" + context)
+
+        var handles = findHandles(control)
+        compare(handles.length, Math.floor(expectedGeometries.length / 2),
+            "Mismatch in actual vs expected number of handle items" + context)
+
+        for (var i = 0, splitItemIndex = 0, handleItemIndex = 0; i < expectedGeometries.length; ++i) {
+            var item = null
+            var itemType = ""
+            var typeSpecificIndex = -1
+            if (i % 2 == 0) {
+                item = control.itemAt(splitItemIndex)
+                itemType = "split item"
+                typeSpecificIndex = splitItemIndex
+                ++splitItemIndex
+            } else {
+                item = handles[handleItemIndex]
+                itemType = "handle item"
+                typeSpecificIndex = handleItemIndex
+                ++handleItemIndex
+            }
+
+            verify(item, itemType + " at index " + typeSpecificIndex + " should not be null" + context)
+
+            var expectedGeometry = expectedGeometries[i]
+            if (expectedGeometry.hasOwnProperty("hidden")) {
+                // It's geometry doesn't matter because it's hidden.
+                verify(!item.visible, itemType + " at index " + typeSpecificIndex + " should be hidden" + context)
+                continue
+            }
+
+            // Note that the indices mentioned here account for handles; they do not
+            // match the indices reported by QQuickSplitView's logging categories.
+            compare(item.x, expectedGeometry.x, "Mismatch in actual vs expected x value of "
+                + itemType + " at index " + typeSpecificIndex + context)
+            compare(item.y, expectedGeometry.y, "Mismatch in actual vs expected y value of "
+                + itemType + " at index " + typeSpecificIndex + context)
+            compare(item.width, expectedGeometry.width, "Mismatch in actual vs expected width value of "
+                + itemType + " at index " + typeSpecificIndex + context)
+            compare(item.height, expectedGeometry.height, "Mismatch in actual vs expected height value of "
+                + itemType + " at index " + typeSpecificIndex + context)
+        }
+    }
+
+    property real defaultHorizontalHandleWidth: 10
+    property real defaultVerticalHandleHeight: 10
+
+
+    Component {
+        id: signalSpyComponent
+        SignalSpy {}
+    }
+
+    Component {
+        id: handleComponent
+        Rectangle {
+            objectName: "handle"
+            implicitWidth: defaultHorizontalHandleWidth
+            implicitHeight: defaultVerticalHandleHeight
+            color: "#444"
+
+            Text {
+                objectName: "handleText_" + text
+                text: parent.x + "," + parent.y + " " + parent.width + "x" + parent.height
+                color: "white"
+                anchors.centerIn: parent
+                rotation: 90
+            }
+        }
+    }
+
+    Component {
+        id: defaultSplitView
+
+        SplitView {}
+    }
+
+    Component {
+        id: splitViewComponent
+
+        SplitView {
+            anchors.fill: parent
+            handle: handleComponent
+        }
+    }
+
+    Component {
+        id: rectangleComponent
+
+        Rectangle {}
+    }
+
+    function test_defaults() {
+        failOnWarning(/.?/)
+
+        let control = createTemporaryObject(defaultSplitView, testCase)
+        verify(control)
+    }
+
+    function test_addItemsAfterCompletion() {
+        var control = createTemporaryObject(splitViewComponent, testCase)
+        verify(control)
+
+        var item0 = rectangleComponent.createObject(control, { implicitWidth: 25, color: "salmon" })
+        verify(item0)
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        // The last item fills the width by default, and since there is only one item...
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, testCase.width)
+        compare(item0.height, testCase.height)
+
+        var item1 = rectangleComponent.createObject(control, { implicitWidth: 25, color: "steelblue" })
+        verify(item1)
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        // Now that a second item has been added, the first item goes back to its preferred (implicit) width.
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, item0.implicitWidth)
+        compare(item0.height, testCase.height)
+        var handles = findHandles(control)
+        var handle0 = handles[0]
+        compare(handle0.x, item0.implicitWidth)
+        compare(handle0.y, 0)
+        compare(handle0.width, defaultHorizontalHandleWidth)
+        compare(handle0.height, testCase.height)
+        compare(item1.x, item0.implicitWidth + defaultHorizontalHandleWidth)
+        compare(item1.y, 0)
+        compare(item1.width, testCase.width - item0.implicitWidth - defaultHorizontalHandleWidth)
+        compare(item1.height, testCase.height)
+    }
+
+    function test_addItemsWithNoSizeAfterCompletion() {
+        var control = createTemporaryObject(splitViewComponent, testCase)
+        verify(control)
+
+        var item0 = rectangleComponent.createObject(control, { color: "salmon" })
+        verify(item0)
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, testCase.width)
+        compare(item0.height, testCase.height)
+
+        var item1 = rectangleComponent.createObject(control, { color: "steelblue" })
+        verify(item1)
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, 0)
+        compare(item0.height, testCase.height)
+        var handles = findHandles(control)
+        var handle0 = handles[0]
+        compare(handle0.x, 0)
+        compare(handle0.y, 0)
+        compare(handle0.width, defaultHorizontalHandleWidth)
+        compare(handle0.height, testCase.height)
+        compare(item1.x, defaultHorizontalHandleWidth)
+        compare(item1.y, 0)
+        compare(item1.width, testCase.width - defaultHorizontalHandleWidth)
+        compare(item1.height, testCase.height)
+    }
+
+    Component {
+        id: threeZeroSizedItemsComponent
+
+        SplitView {
+            anchors.fill: parent
+            handle: handleComponent
+
+            Rectangle {
+                objectName: "salmon"
+                color: objectName
+            }
+            Rectangle {
+                objectName: "navajowhite"
+                color: objectName
+            }
+            Rectangle {
+                objectName: "steelblue"
+                color: objectName
+            }
+        }
+    }
+
+    function test_changeAttachedPropertiesAfterCompletion() {
+        var control = createTemporaryObject(threeZeroSizedItemsComponent, testCase)
+        verify(control)
+
+        var item0 = control.itemAt(0)
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, 0)
+        compare(item0.height, testCase.height)
+
+        var handles = findHandles(control)
+        var handle0 = handles[0]
+        compare(handle0.x, 0)
+        compare(handle0.y, 0)
+        compare(handle0.width, defaultHorizontalHandleWidth)
+        compare(handle0.height, testCase.height)
+
+        var item1 = control.itemAt(1)
+        compare(item1.x, defaultHorizontalHandleWidth)
+        compare(item1.y, 0)
+        compare(item1.width, 0)
+        compare(item1.height, testCase.height)
+
+        var handle1 = handles[1]
+        compare(handle1.x, defaultHorizontalHandleWidth)
+        compare(handle1.y, 0)
+        compare(handle1.width, defaultHorizontalHandleWidth)
+        compare(handle1.height, testCase.height)
+
+        var item2 = control.itemAt(2)
+        compare(item2.x, defaultHorizontalHandleWidth * 2)
+        compare(item2.y, 0)
+        compare(item2.width, testCase.width - item2.x)
+        compare(item2.height, testCase.height)
+
+        item0.SplitView.preferredWidth = 25
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, 25)
+        compare(item0.height, testCase.height)
+        compare(handle0.x, item0.width)
+        compare(handle0.y, 0)
+        compare(handle0.width, defaultHorizontalHandleWidth)
+        compare(handle0.height, testCase.height)
+        compare(item1.x, 25 + defaultHorizontalHandleWidth)
+        compare(item1.y, 0)
+        compare(item1.width, 0)
+        compare(item1.height, testCase.height)
+        compare(handle1.x, item1.x + item1.width)
+        compare(handle1.y, 0)
+        compare(handle1.width, defaultHorizontalHandleWidth)
+        compare(handle1.height, testCase.height)
+        compare(item2.x, item1.x + item1.width + defaultHorizontalHandleWidth)
+        compare(item2.y, 0)
+        compare(item2.width, testCase.width - item2.x)
+        compare(item2.height, testCase.height)
+
+        item0.SplitView.minimumWidth = 50
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, 50)
+        compare(item0.height, testCase.height)
+        compare(handle0.x, item0.width)
+        compare(handle0.y, 0)
+        compare(handle0.width, defaultHorizontalHandleWidth)
+        compare(handle0.height, testCase.height)
+        compare(item1.x, 50 + defaultHorizontalHandleWidth)
+        compare(item1.y, 0)
+        compare(item1.width, 0)
+        compare(item1.height, testCase.height)
+        compare(handle1.x, item1.x + item1.width)
+        compare(handle1.y, 0)
+        compare(handle1.width, defaultHorizontalHandleWidth)
+        compare(handle1.height, testCase.height)
+        compare(item2.x, item1.x + item1.width + defaultHorizontalHandleWidth)
+        compare(item2.y, 0)
+        compare(item2.width, testCase.width - item2.x)
+        compare(item2.height, testCase.height)
+
+        item0.SplitView.preferredWidth = 100
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, 100)
+        compare(item0.height, testCase.height)
+        compare(handle0.x, item0.width)
+        compare(handle0.y, 0)
+        compare(handle0.width, defaultHorizontalHandleWidth)
+        compare(handle0.height, testCase.height)
+        compare(item1.x, 100 + defaultHorizontalHandleWidth)
+        compare(item1.y, 0)
+        compare(item1.width, 0)
+        compare(item1.height, testCase.height)
+        compare(handle1.x, item1.x + item1.width)
+        compare(handle1.y, 0)
+        compare(handle1.width, defaultHorizontalHandleWidth)
+        compare(handle1.height, testCase.height)
+        compare(item2.x, item1.x + item1.width + defaultHorizontalHandleWidth)
+        compare(item2.y, 0)
+        compare(item2.width, testCase.width - item2.x)
+        compare(item2.height, testCase.height)
+
+        item0.SplitView.maximumWidth = 75
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, 75)
+        compare(item0.height, testCase.height)
+        compare(handle0.x, item0.width)
+        compare(handle0.y, 0)
+        compare(handle0.width, defaultHorizontalHandleWidth)
+        compare(handle0.height, testCase.height)
+        compare(item1.x, 75 + defaultHorizontalHandleWidth)
+        compare(item1.y, 0)
+        compare(item1.width, 0)
+        compare(item1.height, testCase.height)
+        compare(handle1.x, item1.x + item1.width)
+        compare(handle1.y, 0)
+        compare(handle1.width, defaultHorizontalHandleWidth)
+        compare(handle1.height, testCase.height)
+        compare(item2.x, item1.x + item1.width + defaultHorizontalHandleWidth)
+        compare(item2.y, 0)
+        compare(item2.width, testCase.width - item2.x)
+        compare(item2.height, testCase.height)
+
+        item1.SplitView.fillWidth = true
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, 75)
+        compare(item0.height, testCase.height)
+        compare(handle0.x, item0.width)
+        compare(handle0.y, 0)
+        compare(handle0.width, defaultHorizontalHandleWidth)
+        compare(handle0.height, testCase.height)
+        compare(item1.x, 75 + defaultHorizontalHandleWidth)
+        compare(item1.y, 0)
+        compare(item1.width, testCase.width - 75 - defaultHorizontalHandleWidth * 2)
+        compare(item1.height, testCase.height)
+        compare(handle1.x, item1.x + item1.width)
+        compare(handle1.y, 0)
+        compare(handle1.width, defaultHorizontalHandleWidth)
+        compare(handle1.height, testCase.height)
+        compare(item2.x, testCase.width)
+        compare(item2.y, 0)
+        compare(item2.width, 0)
+        compare(item2.height, testCase.height)
+    }
+
+    Component {
+        id: itemComponent
+        Item {}
+    }
+
+    Component {
+        id: objectComponent
+        QtObject {}
+    }
+
+    function test_useAttachedPropertiesIncorrectly_data() {
+        var properties = [ "fillWidth", "fillHeight", "minimumWidth", "minimumHeight",
+            "preferredWidth", "preferredHeight",  "maximumWidth", "maximumHeight" ]
+
+        var data = []
+
+        for (var i = 0; i < properties.length; ++i) {
+            var property = properties[i]
+            data.push({ tag: "Item," + property, component: itemComponent, property: property,
+                expectedWarning: /.*SplitView: attached properties must be accessed through a direct child of SplitView/ })
+        }
+
+        for (i = 0; i < properties.length; ++i) {
+            property = properties[i]
+            data.push({ tag: "QtObject," + property, component: objectComponent, property: property,
+                expectedWarning: /.*SplitView: attached properties can only be used on Items/ })
+        }
+
+        return data
+    }
+
+    function test_useAttachedPropertiesIncorrectly(data) {
+        // The object (whatever it may be) is not managed by a SplitView.
+        var object = createTemporaryObject(data.component, testCase, { objectName: data.tag })
+        verify(object)
+
+        ignoreWarning(data.expectedWarning)
+        // Should warn, but not crash.
+        object.SplitView[data.property] = 1;
+    }
+
+    function test_sizes_data() {
+        var splitViewWidth = testCase.width
+        var splitViewHeight = testCase.height
+        var data = [
+            {
+                // When the combined size of items is too large, the non-fill items should just exceed
+                // the size of the SplitView, exactly as they would were they in a RowLayout, for example.
+                tag: "fillItemOnLeft",
+                expectedGeometries: [
+                    // We're the fill item, but since the combined implicitWidths
+                    // of the other two items take up all the space, we get none.
+                    { x: 0, y: 0, width: 0, height: splitViewHeight },
+                    // First handle.
+                    { x: 0, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // The second item does not fill, so its width should be unchanged.
+                    { x: defaultHorizontalHandleWidth, y: 0, width: 200, height: splitViewHeight },
+                    // Second handle.
+                    { x: 200 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: splitViewHeight },
+                    // The third item also gets its implicitWidth.
+                    { x: 200 + defaultHorizontalHandleWidth * 2, y: 0, width: 200, height: splitViewHeight }
+                ]
+            },
+            {
+                // Same as above except vertical.
+                tag: "fillItemOnTop",
+                expectedGeometries: [
+                    // We're the fill item, but since the combined implicitHeights
+                    // of the other two items take up all the space, we get none.
+                    { x: 0, y: 0, width: splitViewWidth, height: 0 },
+                    // First handle.
+                    { x: 0, y: 0, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    // The second item does not fill, so its height should be unchanged.
+                    { x: 0, y: defaultVerticalHandleHeight, width: splitViewWidth, height: 200 },
+                    // Second handle.
+                    { x: 0, y: 200 + defaultVerticalHandleHeight, width: splitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    // The third item also gets its implicitHeight.
+                    { x: 0, y: 200 + defaultVerticalHandleHeight * 2, width: splitViewWidth, height: 200 }
+                ]
+            },
+            {
+                tag: "fillItemInMiddle",
+                expectedGeometries: [
+                    // Our size is fixed.
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    // First handle.
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // The second item fills.
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0,
+                        width: splitViewWidth - 25 - 200 - defaultHorizontalHandleWidth * 2, height: splitViewHeight },
+                    // Second handle.
+                    { x: splitViewWidth - 200 - defaultHorizontalHandleWidth, y: 0,
+                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // The third item's size is also fixed.
+                    { x: splitViewWidth - 200, y: 0, width: 200, height: splitViewHeight }
+                ]
+            }
+        ]
+        return data
+    }
+
+    function test_sizes(data) {
+        var component = Qt.createComponent("splitview/" + data.tag + ".qml")
+        compare(component.status, Component.Ready, component.errorString());
+        var control = createTemporaryObject(component, testCase, { "handle": handleComponent })
+        verify(control)
+
+        compareSizes(control, data.expectedGeometries)
+    }
+
+    Component {
+        id: threeSizedItemsComponent
+
+        SplitView {
+            anchors.fill: parent
+            handle: handleComponent
+
+            Rectangle {
+                objectName: "salmon"
+                color: objectName
+                implicitWidth: 25
+                implicitHeight: 25
+            }
+            Rectangle {
+                objectName: "navajowhite"
+                color: objectName
+                implicitWidth: 100
+                implicitHeight: 100
+            }
+            Rectangle {
+                objectName: "steelblue"
+                color: objectName
+                implicitWidth: 200
+                implicitHeight: 200
+            }
+        }
+    }
+
+    function test_resetAttachedProperties_data() {
+        var splitViewWidth = testCase.width
+        var splitViewHeight = testCase.height
+        var data = [
+            {
+                tag: "resetMinimumWidth",
+                orientation: Qt.Horizontal,
+                // Set the minimumWidth to 50. It should be used instead of implicitWidth since it's greater than 25.
+                splitItemIndex: 0,
+                propertyName: "minimumWidth",
+                propertyValue: 50,
+                expectedGeometriesBefore: [
+                    { x: 0, y: 0, width: 50, height: splitViewHeight },
+                    { x: 50, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 50 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 50 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: splitViewHeight },
+                    { x: 50 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: splitViewWidth - 50 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
+                ],
+                // minimumWidth is now undefined, so implicitWidth should be used instead.
+                expectedGeometriesAfter: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: splitViewWidth - 25 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
+                ]
+            },
+            {
+                tag: "resetMinimumHeight",
+                orientation: Qt.Vertical,
+                // Set the minimumHeight to 50. It should be used instead of implicitHeight since it's greater than 25.
+                splitItemIndex: 0,
+                propertyName: "minimumHeight",
+                propertyValue: 50,
+                expectedGeometriesBefore: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 50 },
+                    { x: 0, y: 50, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 50 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
+                        height: splitViewHeight - 50 - 100 - defaultVerticalHandleHeight * 2 }
+                ],
+                // preferredHeight is now undefined, so implicitHeight should be used instead.
+                expectedGeometriesAfter: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
+                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
+                        height: splitViewHeight - 25 - 100 - defaultVerticalHandleHeight * 2 }
+                ]
+            },
+            {
+                tag: "resetPreferredWidth",
+                orientation: Qt.Horizontal,
+                // Set the preferredWidth to 50; it should be used instead of implicitWidth.
+                splitItemIndex: 0,
+                propertyName: "preferredWidth",
+                propertyValue: 50,
+                expectedGeometriesBefore: [
+                    { x: 0, y: 0, width: 50, height: splitViewHeight },
+                    { x: 50, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 50 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 50 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: splitViewHeight },
+                    { x: 50 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: splitViewWidth - 50 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
+                ],
+                // preferredWidth is now undefined, so implicitWidth should be used instead.
+                expectedGeometriesAfter: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: splitViewWidth - 25 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
+                ]
+            },
+            {
+                tag: "resetPreferredHeight",
+                orientation: Qt.Vertical,
+                // Set the preferredHeight to 50; it should be used instead of implicitHeight.
+                splitItemIndex: 0,
+                propertyName: "preferredHeight",
+                propertyValue: 50,
+                expectedGeometriesBefore: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 50 },
+                    { x: 0, y: 50, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 50 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
+                        height: splitViewHeight - 50 - 100 - defaultVerticalHandleHeight * 2 }
+                ],
+                // preferredHeight is now undefined, so implicitHeight should be used instead.
+                expectedGeometriesAfter: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
+                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
+                        height: splitViewHeight - 25 - 100 - defaultVerticalHandleHeight * 2 }
+                ]
+            },
+            {
+                tag: "resetMaximumWidth",
+                orientation: Qt.Horizontal,
+                // Set the maximumWidth to 15. It should be used instead of implicitWidth since it's less than 25.
+                splitItemIndex: 0,
+                propertyName: "maximumWidth",
+                propertyValue: 15,
+                expectedGeometriesBefore: [
+                    { x: 0, y: 0, width: 15, height: splitViewHeight },
+                    { x: 15, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 15 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 15 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: splitViewHeight },
+                    { x: 15 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: splitViewWidth - 15 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
+                ],
+                // maximumWidth is now undefined, so implicitWidth should be used instead.
+                expectedGeometriesAfter: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: splitViewWidth - 25 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
+                ]
+            },
+            {
+                tag: "resetMaximumHeight",
+                orientation: Qt.Vertical,
+                // Set the preferredHeight to 15. It should be used instead of implicitHeight if it's not undefined.
+                splitItemIndex: 0,
+                propertyName: "maximumHeight",
+                propertyValue: 15,
+                expectedGeometriesBefore: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 15 },
+                    { x: 0, y: 15, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 15 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 15 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    { x: 0, y: 15 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
+                        height: splitViewHeight - 15 - 100 - defaultVerticalHandleHeight * 2 }
+                ],
+                // preferredHeight is now undefined, so implicitHeight should be used instead.
+                expectedGeometriesAfter: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
+                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
+                        height: splitViewHeight - 25 - 100 - defaultVerticalHandleHeight * 2 }
+                ]
+            },
+        ]
+        return data;
+    }
+
+    function test_resetAttachedProperties(data) {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
+            { "orientation": data.orientation })
+        verify(control)
+
+        var splitItem = control.itemAt(data.splitItemIndex)
+        splitItem.SplitView[data.propertyName] = data.propertyValue
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometriesBefore, "after setting attached property")
+
+        splitItem.SplitView[data.propertyName] = undefined
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometriesAfter, "after resetting attached property")
+    }
+
+    function test_orientation() {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
+        verify(control)
+
+        var item0 = control.itemAt(0)
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, item0.implicitWidth)
+        compare(item0.height, testCase.height)
+
+        var handles = findHandles(control)
+        var handle0 = handles[0]
+        compare(handle0.x, item0.implicitWidth)
+        compare(handle0.y, 0)
+        compare(handle0.width, defaultHorizontalHandleWidth)
+        compare(handle0.height, testCase.height)
+
+        var item1 = control.itemAt(1)
+        compare(item1.x, item0.width + defaultHorizontalHandleWidth)
+        compare(item1.y, 0)
+        compare(item1.width, item1.implicitWidth)
+        compare(item1.height, testCase.height)
+
+        var handle1 = handles[1]
+        compare(handle1.x, item1.x + item1.width)
+        compare(handle1.y, 0)
+        compare(handle1.width, defaultHorizontalHandleWidth)
+        compare(handle1.height, testCase.height)
+
+        var item2 = control.itemAt(2)
+        compare(item2.x, item0.width + item1.width + defaultHorizontalHandleWidth * 2)
+        compare(item2.y, 0)
+        compare(item2.width, testCase.width - item2.x)
+        compare(item2.height, testCase.height)
+
+        control.orientation = Qt.Vertical
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compare(item0.x, 0)
+        compare(item0.y, 0)
+        compare(item0.width, testCase.width)
+        compare(item0.height, item0.implicitHeight)
+        handles = findHandles(control)
+        handle0 = handles[0]
+        compare(handle0.x, 0)
+        compare(handle0.y, item0.implicitHeight)
+        compare(handle0.width, testCase.width)
+        compare(handle0.height, defaultVerticalHandleHeight)
+        compare(item1.x, 0)
+        compare(item1.y, item0.height + defaultVerticalHandleHeight)
+        compare(item1.width, testCase.width)
+        compare(item1.height, item1.implicitHeight)
+        handle1 = handles[1]
+        compare(handle1.x, 0)
+        compare(handle1.y, item1.y + item1.height)
+        compare(handle1.width, testCase.width)
+        compare(handle1.height, defaultVerticalHandleHeight)
+        compare(item2.x, 0)
+        compare(item2.y, item0.height + item1.height + defaultVerticalHandleHeight * 2)
+        compare(item2.width, testCase.width)
+        compare(item2.height, testCase.height - item2.y)
+    }
+
+    readonly property int splitViewMargins: 50
+
+    Component {
+        id: threeItemsMinSizeAndFillComponent
+
+        SplitView {
+            anchors.fill: parent
+            handle: handleComponent
+
+            Rectangle {
+                objectName: "salmon"
+                color: objectName
+                implicitWidth: 25
+                implicitHeight: 25
+                SplitView.minimumWidth: 25
+                SplitView.minimumHeight: 25
+                SplitView.fillWidth: true
+                SplitView.fillHeight: true
+            }
+            Rectangle {
+                objectName: "navajowhite"
+                color: objectName
+                implicitWidth: 100
+                implicitHeight: 100
+            }
+            Rectangle {
+                objectName: "steelblue"
+                color: objectName
+                implicitWidth: 200
+                implicitHeight: 200
+            }
+        }
+    }
+
+    Component {
+        id: repeaterSplitViewComponent
+
+        SplitView {
+            anchors.fill: parent
+            handle: handleComponent
+
+            property alias repeater: repeater
+
+            Repeater {
+                id: repeater
+                model: 3
+                delegate: Rectangle {
+                    objectName: "rectDelegate" + index
+
+                    SplitView.preferredWidth: 25
+
+                    color: "#aaff0000"
+
+                    Text {
+                        text: parent.x + "," + parent.y + " " + parent.width + "x" + parent.height
+                        color: "white"
+                        rotation: 90
+                        anchors.centerIn: parent
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: hiddenItemSplitViewComponent
+
+        SplitView {
+            anchors.fill: parent
+            handle: handleComponent
+
+            Rectangle {
+                objectName: "steelblue"
+                color: objectName
+
+                SplitView.minimumWidth: 50
+            }
+            Rectangle {
+                objectName: "tomato"
+                color: objectName
+
+                SplitView.fillWidth: true
+                SplitView.preferredWidth: 200
+            }
+            Rectangle {
+                objectName: "navajowhite"
+                color: objectName
+                visible: false
+
+                SplitView.minimumWidth: visible ? 100 : 0
+            }
+            Rectangle {
+                objectName: "mediumseagreen"
+                color: objectName
+
+                SplitView.minimumWidth: 50
+            }
+        }
+    }
+
+    function test_dragHandle_data() {
+        var splitViewWidth = testCase.width - splitViewMargins * 2
+        var splitViewHeight = testCase.height - splitViewMargins * 2
+        var data = [
+            {
+                tag: "fillThirdItemAndDragFirstHandlePastRightSide",
+                component: threeSizedItemsComponent,
+                orientation: Qt.Horizontal,
+                // The index of the item that will fill.
+                fillIndex: 2,
+                // The index of the handle to be dragged.
+                handleIndex: 0,
+                // The position where the center of the handle will be.
+                newHandlePos: Qt.point(testCase.width + 20, testCase.height / 2),
+                // The expected geometry of each item managed by the SplitView before dragging the handle.
+                expectedGeometriesBeforeDrag: [
+                    // First item.
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    // First handle.
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // Second item.
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    // Second handle.
+                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // Third item (fills).
+                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: splitViewWidth - 25 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
+                ],
+                // The expected geometry of each item managed by the SplitView after dragging the handle.
+                expectedGeometriesAfterDrag: [
+                    // The fill item is to the right of the handle at index 0, so the handle belongs
+                    // to the left item: us. We should consume all of the fill item's width.
+                    { x: 0, y: 0, width: splitViewWidth - 100 - defaultHorizontalHandleWidth * 2,
+                        height: splitViewHeight },
+                    // First handle.
+                    { x: splitViewWidth - defaultHorizontalHandleWidth * 2 - 100,
+                        y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // The second item does not fill, so its width should be unchanged.
+                    { x: splitViewWidth - 100 - defaultHorizontalHandleWidth,
+                        y: 0, width: 100, height: splitViewHeight },
+                    // Second handle.
+                    { x: splitViewWidth - defaultHorizontalHandleWidth,
+                        y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // The last item does fill, so it should lose all of its width.
+                    { x: splitViewWidth, y: 0, width: 0, height: splitViewHeight }
+                ]
+            },
+            {
+                tag: "fillThirdItemAndDragFirstHandlePastBottomSide",
+                component: threeSizedItemsComponent,
+                orientation: Qt.Vertical,
+                fillIndex: 2,
+                handleIndex: 0,
+                newHandlePos: Qt.point(testCase.width / 2, testCase.height + 20),
+                expectedGeometriesBeforeDrag: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
+                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2,
+                        width: splitViewWidth, height: splitViewHeight - 25 - 100 - defaultVerticalHandleHeight * 2 }
+                ],
+                // The expected geometry of each item managed by the SplitView after dragging the handle.
+                expectedGeometriesAfterDrag: [
+                    // The fill item is to the bottom of the handle at index 0, so the handle belongs
+                    // to the top item: us. We should consume all of the fill item's width.
+                    { x: 0, y: 0, width: splitViewWidth,
+                        height: splitViewHeight - 100 - defaultVerticalHandleHeight * 2 },
+                    // First handle.
+                    { x: 0, y: splitViewHeight - defaultVerticalHandleHeight * 2 - 100,
+                        width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    // The second item does not fill, so its height should be unchanged.
+                    { x: 0, y: splitViewWidth - 100 - defaultVerticalHandleHeight,
+                        width: splitViewWidth, height: 100 },
+                    // Second handle.
+                    { x: 0, y: splitViewHeight - defaultVerticalHandleHeight,
+                        width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    // The last item does fill, so it should lose all of its width.
+                    { x: 0, y: splitViewHeight, width: splitViewWidth, height: 0 }
+                ]
+            },
+            {
+                tag: "fillThirdItemAndDragSecondHandlePastLeftSide",
+                component: threeSizedItemsComponent,
+                orientation: Qt.Horizontal,
+                fillIndex: 2,
+                handleIndex: 1,
+                newHandlePos: Qt.point(-20, testCase.height / 2),
+                expectedGeometriesBeforeDrag: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: splitViewWidth - 25 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
+                ],
+                expectedGeometriesAfterDrag: [
+                    // The fill item is to the right of the handle at index 1, so the handle belongs
+                    // to the second item; our width should be unchanged.
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    // First handle.
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // The second item is the one being resized, and since we're dragging its handle
+                    // to the left, its width should decrease.
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 0, height: splitViewHeight },
+                    // Second handle.
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: splitViewHeight },
+                    // The last item fills, so it should get the second item's lost width.
+                    { x: 25 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: splitViewWidth - 25 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
+                ]
+            },
+            {
+                tag: "fillThirdItemAndDragSecondHandlePastTopSide",
+                component: threeSizedItemsComponent,
+                orientation: Qt.Vertical,
+                fillIndex: 2,
+                handleIndex: 1,
+                newHandlePos: Qt.point(testCase.width / 2, -20),
+                expectedGeometriesBeforeDrag: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
+                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2,
+                        width: splitViewWidth, height: splitViewHeight - 25 - 100 - defaultVerticalHandleHeight * 2 }
+                ],
+                expectedGeometriesAfterDrag: [
+                    // The fill item is to the bottom of the handle at index 1, so the handle belongs
+                    // to the second item; our height should be unchanged.
+                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
+                    // First handle.
+                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    // The second item is the one being resized, and since we're dragging its handle
+                    // to the top, its height should decrease.
+                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 0 },
+                    // Second handle.
+                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    // The last item fills, so it should get the second item's lost height.
+                    { x: 0, y: 25 + defaultVerticalHandleHeight * 2,
+                        width: splitViewWidth, height: splitViewHeight - 25 - defaultVerticalHandleHeight * 2 }
+                ]
+            },
+            {
+                // First item should start off empty and then eventually take up all of 3rd item's space
+                // as the handle is dragged past the right side.
+                tag: "fillFirstItemAndDragSecondHandlePastRightSide",
+                component: threeSizedItemsComponent,
+                orientation: Qt.Horizontal,
+                fillIndex: 0,
+                handleIndex: 1,
+                newHandlePos: Qt.point(testCase.width + 20, testCase.height / 2),
+                expectedGeometriesBeforeDrag: [
+                    { x: 0, y: 0, width: 0, height: splitViewHeight },
+                    { x: 0, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 100 + defaultHorizontalHandleWidth * 2, y: 0, width: 200, height: splitViewHeight }
+                ],
+                expectedGeometriesAfterDrag: [
+                    // The fill item is to the left of the handle at index 1, so the handle belongs
+                    // to the third item. Since we're moving the handle to the right side of the
+                    // SplitView, our width should grow as we consume the width of the third item.
+                    { x: 0, y: 0, width: splitViewWidth - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight },
+                    // First handle.
+                    { x: splitViewWidth - 100 - defaultHorizontalHandleWidth * 2, y: 0,
+                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // The second item's width remains unchanged.
+                    { x: splitViewWidth - 100 - defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    // Second handle.
+                    { x: splitViewWidth - defaultHorizontalHandleWidth, y: 0,
+                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // The last item loses its width.
+                    { x: splitViewWidth, y: 0, width: 0, height: splitViewHeight }
+                ]
+            },
+            {
+                // First item should start off empty and then eventually take up all of 3rd item's space
+                // as the handle is dragged past the bottom side.
+                tag: "fillFirstItemAndDragSecondHandlePastBottomSide",
+                component: threeSizedItemsComponent,
+                orientation: Qt.Vertical,
+                fillIndex: 0,
+                handleIndex: 1,
+                newHandlePos: Qt.point(testCase.width / 2, testCase.height + 20),
+                expectedGeometriesBeforeDrag: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 0 },
+                    { x: 0, y: 0, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 100 + defaultVerticalHandleHeight, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth, height: 200 }
+                ],
+                expectedGeometriesAfterDrag: [
+                    // The fill item is to the top of the handle at index 1, so the handle belongs
+                    // to the third item. Since we're moving the handle to the bottom side of the
+                    // SplitView, our height should grow as we consume the height of the third item.
+                    { x: 0, y: 0, width: splitViewWidth, height: splitViewHeight - 100 - defaultVerticalHandleHeight * 2 },
+                    // First handle.
+                    { x: 0, y: splitViewHeight - 100 - defaultVerticalHandleHeight * 2,
+                        width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    // The second item's width remains unchanged.
+                    { x: 0, y: splitViewHeight - 100 - defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
+                    // Second handle.
+                    { x: 0, y: splitViewHeight - defaultVerticalHandleHeight,
+                        width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    // The last item loses its width.
+                    { x: 0, y: splitViewHeight, width: splitViewHeight, height: 0 }
+                ]
+            },
+            {
+                tag: "fillFirstItemAndDragFirstHandlePastLeftSide",
+                component: threeSizedItemsComponent,
+                orientation: Qt.Horizontal,
+                fillIndex: 0,
+                handleIndex: 0,
+                newHandlePos: Qt.point(-20, testCase.height / 2),
+                expectedGeometriesBeforeDrag: [
+                    { x: 0, y: 0, width: 0, height: splitViewHeight },
+                    { x: 0, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // The second item's implicitWidth is 100, and ours is 200. The available width is 300,
+                    // so both items get their implicit widths.
+                    { x: 100 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 100, height: splitViewHeight }
+                ],
+                // Should be unchanged.
+                expectedGeometriesAfterDrag: [
+                    { x: 0, y: 0, width: 0, height: splitViewHeight },
+                    { x: 0, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 100 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 100, height: splitViewHeight }
+                ]
+            },
+            {
+                tag: "fillFirstItemWithMinWidthAndDragFirstHandlePastLeftSide",
+                component: threeItemsMinSizeAndFillComponent,
+                orientation: Qt.Horizontal,
+                fillIndex: 0,
+                handleIndex: 0,
+                newHandlePos: Qt.point(-20, testCase.height / 2),
+                expectedGeometriesBeforeDrag: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 100, height: splitViewHeight }
+                ],
+                // Should be unchanged.
+                expectedGeometriesAfterDrag: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 100, height: splitViewHeight }
+                ]
+            },
+            {
+                tag: "repeater",
+                component: repeaterSplitViewComponent,
+                orientation: Qt.Horizontal,
+                fillIndex: 2,
+                handleIndex: 1,
+                newHandlePos: Qt.point(200, testCase.height / 2),
+                expectedGeometriesBeforeDrag: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25 * 2 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 * 2 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 70 , height: splitViewHeight }
+                ],
+                expectedGeometriesAfterDrag: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 105, height: splitViewHeight },
+                    { x: 140, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 150, y: 0, width: 150, height: splitViewHeight }
+                ]
+            },
+            {
+                tag: "hiddenItemSplitViewComponent",
+                // [50] | [200 (fill)] | [hidden] | [50]
+                component: hiddenItemSplitViewComponent,
+                orientation: Qt.Horizontal,
+                fillIndex: 1,
+                handleIndex: 1,
+                // Drag to the horizontal centre of the SplitView.
+                newHandlePos: Qt.point(splitViewMargins + 150, testCase.height / 2),
+                expectedGeometriesBeforeDrag: [
+                    { x: 0, y: 0, width: 50, height: splitViewHeight },
+                    { x: 50, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 50 + defaultHorizontalHandleWidth, y: 0, width: 200 - defaultHorizontalHandleWidth * 2, height: splitViewHeight },
+                    { x: 250 - (defaultHorizontalHandleWidth * 2) + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { hidden: true }, // Third item should be hidden.
+                    { hidden: true }, // Handle for third item should be hidden.
+                    { x: 250 - (defaultHorizontalHandleWidth * 2) + defaultHorizontalHandleWidth * 2, y: 0, width: 50, height: splitViewHeight }
+                ],
+                expectedGeometriesAfterDrag: [
+                    { x: 0, y: 0, width: 50, height: splitViewHeight },
+                    { x: 50, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // Width of the fill item should end up smaller.
+                    { x: 50 + defaultHorizontalHandleWidth, y: 0, width: 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight },
+                    { x: 150 - (defaultHorizontalHandleWidth * 2) + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { hidden: true }, // Third item should be hidden.
+                    { hidden: true }, // Handle for third item should be hidden.
+                    // Width of the last item should grow.
+                    { x: 150 - (defaultHorizontalHandleWidth * 2) + defaultHorizontalHandleWidth * 2, y: 0, width: 150, height: splitViewHeight }
+                ]
+            }
+        ]
+        return data
+    }
+
+    function test_dragHandle(data) {
+        var control = createTemporaryObject(data.component, testCase)
+        verify(control)
+
+        control.orientation = data.orientation
+
+        // Ensure that there is space to drag outside of the SplitView.
+        control.anchors.margins = splitViewMargins
+
+        var fillItem = control.itemAt(data.fillIndex)
+        if (control.orientation === Qt.Horizontal)
+            fillItem.SplitView.fillWidth = true
+        else
+            fillItem.SplitView.fillHeight = true
+
+        // Check the sizes (and visibility) of the items before the drag.
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometriesBeforeDrag, "before drag")
+
+        // Drag the handle.
+        var handles = findHandles(control)
+        var targetHandle = handles[data.handleIndex]
+        verify(targetHandle.visible)
+        mousePress(targetHandle)
+        verify(control.resizing)
+        // newHandlePos is in scene coordinates, so map it to coordinates local to the handle.
+        var localPos = testCase.mapToItem(targetHandle, data.newHandlePos.x, data.newHandlePos.y)
+        mouseMove(targetHandle, localPos.x - targetHandle.width / 2, localPos.y - targetHandle.height / 2)
+        verify(control.resizing)
+        compareSizes(control, data.expectedGeometriesAfterDrag, "after drag move")
+
+        // The geometries should remain unchanged after releasing.
+        mouseRelease(targetHandle, localPos.x - targetHandle.width / 2, localPos.y - targetHandle.height / 2, Qt.LeftButton)
+        verify(!control.resizing)
+        compareSizes(control, data.expectedGeometriesAfterDrag, "after drag release")
+    }
+
+    function test_splitViewGeometryChanges_data() {
+        var defaultSplitViewWidth = testCase.width
+        var defaultSplitViewHeight = testCase.height
+
+        var data = [
+            {
+                tag: "growWidth",
+                orientation: Qt.Horizontal,
+                splitViewWidth: 800,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: 25, height: defaultSplitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: defaultSplitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: defaultSplitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: defaultSplitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: 800 - 25 - 100 - defaultHorizontalHandleWidth * 2, height: defaultSplitViewHeight }
+                ]
+            },
+            {
+                // Same as above except vertical.
+                tag: "growHeight",
+                orientation: Qt.Vertical,
+                splitViewHeight: 800,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: defaultSplitViewWidth, height: 25 },
+                    { x: 0, y: 25, width: defaultSplitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: defaultSplitViewWidth, height: 100 },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: defaultSplitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2, width: defaultSplitViewWidth,
+                        height: 800 - 25 - 100 - defaultVerticalHandleHeight * 2 }
+                ]
+            },
+            {
+                tag: "shrinkWidth",
+                orientation: Qt.Horizontal,
+                splitViewWidth: 200,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: 25, height: defaultSplitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: defaultSplitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: defaultSplitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: defaultSplitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: 200 - 25 - 100 - defaultHorizontalHandleWidth * 2, height: defaultSplitViewHeight }
+                ]
+            },
+            {
+                // Same as above except vertical.
+                tag: "shrinkHeight",
+                orientation: Qt.Vertical,
+                splitViewHeight: 200,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: defaultSplitViewWidth, height: 25 },
+                    { x: 0, y: 25, width: defaultSplitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: defaultSplitViewWidth, height: 100 },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: defaultSplitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2, width: defaultSplitViewWidth,
+                        height: 200 - 25 - 100 - defaultVerticalHandleHeight * 2 }
+                ]
+            },
+        ]
+        return data
+    }
+
+    function test_splitViewGeometryChanges(data) {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
+            { "handle": handleComponent, "anchors.fill": undefined, "orientation": data.orientation })
+        verify(control)
+
+        if (data.hasOwnProperty("splitViewWidth"))
+            control.width = data.splitViewWidth
+        else
+            control.width = testCase.width
+
+        if (data.hasOwnProperty("splitViewHeight"))
+            control.height = data.splitViewHeight
+        else
+            control.height = testCase.height
+
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometries)
+    }
+
+    function test_splitItemImplicitSizeChanges_data() {
+        var defaultSplitViewWidth = testCase.width
+        var defaultSplitViewHeight = testCase.height
+
+        var data = [
+            {
+                tag: "growImplicitWidth",
+                orientation: Qt.Horizontal,
+                splitItemImplicitWidth: 50,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: 50, height: defaultSplitViewHeight },
+                    { x: 50, y: 0, width: defaultHorizontalHandleWidth, height: defaultSplitViewHeight },
+                    { x: 50 + defaultHorizontalHandleWidth, y: 0, width: 100, height: defaultSplitViewHeight },
+                    { x: 50 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
+                        height: defaultSplitViewHeight },
+                    { x: 50 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: defaultSplitViewWidth - 50 - 100 - defaultHorizontalHandleWidth * 2, height: defaultSplitViewHeight }
+                ]
+            },
+            {
+                tag: "growImplicitHeight",
+                orientation: Qt.Vertical,
+                splitItemImplicitHeight: 50,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: defaultSplitViewWidth, height: 50 },
+                    { x: 0, y: 50, width: defaultSplitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 50 + defaultVerticalHandleHeight, width: defaultSplitViewWidth, height: 100 },
+                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight, width: defaultSplitViewWidth,
+                        height: defaultVerticalHandleHeight },
+                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight * 2, width: defaultSplitViewWidth,
+                        height: defaultSplitViewHeight - 50 - 100 - defaultVerticalHandleHeight * 2 }
+                ]
+            }
+        ]
+        return data
+    }
+
+    // Tests that implicitWidth/Height changes in items are noticed by SplitView.
+    function test_splitItemImplicitSizeChanges(data) {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
+            { "handle": handleComponent, "orientation": data.orientation })
+        verify(control)
+
+        var firstItem = control.itemAt(0)
+
+        if (data.hasOwnProperty("splitItemImplicitWidth"))
+            firstItem.implicitWidth = data.splitItemImplicitWidth
+
+        if (data.hasOwnProperty("splitItemImplicitHeight"))
+            firstItem.implicitHeight = data.splitItemImplicitHeight
+
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometries)
+    }
+
+    Component {
+        id: largerHandle
+        Rectangle {
+            objectName: "largerHandle"
+            implicitWidth: 20
+            implicitHeight: 20
+            color: "#444"
+        }
+    }
+
+    Component {
+        id: smallerHandle
+        Rectangle {
+            objectName: "smallerHandle"
+            implicitWidth: 5
+            implicitHeight: 5
+            color: "#444"
+        }
+    }
+
+    function test_handleChanges_data() {
+        var splitViewWidth = testCase.width
+        var splitViewHeight = testCase.height
+
+        var data = [
+            {
+                tag: "growHandleWidth",
+                orientation: Qt.Horizontal,
+                handleComponent: largerHandle,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: 20, height: splitViewHeight },
+                    { x: 25 + 20, y: 0, width: 100, height: splitViewHeight },
+                    { x: 25 + 100 + 20, y: 0, width: 20, height: splitViewHeight },
+                    { x: 25 + 100 + 20 * 2, y: 0, width: splitViewWidth - 25 - 100 - 20 * 2,
+                        height: splitViewHeight }
+                ]
+            },
+            {
+                // Same as above except vertical.
+                tag: "growHandleHeight",
+                orientation: Qt.Vertical,
+                handleComponent: largerHandle,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
+                    { x: 0, y: 25, width: splitViewWidth, height: 20 },
+                    { x: 0, y: 25 + 20, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 25 + 100 + 20, width: splitViewWidth, height: 20 },
+                    { x: 0, y: 25 + 100 + 20 * 2, width: splitViewWidth,
+                        height: splitViewHeight - 25 - 100 - 20 * 2 }
+                ]
+            },
+            {
+                tag: "shrinkHandleWidth",
+                orientation: Qt.Horizontal,
+                handleComponent: smallerHandle,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: 5, height: splitViewHeight },
+                    { x: 25 + 5, y: 0, width: 100, height: splitViewHeight },
+                    { x: 25 + 100 + 5, y: 0, width: 5, height: splitViewHeight },
+                    { x: 25 + 100 + 5 * 2, y: 0, width: splitViewWidth - 25 - 100 - 5 * 2,
+                        height: splitViewHeight }
+                ]
+            },
+            {
+                // Same as above except vertical.
+                tag: "shrinkHandleHeight",
+                orientation: Qt.Vertical,
+                handleComponent: smallerHandle,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
+                    { x: 0, y: 25, width: splitViewWidth, height: 5 },
+                    { x: 0, y: 25 + 5, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 25 + 100 + 5, width: splitViewWidth, height: 5 },
+                    { x: 0, y: 25 + 100 + 5 * 2, width: splitViewWidth,
+                        height: splitViewHeight - 25 - 100 - 5 * 2 }
+                ]
+            }
+        ]
+        return data
+    }
+
+    function test_handleChanges(data) {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
+            { "orientation": data.orientation })
+        verify(control)
+
+        control.handle = data.handleComponent
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometries)
+    }
+
+    function test_insertRemoveItems_data() {
+        var splitViewWidth = testCase.width
+        var splitViewHeight = testCase.height
+
+        var data = [
+            {
+                tag: "insertItemAtHorizontalEnd",
+                orientation: Qt.Horizontal,
+                insertItemAtIndex: 3,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
+                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0,
+                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // This was the fill item originally, but since no fill item is explicitly
+                    // specified, and we added an item to the right of it, it is no longer the fill item
+                    // because it's no longer last.
+                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: 200, height: splitViewHeight },
+                    // Handle for newly added item.
+                    { x: 25 + 100 + 200 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // Newly added item.
+                    { x: 25 + 100 + 200 + defaultHorizontalHandleWidth * 3, y: 0,
+                        width: splitViewWidth - 25 - 100 - 200 - defaultHorizontalHandleWidth * 3,
+                        height: splitViewHeight },
+                ]
+            },
+            {
+                tag: "insertItemAtHorizontalBeginning",
+                orientation: Qt.Horizontal,
+                insertItemAtIndex: 0,
+                expectedGeometries: [
+                    // Newly added item.
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25 * 2 + defaultHorizontalHandleWidth, y: 0,
+                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 * 2 + defaultHorizontalHandleWidth * 2, y: 0, width: 100, height: splitViewHeight },
+                    { x: 25 * 2 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // Fill item doesn't change.
+                    { x: 25 * 2 + 100 + defaultHorizontalHandleWidth * 3, y: 0,
+                        width: splitViewWidth - 25 * 2 - 100 - defaultHorizontalHandleWidth * 3,
+                        height: splitViewHeight },
+                ]
+            },
+            {
+                tag: "removeItemFromHorizontalEnd",
+                orientation: Qt.Horizontal,
+                removeItemAtIndex: 2,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0,
+                        width: splitViewWidth - 25 - defaultHorizontalHandleWidth, height: splitViewHeight },
+                ]
+            },
+            {
+                tag: "removeItemFromHorizontalBeginning",
+                orientation: Qt.Horizontal,
+                removeItemAtIndex: 0,
+                expectedGeometries: [
+                    { x: 0, y: 0, width: 100, height: splitViewHeight },
+                    { x: 100, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 100 + defaultHorizontalHandleWidth, y: 0,
+                        width: splitViewWidth - 100 - defaultHorizontalHandleWidth, height: splitViewHeight },
+                ]
+            }
+        ]
+        return data
+    }
+
+    Component {
+        id: smallRectComponent
+
+        Rectangle {
+            objectName: "darkseagreen"
+            color: objectName
+            implicitWidth: 25
+            implicitHeight: 25
+        }
+    }
+
+    function test_insertRemoveItems(data) {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
+            { "orientation": data.orientation })
+        verify(control)
+
+        if (data.hasOwnProperty("removeItemAtIndex")) {
+            var itemToRemove = control.itemAt(data.removeItemAtIndex)
+            verify(itemToRemove)
+
+            control.removeItem(itemToRemove)
+        } else if (data.hasOwnProperty("insertItemAtIndex")) {
+            var itemToAdd = smallRectComponent.createObject(control)
+            control.insertItem(data.insertItemAtIndex, itemToAdd)
+        }
+
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometries)
+    }
+
+    function test_removeAllItems() {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
+        verify(control)
+
+        while (control.count > 0)
+            var itemToRemove = control.removeItem(control.itemAt(0))
+        // Shouldn't crash.
+    }
+
+    function test_hideItems_data() {
+        var splitViewWidth = testCase.width
+        var splitViewHeight = testCase.height
+
+        var data = [
+            {
+                tag: "hideItemAtHorizontalEnd",
+                orientation: Qt.Horizontal,
+                hideIndices: [2],
+                expectedGeometries: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0,
+                        width: splitViewWidth - 25 - defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { hidden: true }, // Handle for second item should be hidden.
+                    { hidden: true } // Last item should be hidden.
+                ]
+            },
+            {
+                tag: "hideItemAtHorizontalBeginning",
+                orientation: Qt.Horizontal,
+                hideIndices: [0],
+                expectedGeometries: [
+                    { hidden: true }, // First item should be hidden.
+                    { hidden: true }, // Handle for first item should be hidden.
+                    { x: 0, y: 0, width: 100, height: splitViewHeight },
+                    { x: 100, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 100 + defaultHorizontalHandleWidth, y: 0,
+                        width: splitViewWidth - 100 - defaultHorizontalHandleWidth, height: splitViewHeight }
+                ]
+            },
+            {
+                tag: "hideItemAtVerticalEnd",
+                orientation: Qt.Vertical,
+                hideIndices: [2],
+                expectedGeometries: [
+                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
+                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 25 + defaultVerticalHandleHeight,
+                        width: splitViewWidth, height: splitViewHeight - 25 - defaultVerticalHandleHeight },
+                    { hidden: true }, // Handle for second item should be hidden.
+                    { hidden: true } // Last item should be hidden.
+                ]
+            },
+            {
+                tag: "hideItemAtVerticalBeginning",
+                orientation: Qt.Vertical,
+                hideIndices: [0],
+                expectedGeometries: [
+                    { hidden: true }, // First item should be hidden.
+                    { hidden: true }, // Handle for first item should be hidden.
+                    { x: 0, y: 0, width: splitViewWidth, height: 100 },
+                    { x: 0, y: 100, width: splitViewWidth, height: defaultVerticalHandleHeight },
+                    { x: 0, y: 100 + defaultVerticalHandleHeight,
+                        width: splitViewWidth, height: splitViewHeight - 100 - defaultVerticalHandleHeight }
+                ]
+            },
+            {
+                // No handles should be visible when there's only one item.
+                tag: "hideLastTwoHorizontalItems",
+                orientation: Qt.Horizontal,
+                hideIndices: [1, 2],
+                expectedGeometries: [
+                    { x: 0, y: 0, width: splitViewWidth, height: splitViewHeight },
+                    { hidden: true }, // Handle for first item should be hidden.
+                    { hidden: true }, // Second item should be hidden.
+                    { hidden: true }, // Handle for second item should be hidden.
+                    { hidden: true } // Third item should be hidden.
+                ]
+            }
+        ]
+        return data
+    }
+
+    function test_hideItems(data) {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
+            { "orientation": data.orientation })
+        verify(control)
+
+        for (var i = 0; i < data.hideIndices.length; ++i) {
+            var itemToHide = control.itemAt(data.hideIndices[i])
+            verify(itemToHide)
+            itemToHide.visible = false
+        }
+
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometries)
+    }
+
+    function test_hideAndShowItems_data() {
+        var splitViewWidth = testCase.width
+        var splitViewHeight = testCase.height
+
+        var data = [
+            {
+                tag: "hideLastTwoHorizontalItems",
+                orientation: Qt.Horizontal,
+                hideIndices: [1, 2],
+                expectedGeometriesAfterHiding: [
+                    { x: 0, y: 0, width: splitViewWidth, height: splitViewHeight },
+                    { hidden: true }, // Handle for first item should be hidden.
+                    { hidden: true }, // Second item should be hidden.
+                    { hidden: true }, // Handle for second item should be hidden.
+                    { hidden: true } // Third item should be hidden.
+                ],
+                showIndices: [1],
+                expectedGeometriesAfterShowing: [
+                    // First item should be visible with its implicit size.
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    // Handle for first item should be visible.
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // Second item should be visible and fill.
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0,
+                        width: splitViewWidth - 25 - defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { hidden: true }, // Handle for second item should be hidden.
+                    { hidden: true } // Third item should be hidden.
+                ]
+            }
+        ]
+        return data
+    }
+
+    function test_hideAndShowItems(data) {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
+            { "orientation": data.orientation })
+        verify(control)
+
+        for (var i = 0; i < data.hideIndices.length; ++i) {
+            var itemToHide = control.itemAt(data.hideIndices[i])
+            verify(itemToHide)
+            itemToHide.visible = false
+        }
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometriesAfterHiding, "after hiding")
+
+        for (i = 0; i < data.showIndices.length; ++i) {
+            var itemToShow = control.itemAt(data.showIndices[i])
+            verify(itemToShow)
+            itemToShow.visible = true
+        }
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometriesAfterShowing, "after showing")
+    }
+
+    function test_moveHiddenItems_data() {
+        var splitViewWidth = testCase.width
+        var splitViewHeight = testCase.height
+
+        var data = [
+            {
+                tag: "hideSecondItemAndMoveItToFirst",
+                orientation: Qt.Horizontal,
+                hideIndices: [1],
+                moveFromIndex: 1,
+                moveToIndex: 0,
+                expectedGeometriesAfterMoving: [
+                    { hidden: true }, // First item (was second) should be hidden.
+                    { hidden: true }, // Handle for first item should be hidden.
+                    // Second item (was first) should get its implicit size.
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0,
+                        width: splitViewWidth - 25 - defaultHorizontalHandleWidth, height: splitViewHeight },
+                ],
+                showIndices: [0],
+                expectedGeometriesAfterShowing: [
+                    // First item (was second) should be visible with its implicit size.
+                    { x: 0, y: 0, width: 100, height: splitViewHeight },
+                    // Handle for first item (was second) should be visible.
+                    { x: 100, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    // Second item (was first) should be visible with its implicit size.
+                    { x: 100 + defaultHorizontalHandleWidth, y: 0,
+                        width: 25, height: splitViewHeight },
+                    { x: 100 + 25 + defaultHorizontalHandleWidth, y: 0,
+                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 100 + 25 + defaultHorizontalHandleWidth * 2, y: 0,
+                        width: splitViewWidth - 100 - 25 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
+                ]
+            }
+        ]
+        return data
+    }
+
+    function test_moveHiddenItems(data) {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
+            { "orientation": data.orientation })
+        verify(control)
+
+        for (var i = 0; i < data.hideIndices.length; ++i) {
+            var itemToHide = control.itemAt(data.hideIndices[i])
+            verify(itemToHide)
+            itemToHide.visible = false
+        }
+
+        control.moveItem(data.moveFromIndex, data.moveToIndex)
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometriesAfterMoving, "after moving")
+
+        for (i = 0; i < data.showIndices.length; ++i) {
+            var itemToShow = control.itemAt(data.showIndices[i])
+            verify(itemToShow)
+            itemToShow.visible = true
+        }
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compareSizes(control, data.expectedGeometriesAfterShowing, "after showing")
+    }
+
+    Component {
+        id: flickableComponent
+
+        Flickable {
+            anchors.fill: parent
+            anchors.margins: 100
+        }
+    }
+
+    function test_draggingHandleInFlickable() {
+        var flickable = createTemporaryObject(flickableComponent, testCase)
+        verify(flickable)
+
+        var control = threeSizedItemsComponent.createObject(flickable.contentItem)
+        verify(control)
+
+        control.anchors.fill = undefined
+        control.width = 400
+        control.height = control.parent.height - 100
+        flickable.contentWidth = control.width
+        flickable.contentHeight = control.height
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+
+        var contentXSpy = signalSpyComponent.createObject(flickable,
+            { target: flickable, signalName: "contentXChanged" })
+        verify(contentXSpy.valid)
+        var contentYSpy = signalSpyComponent.createObject(flickable,
+            { target: flickable, signalName: "contentYChanged" })
+        verify(contentYSpy.valid)
+
+        // Drag the first handle to the right;
+        // the flickable's contentX and contentY shouldn't change.
+        var firstItem = control.itemAt(0)
+        var firstItemOriginalWidth = firstItem.width
+        var handles = findHandles(control)
+        var firstHandle = handles[0]
+        // Add some vertical movement in there as well.
+        mouseDrag(firstHandle, firstHandle.width / 2, firstHandle.height / 2, 100, 50)
+        compare(contentXSpy.count, 0)
+        compare(contentYSpy.count, 0)
+        verify(firstItem.width > firstItemOriginalWidth)
+
+        // Now do the same except vertically.
+        control.orientation = Qt.Vertical
+        control.width = control.parent.width - 100
+        control.height = 400
+        var firstItemOriginalHeight = firstItem.height
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+
+        // Add some horizontal movement in there as well.
+        mouseDrag(firstHandle, firstHandle.width / 2, firstHandle.height / 2, 50, 100)
+        compare(contentXSpy.count, 0)
+        compare(contentYSpy.count, 0)
+        verify(firstItem.height > firstItemOriginalHeight)
+    }
+
+    Component {
+        id: splitViewHandleContainmentMaskComponent
+
+        MouseArea {
+            property alias mouseArea1: mouseArea1
+            property alias mouseArea2: mouseArea2
+            property alias splitView: splitView
+
+            anchors.fill: parent
+            hoverEnabled: true
+            acceptedButtons: Qt.LeftButton
+
+            Rectangle {
+                anchors.fill: parent
+                color: 'green'
+                opacity: 0.3
+            }
+
+            SplitView {
+                id: splitView
+
+                anchors {
+                    fill: parent
+                    margins: 100
+                }
+
+                handle: Rectangle {
+                    id: handleRoot
+
+                    readonly property bool containsMouse: SplitHandle.hovered
+                    readonly property int defaultSize: 2
+
+                    implicitWidth: splitView.orientation === Qt.Horizontal ? handleRoot.defaultSize : splitView.width
+                    implicitHeight: splitView.orientation === Qt.Vertical ? handleRoot.defaultSize : splitView.height
+
+                    color: 'red'
+                    objectName: "handle"
+
+                    Text {
+                        objectName: "handleText_" + text
+                        text: parent.x + "," + parent.y + " " + parent.width + "x" + parent.height
+                        color: "black"
+                        anchors.centerIn: parent
+                        rotation: 90
+                    }
+
+                    containmentMask: Item {
+                        readonly property real extraOverflow: 20
+
+                        x: splitView.orientation === Qt.Horizontal ? -extraOverflow : 0
+                        y: splitView.orientation === Qt.Horizontal ? 0 : -extraOverflow
+                        width: splitView.orientation === Qt.Horizontal ? handleRoot.defaultSize + (extraOverflow * 2): handleRoot.width
+                        height: splitView.orientation === Qt.Horizontal ? handleRoot.height : handleRoot.defaultSize + (extraOverflow * 2)
+                    }
+                }
+
+                MouseArea {
+                    id: mouseArea1
+
+                    SplitView.fillHeight: splitView.orientation === Qt.Horizontal
+                    SplitView.fillWidth: splitView.orientation === Qt.Vertical
+                    SplitView.preferredWidth: splitView.orientation === Qt.Horizontal ? parent.width / 2 : undefined
+                    SplitView.preferredHeight: splitView.orientation === Qt.Vertical ? parent.height / 2 : undefined
+                    hoverEnabled: true
+
+                    Rectangle {
+                        anchors.fill: parent
+                        color: 'cyan'
+                        opacity: 0.3
+                    }
+                }
+
+                MouseArea {
+                    id: mouseArea2
+
+                    SplitView.fillHeight: splitView.orientation === Qt.Horizontal
+                    SplitView.fillWidth: splitView.orientation === Qt.Vertical
+                    SplitView.preferredWidth: splitView.orientation === Qt.Horizontal ? parent.width / 2 : undefined
+                    SplitView.preferredHeight: splitView.orientation === Qt.Vertical ? parent.height / 2 : undefined
+                    hoverEnabled: true
+
+                    Rectangle {
+                        anchors.fill: parent
+                        color: 'cyan'
+                        opacity: 0.3
+                    }
+                }
+            }
+        }
+    }
+
+    function test_handleContainmentMask_data() {
+        const data = [
+            {
+                tag: "handleContainmentMaskHorizontalLeftEdgeDragRight",
+                orientation: Qt.Horizontal,
+                press: {
+                    x: (handle) => handle.containmentMask.x,
+                    y: (handle) => handle.height / 2
+                },
+                dx: 25,
+                dy: 0,
+            },
+            {
+                tag: "handleContainmentMaskHorizontalRightEdgeDragLeft",
+                orientation: Qt.Horizontal,
+                press: {
+                    x: (handle) => handle.containmentMask.x,
+                    y: (handle) => handle.height / 2
+                },
+                dx: -50,
+                dy: 0
+            },
+            {
+                tag: "handleContainmentMaskHorizontalTopEdgeDragRight",
+                orientation: Qt.Horizontal,
+                press: {
+                    x: (handle) => handle.containmentMask.x + handle.containmentMask.width - 1,
+                    y: (handle) => handle.height / 2
+                },
+                dx: 25,
+                dy: 0,
+            },
+            {
+                tag: "handleContainmentMaskHorizontalBottomEdgeDragLeft",
+                orientation: Qt.Horizontal,
+                press: {
+                    x: (handle) => handle.containmentMask.x + handle.containmentMask.width - 1,
+                    y: (handle) => handle.containmentMask.y
+                },
+                dx: -50,
+                dy: 0
+            },
+            {
+                tag: "handleContainmentMaskVerticalTopEdgeDragUp",
+                orientation: Qt.Vertical,
+                press: {
+                    x: (handle) => handle.width / 2,
+                    y: (handle) => handle.containmentMask.y
+                },
+                dx: 0,
+                dy: -40,
+            },
+            {
+                tag: "handleContainmentMaskVerticalTopEdgeDragDown",
+                orientation: Qt.Vertical,
+                press: {
+                    x: (handle) => handle.width / 2,
+                    y: (handle) => handle.containmentMask.y
+                },
+                dx: 0,
+                dy: 70
+            },
+            {
+                tag: "handleContainmentMaskVerticalBottomEdgeDragUp",
+                orientation: Qt.Vertical,
+                press: {
+                    x: (handle) => handle.width / 2,
+                    y: (handle) => handle.containmentMask.y + handle.containmentMask.height - 1
+                },
+                dx: 0,
+                dy: -40,
+            },
+            {
+                tag: "handleContainmentMaskVerticalBottomEdgeDragDown",
+                orientation: Qt.Vertical,
+                press: {
+                    x: (handle) => handle.width / 2,
+                    y: (handle) => handle.containmentMask.y + handle.containmentMask.height - 1
+                },
+                dx: 0,
+                dy: 70
+            }
+        ]
+
+        return data
+    }
+
+    function test_handleContainmentMask(data) {
+        const control = createTemporaryObject(splitViewHandleContainmentMaskComponent, testCase)
+        verify(control)
+        const splitView = control.splitView
+        splitView.orientation = data.orientation
+
+        const handle = findHandles(splitView)[0]
+        if (splitView.orientation === Qt.Vertical)
+            handle.height = handle.defaultHeight
+
+        verify(isPolishScheduled(splitView))
+        verify(waitForItemPolished(splitView))
+
+        const firstItem = control.mouseArea1
+        const secondItem = control.mouseArea2
+
+        const backgroundMouseAreaPress = signalSpyComponent.createObject(control,
+            { target: control, signalName: "onPressed" })
+
+        const mouseArea1Press = signalSpyComponent.createObject(firstItem,
+            { target: firstItem, signalName: "onPressed" })
+
+        const mouseArea2Press = signalSpyComponent.createObject(secondItem,
+            { target: secondItem, signalName: "onPressed" })
+
+        verify(backgroundMouseAreaPress.valid)
+        verify(mouseArea1Press.valid)
+        verify(mouseArea2Press.valid)
+
+        const firstItemWidthBeforeDrag = firstItem.width
+        const secondItemWidthBeforeDrag = secondItem.width
+        const firstItemHeightBeforeDrag = firstItem.height
+        const secondItemHeightBeforeDrag = secondItem.height
+
+        const dx = data.dx
+        const dy = data.dy
+        const pressX = data.press.x(handle)
+        const pressY = data.press.y(handle)
+
+        mousePress(handle, pressX, pressY, Qt.LeftButton)
+        mouseMove(handle, pressX + dx, pressY + dy, -1, Qt.LeftButton)
+        mouseRelease(handle, pressX + dx, pressY + dy, Qt.LeftButton)
+
+        compare(firstItem.width, firstItemWidthBeforeDrag + dx)
+        compare(secondItem.width, secondItemWidthBeforeDrag - dx)
+        compare(firstItem.height, firstItemHeightBeforeDrag + dy)
+        compare(secondItem.height, secondItemHeightBeforeDrag - dy)
+
+        compare(backgroundMouseAreaPress.count, 0)
+        compare(mouseArea1Press.count, 0)
+        compare(mouseArea2Press.count, 0)
+    }
+
+    function test_handleContainmentMaskHovered_data() {
+        const data = [
+            {
+                tag: "firstItemHorizontalHover",
+                orientation: Qt.Horizontal,
+                press: {
+                    "x": (item) => item.width / 2,
+                    "y": (item) => item.height / 2
+                },
+                hoverItem: "firstItem",
+                expectedHover: {
+                    "firstItem": true,
+                    "handle": false,
+                    "secondItem": false
+                }
+            },
+            {
+                tag: "handleHorizontalHoverOnTheLeft",
+                orientation: Qt.Horizontal,
+                press: {
+                    "x": (item) => item.containmentMask.x,
+                    "y": (item) => item.height / 2
+                },
+                hoverItem: "handle",
+                expectedHover: {
+                    "firstItem": true,
+                    "handle": true,
+                    "secondItem": false
+                }
+            },
+            {
+                tag: "handleHorizontalHoverOnTheCenter",
+                orientation: Qt.Horizontal,
+                press: {
+                    "x": (item) => item.width / 2,
+                    "y": (item) => item.height / 2
+                },
+                hoverItem: "handle",
+                expectedHover: {
+                    "firstItem": false,
+                    "handle": true,
+                    "secondItem": false
+                }
+            },
+            {
+                tag: "handleHorizontalHoverOnTheRight",
+                orientation: Qt.Horizontal,
+                press: {
+                    "x": (item) => item.containmentMask.x + item.containmentMask.width - 1,
+                    "y": (item) => item.height / 2
+                },
+                hoverItem: "handle",
+                expectedHover: {
+                    "firstItem": false,
+                    "handle": true,
+                    "secondItem": true
+                }
+            },
+            {
+                tag: "secondItemHorizontalHover",
+                orientation: Qt.Horizontal,
+                press: {
+                    "x": (item) => item.width / 2,
+                    "y": (item) => item.height / 2
+                },
+                hoverItem: "secondItem",
+                expectedHover: {
+                    "firstItem": false,
+                    "handle": false,
+                    "secondItem": true
+                }
+            },
+            {
+                tag: "firstItemVerticalHover",
+                orientation: Qt.Vertical,
+                press: {
+                    "x": (item) => item.width / 2,
+                    "y": (item) => item.height / 2
+                },
+                hoverItem: "firstItem",
+                expectedHover: {
+                    "firstItem": true,
+                    "handle": false,
+                    "secondItem": false
+                }
+            },
+            {
+                tag: "handleVerticalHoverOnTheTop",
+                orientation: Qt.Vertical,
+                press: {
+                    "x": (item) => item.width / 2,
+                    "y": (item) => item.containmentMask.y
+                },
+                hoverItem: "handle",
+                expectedHover: {
+                    "firstItem": true,
+                    "handle": true,
+                    "secondItem": false
+                }
+            },
+            {
+                tag: "handleVerticalHoverOnTheCenter",
+                orientation: Qt.Vertical,
+                press: {
+                    "x": (item) => item.width / 2,
+                    "y": (item) => item.height / 2
+                },
+                hoverItem: "handle",
+                expectedHover: {
+                    "firstItem": false,
+                    "handle": true,
+                    "secondItem": false
+                }
+            },
+            {
+                tag: "handleVerticalHoverOnTheBottom",
+                orientation: Qt.Vertical,
+                press: {
+                    "x": (item) => item.width / 2,
+                    "y": (item) => item.containmentMask.y + item.containmentMask.height - 1
+                },
+                hoverItem: "handle",
+                expectedHover: {
+                    "firstItem": false,
+                    "handle": true,
+                    "secondItem": true
+                }
+            },
+            {
+                tag: "secondItemVerticalHover",
+                orientation: Qt.Vertical,
+                press: {
+                    "x": (item) => item.width / 2,
+                    "y": (item) => item.height / 2
+                },
+                hoverItem: "secondItem",
+                expectedHover: {
+                    "firstItem": false,
+                    "handle": false,
+                    "secondItem": true
+                }
+            }
+        ]
+
+        return data
+    }
+
+    function test_handleContainmentMaskHovered(data) {
+        if ((Qt.platform.pluginName === "offscreen") || (Qt.platform.pluginName === "minimal"))
+            skip("Mouse hovering not functional on offscreen/minimal platforms")
+
+        const control = createTemporaryObject(splitViewHandleContainmentMaskComponent, testCase)
+        verify(control)
+        const splitView = control.splitView
+        splitView.orientation = data.orientation
+
+        const handle = findHandles(splitView)[0]
+        if (splitView.orientation === Qt.Vertical)
+            handle.height = handle.defaultHeight
+
+        verify(isPolishScheduled(splitView))
+        verify(waitForItemPolished(splitView))
+
+        const firstItem = control.mouseArea1
+        const secondItem = control.mouseArea2
+
+        verify(!firstItem.containsMouse)
+        verify(!secondItem.containsMouse)
+        verify(!handle.containsMouse)
+
+        const actualItem = {
+            "firstItem": firstItem,
+            "secondItem": secondItem,
+            "handle": handle
+        }[data.hoverItem]
+
+        const pressX = data.press.x(actualItem)
+        const pressY = data.press.y(actualItem)
+
+        // Test fails if we don't do two moves for some reason...
+        mouseMove(actualItem, pressX, pressY)
+        mouseMove(actualItem, pressX, pressY)
+
+        compare(firstItem.containsMouse, data.expectedHover.firstItem)
+        compare(secondItem.containsMouse, data.expectedHover.secondItem)
+        compare(handle.containsMouse, data.expectedHover.handle)
+
+        // Hide SplitView, then all children shouldn't be hovered
+        control.visible = false
+
+        verify(isPolishScheduled(splitView))
+        verify(waitForItemPolished(splitView))
+
+        verify(!control.containsMouse)
+        verify(!firstItem.containsMouse)
+        verify(!secondItem.containsMouse)
+        verify(!handle.containsMouse)
+    }
+
+    function test_hoveredPressed() {
+        if ((Qt.platform.pluginName === "offscreen") || (Qt.platform.pluginName === "minimal"))
+            skip("Mouse hovering not functional on offscreen/minimal platforms")
+
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
+        verify(control)
+        control.anchors.margins = 50
+
+        var handles = findHandles(control)
+        var firstHandle = handles[0]
+
+        var handleCenter = control.mapFromItem(firstHandle, firstHandle.width / 2, firstHandle.height / 2)
+        // Test fails if we don't do two moves for some reason...
+        mouseMove(control, handleCenter.x, handleCenter.y)
+        mouseMove(control, handleCenter.x, handleCenter.y)
+        verify(firstHandle.SplitHandle.hovered)
+        verify(!firstHandle.SplitHandle.pressed)
+
+        mousePress(control, handleCenter.x, handleCenter.y)
+        verify(firstHandle.SplitHandle.hovered)
+        verify(firstHandle.SplitHandle.pressed)
+
+        mouseRelease(control, handleCenter.x, handleCenter.y)
+        verify(firstHandle.SplitHandle.hovered)
+        verify(!firstHandle.SplitHandle.pressed)
+
+        mouseMove(control, 0, 0)
+        verify(!firstHandle.SplitHandle.hovered)
+        verify(!firstHandle.SplitHandle.pressed)
+    }
+
+    // Tests removing/adding/moving an item while it's pressed.
+    function test_modifyWhileHoveredPressed() {
+        if ((Qt.platform.pluginName === "offscreen") || (Qt.platform.pluginName === "minimal"))
+            skip("Mouse hovering not functional on offscreen/minimal platforms")
+
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
+        verify(control)
+        control.anchors.margins = 50
+
+        var handles = findHandles(control)
+        var firstHandle = handles[0]
+
+        // First, ensure that the handle is hovered + pressed.
+        var handleCenter = control.mapFromItem(firstHandle, firstHandle.width / 2, firstHandle.height / 2)
+        // Test fails if we don't do two moves for some reason...
+        mouseMove(control, handleCenter.x, handleCenter.y)
+        mouseMove(control, handleCenter.x, handleCenter.y)
+        verify(firstHandle.SplitHandle.hovered)
+        verify(!firstHandle.SplitHandle.pressed)
+
+        mousePress(control, handleCenter.x, handleCenter.y)
+        verify(firstHandle.SplitHandle.hovered)
+        verify(firstHandle.SplitHandle.pressed)
+
+        // Then, remove it by removing the first item.
+        control.removeItem(control.itemAt(0))
+        handles = findHandles(control)
+        firstHandle = null
+        compare(handles.length, 1)
+
+        // No handles should be hovered/pressed.
+        for (var i = 0; i < handles.length; ++i) {
+            var handle = handles[i]
+            verify(!handle.SplitHandle.hovered, "handle at index " + i + " should not be hovered")
+            verify(!handle.SplitHandle.pressed, "handle at index " + i + " should not be hovered")
+        }
+
+        mouseRelease(control, handleCenter.x, handleCenter.y)
+    }
+
+    Component {
+        id: settingsComponent
+        Settings {
+            id: settings
+        }
+    }
+
+    function test_saveAndRestoreState_data() {
+        return [
+            { tag: "Horizontal", orientation: Qt.Horizontal, propertyName: "preferredWidth", propertyValue: 123 },
+            { tag: "Vertical", orientation: Qt.Vertical, propertyName: "preferredHeight", propertyValue: 234 }
+        ]
+    }
+
+    function test_saveAndRestoreState(data) {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase, { orientation: data.orientation })
+        verify(control)
+        compare(control.orientation, data.orientation)
+
+        var lastItem = control.itemAt(2)
+        verify(lastItem)
+        lastItem.SplitView[data.propertyName] = data.propertyValue
+
+        // Save the state.
+        var settings = createTemporaryObject(settingsComponent, testCase)
+        verify(settings)
+        settings.setValue("splitView", control.saveState())
+
+        // Recreate the item to restore it to its "default" values.
+        control = createTemporaryObject(threeSizedItemsComponent, testCase)
+        lastItem = control.itemAt(2)
+        verify(lastItem)
+        compare(lastItem.SplitView[data.propertyName], -1)
+
+        settings = createTemporaryObject(settingsComponent, testCase)
+        verify(settings)
+
+        // Restore the state.
+        control.restoreState(settings.value("splitView"))
+        compare(lastItem.SplitView[data.propertyName], data.propertyValue)
+    }
+
+    function test_changePreferredSizeDuringLayout() {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
+        verify(control)
+
+        var firstItem = control.itemAt(0)
+        var secondItem = control.itemAt(1)
+        secondItem.widthChanged.connect(function() {
+            if (secondItem.width < 10)
+                firstItem.SplitView.preferredWidth = 50
+        })
+
+        // Change the size of the item so that a layout happens, but
+        // make the size small enough that the item's onWidthChanged handler gets triggered.
+        // The onWidthChanged handler will set the preferredWidth of another item during the
+        // layout, so we need to make sure the assignment isn't lost since we return early in that case.
+        secondItem.implicitWidth = 5
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compare(secondItem.width, 5)
+        compare(firstItem.width, 50)
+
+        // Now do the same for height.
+        control.orientation = Qt.Vertical
+        secondItem.heightChanged.connect(function() {
+            if (secondItem.height < 10)
+                firstItem.SplitView.preferredHeight = 50
+        })
+        // Get the polishes for the orientation out of the way so that they
+        // don't intefere with our results.
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+
+        secondItem.implicitHeight = 5
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+        compare(secondItem.height, 5)
+        compare(firstItem.height, 50)
+    }
+
+    // When the user drags a handle, we internally set preferredWidth/Height
+    // to reflect the new value. However, we also have to make sure that when
+    // we do so, it doesn't trigger a delayed layout. This is why we have
+    // m_ignoreNextDelayedLayoutRequest. This test checks that
+    // m_ignoreNextDelayedLayoutRequest doesn't interfere with any action from
+    // the user that results in a delayed layout.
+    function test_changePreferredSizeDuringLayoutWhileDraggingHandle() {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
+        verify(control)
+
+        var firstItem = control.itemAt(0)
+        var secondItem = control.itemAt(1)
+        firstItem.widthChanged.connect(function() {
+            if (firstItem.width === 0)
+                secondItem.SplitView.preferredWidth = 50
+        })
+
+        // Start dragging the handle.
+        var handles = findHandles(control)
+        var targetHandle = handles[0]
+        mousePress(targetHandle)
+        verify(control.resizing)
+        var localPos = testCase.mapToItem(targetHandle, 15, testCase.height / 2)
+
+        // Move the handle to the very left, so that the item's width becomes zero.
+        mouseMove(targetHandle, -100, targetHandle.height / 2)
+        verify(control.resizing)
+        compare(firstItem.width, 0)
+        compare(secondItem.SplitView.preferredWidth, 50)
+        compare(secondItem.width, 50)
+        mouseRelease(targetHandle, -100, targetHandle.height / 2, Qt.LeftButton)
+        verify(!control.resizing)
+    }
+
+    Component {
+        id: oneItemComponent
+
+        SplitView {
+            Item {}
+        }
+    }
+
+    // QTBUG-79270
+    function test_hideSplitViewWithOneItem() {
+        var control = createTemporaryObject(oneItemComponent, testCase)
+        verify(control)
+        // Shouldn't be an assertion failure.
+        control.visible = false
+    }
+
+    // QTBUG-79302: ensure that the Repeater's items are actually generated.
+    // test_dragHandle:repeater tests dragging behavior with a Repeater.
+    function test_repeater(data) {
+        var control = createTemporaryObject(repeaterSplitViewComponent, testCase)
+        verify(control)
+        compare(control.repeater.count, 3)
+        compare(control.contentChildren.length, 3)
+    }
+
+    Component {
+        id: hoverableChildrenSplitViewComponent
+
+        SplitView {
+            handle: handleComponent
+            anchors.fill: parent
+
+            MouseArea {
+                objectName: "mouseArea1"
+                hoverEnabled: true
+
+                SplitView.preferredWidth: 200
+            }
+            MouseArea {
+                objectName: "mouseArea2"
+                hoverEnabled: true
+            }
+        }
+    }
+
+    function test_hoverableChilden() {
+        if (Qt.platform.pluginName === "offscreen" || Qt.platform.pluginName === "minimal")
+            skip("Mouse hovering not functional on offscreen/minimal platforms")
+
+        var control = createTemporaryObject(hoverableChildrenSplitViewComponent, testCase)
+        verify(control)
+
+        verify(isPolishScheduled(control))
+        verify(waitForItemPolished(control))
+
+        // Move the mouse over the handle.
+        var handles = findHandles(control)
+        var targetHandle = handles[0]
+        // Test fails if we don't do two moves for some reason... QTBUG-94968
+        mouseMove(targetHandle, targetHandle.width / 2, targetHandle.height / 2)
+        mouseMove(targetHandle, targetHandle.width / 2, targetHandle.height / 2)
+        verify(targetHandle.SplitHandle.hovered)
+
+        // Move the mouse to the MouseArea on the left. The handle should no longer be hovered.
+        mouseMove(control, 100, control.height / 2)
+        verify(!targetHandle.SplitHandle.hovered)
+
+        // Move the mouse back over the handle.
+        mouseMove(targetHandle, targetHandle.width / 2, targetHandle.height / 2)
+        mouseMove(targetHandle, targetHandle.width / 2, targetHandle.height / 2)
+        verify(targetHandle.SplitHandle.hovered)
+
+        // Move the mouse to the MouseArea on the right. The handle should no longer be hovered.
+        mouseMove(control, control.width - 100, control.height / 2)
+        verify(!targetHandle.SplitHandle.hovered)
+    }
+
+    Component {
+        id: cppHandleSplitViewComponent
+
+        SplitView {
+            anchors.fill: parent
+            handle: ComponentCreator.createComponent(`
+                import QtQuick
+
+                Rectangle {
+                    objectName: "handle"
+                    implicitWidth: 10
+                    implicitHeight: 10
+                    color: "tomato"
+                }`)
+
+            Rectangle {
+                objectName: "navajowhite"
+                color: objectName
+                implicitWidth: 100
+                implicitHeight: 100
+            }
+            Rectangle {
+                objectName: "steelblue"
+                color: objectName
+                implicitWidth: 200
+                implicitHeight: 200
+            }
+        }
+    }
+
+    function test_handleComponentCreatedInCpp() {
+        let control = createTemporaryObject(cppHandleSplitViewComponent, testCase)
+        verify(control)
+
+        let handles = findHandles(control)
+        compare(handles.length, 1)
+        compare(handles[0].color, Qt.color("tomato"))
+    }
+}
diff --git a/tests/auto/quickcontrols2/controls/data/tst_stackview.qml b/tests/auto/quickcontrols/controls/data/tst_stackview.qml
index 8584385cbf..8584385cbf 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_stackview.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_stackview.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_swipedelegate.qml b/tests/auto/quickcontrols/controls/data/tst_swipedelegate.qml
index 901170bf9f..901170bf9f 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_swipedelegate.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_swipeview.qml b/tests/auto/quickcontrols/controls/data/tst_swipeview.qml
index c853f6dd55..c853f6dd55 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_swipeview.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_swipeview.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_switch.qml b/tests/auto/quickcontrols/controls/data/tst_switch.qml
index 407513b914..407513b914 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_switch.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_switch.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_switchdelegate.qml b/tests/auto/quickcontrols/controls/data/tst_switchdelegate.qml
index 42d58b9668..42d58b9668 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_switchdelegate.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_tabbar.qml b/tests/auto/quickcontrols/controls/data/tst_tabbar.qml
index 58c0b1ae61..58c0b1ae61 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_tabbar.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_tabbar.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_tabbutton.qml b/tests/auto/quickcontrols/controls/data/tst_tabbutton.qml
index 591622b8a2..591622b8a2 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_tabbutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_tabbutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_textarea.qml b/tests/auto/quickcontrols/controls/data/tst_textarea.qml
index 0f295905f1..0f295905f1 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_textarea.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_textarea.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_textfield.qml b/tests/auto/quickcontrols/controls/data/tst_textfield.qml
index f5b3d91fe1..f5b3d91fe1 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_textfield.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_textfield.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_toolbar.qml b/tests/auto/quickcontrols/controls/data/tst_toolbar.qml
index d2c9e4a20d..d2c9e4a20d 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_toolbar.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_toolbar.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_toolbutton.qml b/tests/auto/quickcontrols/controls/data/tst_toolbutton.qml
index 4879e91611..4879e91611 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_toolbutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_toolbutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_toolseparator.qml b/tests/auto/quickcontrols/controls/data/tst_toolseparator.qml
index ef7fc35758..ef7fc35758 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_toolseparator.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_toolseparator.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_tooltip.qml b/tests/auto/quickcontrols/controls/data/tst_tooltip.qml
index 1aa63e56a2..1aa63e56a2 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_tooltip.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_tooltip.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_tumbler.qml b/tests/auto/quickcontrols/controls/data/tst_tumbler.qml
index bb098f92db..bb098f92db 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_tumbler.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_tumbler.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_weeknumbercolumn.qml b/tests/auto/quickcontrols/controls/data/tst_weeknumbercolumn.qml
index 40566b018c..40566b018c 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_weeknumbercolumn.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_weeknumbercolumn.qml
diff --git a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST b/tests/auto/quickcontrols/controls/fusion/BLACKLIST
index b643dd1d9c..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/fusion/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/fusion/CMakeLists.txt b/tests/auto/quickcontrols/controls/fusion/CMakeLists.txt
index 932d3b8be6..932d3b8be6 100644
--- a/tests/auto/quickcontrols2/controls/fusion/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/fusion/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/fusion/dependencies.qml b/tests/auto/quickcontrols/controls/fusion/dependencies.qml
index f2e40e6059..f2e40e6059 100644
--- a/tests/auto/quickcontrols2/controls/fusion/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/fusion/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/fusion/dummy_imports.qml b/tests/auto/quickcontrols/controls/fusion/dummy_imports.qml
index 66e184f138..66e184f138 100644
--- a/tests/auto/quickcontrols2/controls/fusion/dummy_imports.qml
+++ b/tests/auto/quickcontrols/controls/fusion/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/controls/fusion/tst_fusion.cpp b/tests/auto/quickcontrols/controls/fusion/tst_fusion.cpp
index b7aa9aa434..b7aa9aa434 100644
--- a/tests/auto/quickcontrols2/controls/fusion/tst_fusion.cpp
+++ b/tests/auto/quickcontrols/controls/fusion/tst_fusion.cpp
diff --git a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST b/tests/auto/quickcontrols/controls/imagine/BLACKLIST
index c3865e0006..c3865e0006 100644
--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/imagine/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/imagine/CMakeLists.txt b/tests/auto/quickcontrols/controls/imagine/CMakeLists.txt
index a94fbb7681..a94fbb7681 100644
--- a/tests/auto/quickcontrols2/controls/imagine/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/imagine/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/imagine/dependencies.qml b/tests/auto/quickcontrols/controls/imagine/dependencies.qml
index 9a31141bff..9a31141bff 100644
--- a/tests/auto/quickcontrols2/controls/imagine/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/imagine/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/imagine/dummy_imports.qml b/tests/auto/quickcontrols/controls/imagine/dummy_imports.qml
index 66e184f138..66e184f138 100644
--- a/tests/auto/quickcontrols2/controls/imagine/dummy_imports.qml
+++ b/tests/auto/quickcontrols/controls/imagine/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/controls/imagine/tst_imagine.cpp b/tests/auto/quickcontrols/controls/imagine/tst_imagine.cpp
index 1a46d26c1c..1a46d26c1c 100644
--- a/tests/auto/quickcontrols2/controls/imagine/tst_imagine.cpp
+++ b/tests/auto/quickcontrols/controls/imagine/tst_imagine.cpp
diff --git a/tests/auto/quickcontrols2/controls/ios/BLACKLIST b/tests/auto/quickcontrols/controls/ios/BLACKLIST
index e5d8e9bcab..e5d8e9bcab 100644
--- a/tests/auto/quickcontrols2/controls/ios/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/ios/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/ios/CMakeLists.txt b/tests/auto/quickcontrols/controls/ios/CMakeLists.txt
index f4c0c7c4cd..f4c0c7c4cd 100644
--- a/tests/auto/quickcontrols2/controls/ios/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/ios/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/ios/tst_ios.cpp b/tests/auto/quickcontrols/controls/ios/tst_ios.cpp
index 954b964958..954b964958 100644
--- a/tests/auto/quickcontrols2/controls/ios/tst_ios.cpp
+++ b/tests/auto/quickcontrols/controls/ios/tst_ios.cpp
diff --git a/tests/auto/quickcontrols2/controls/macos/BLACKLIST b/tests/auto/quickcontrols/controls/macos/BLACKLIST
index 1e751af957..1e751af957 100644
--- a/tests/auto/quickcontrols2/controls/macos/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/macos/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/macos/CMakeLists.txt b/tests/auto/quickcontrols/controls/macos/CMakeLists.txt
index f3d71065e7..f3d71065e7 100644
--- a/tests/auto/quickcontrols2/controls/macos/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/macos/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/macos/tst_macos.cpp b/tests/auto/quickcontrols/controls/macos/tst_macos.cpp
index 2a8c612ca7..2a8c612ca7 100644
--- a/tests/auto/quickcontrols2/controls/macos/tst_macos.cpp
+++ b/tests/auto/quickcontrols/controls/macos/tst_macos.cpp
diff --git a/tests/auto/quickcontrols2/controls/material/BLACKLIST b/tests/auto/quickcontrols/controls/material/BLACKLIST
index b643dd1d9c..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/material/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/material/CMakeLists.txt b/tests/auto/quickcontrols/controls/material/CMakeLists.txt
index 5b7836e769..5b7836e769 100644
--- a/tests/auto/quickcontrols2/controls/material/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/material/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/material/dependencies.qml b/tests/auto/quickcontrols/controls/material/dependencies.qml
index 8bcf03013c..8bcf03013c 100644
--- a/tests/auto/quickcontrols2/controls/material/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/material/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/material/dummy_imports.qml b/tests/auto/quickcontrols/controls/material/dummy_imports.qml
index 66e184f138..66e184f138 100644
--- a/tests/auto/quickcontrols2/controls/material/dummy_imports.qml
+++ b/tests/auto/quickcontrols/controls/material/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/controls/material/tst_material.cpp b/tests/auto/quickcontrols/controls/material/tst_material.cpp
index 1fa55ab4dc..1fa55ab4dc 100644
--- a/tests/auto/quickcontrols2/controls/material/tst_material.cpp
+++ b/tests/auto/quickcontrols/controls/material/tst_material.cpp
diff --git a/tests/auto/quickcontrols2/controls/universal/BLACKLIST b/tests/auto/quickcontrols/controls/universal/BLACKLIST
index b643dd1d9c..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/universal/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/universal/CMakeLists.txt b/tests/auto/quickcontrols/controls/universal/CMakeLists.txt
index 3d7109dad8..3d7109dad8 100644
--- a/tests/auto/quickcontrols2/controls/universal/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/universal/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/universal/dependencies.qml b/tests/auto/quickcontrols/controls/universal/dependencies.qml
index 8ba71c8302..8ba71c8302 100644
--- a/tests/auto/quickcontrols2/controls/universal/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/universal/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/universal/dummy_imports.qml b/tests/auto/quickcontrols/controls/universal/dummy_imports.qml
index 66e184f138..66e184f138 100644
--- a/tests/auto/quickcontrols2/controls/universal/dummy_imports.qml
+++ b/tests/auto/quickcontrols/controls/universal/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/controls/universal/tst_universal.cpp b/tests/auto/quickcontrols/controls/universal/tst_universal.cpp
index 87faccc5ff..87faccc5ff 100644
--- a/tests/auto/quickcontrols2/controls/universal/tst_universal.cpp
+++ b/tests/auto/quickcontrols/controls/universal/tst_universal.cpp
diff --git a/tests/auto/quickcontrols2/controls/windows/BLACKLIST b/tests/auto/quickcontrols/controls/windows/BLACKLIST
index 8230d5eb4e..8230d5eb4e 100644
--- a/tests/auto/quickcontrols2/controls/windows/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/windows/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/windows/CMakeLists.txt b/tests/auto/quickcontrols/controls/windows/CMakeLists.txt
index e351842045..e351842045 100644
--- a/tests/auto/quickcontrols2/controls/windows/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/windows/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/windows/dependencies.qml b/tests/auto/quickcontrols/controls/windows/dependencies.qml
index f7d87422b5..f7d87422b5 100644
--- a/tests/auto/quickcontrols2/controls/windows/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/windows/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/windows/tst_windows.cpp b/tests/auto/quickcontrols/controls/windows/tst_windows.cpp
index 59c57b5410..59c57b5410 100644
--- a/tests/auto/quickcontrols2/controls/windows/tst_windows.cpp
+++ b/tests/auto/quickcontrols/controls/windows/tst_windows.cpp
diff --git a/tests/auto/quickcontrols2/cursor/BLACKLIST b/tests/auto/quickcontrols/cursor/BLACKLIST
index cebb2c9438..cebb2c9438 100644
--- a/tests/auto/quickcontrols2/cursor/BLACKLIST
+++ b/tests/auto/quickcontrols/cursor/BLACKLIST
diff --git a/tests/auto/quickcontrols/cursor/CMakeLists.txt b/tests/auto/quickcontrols/cursor/CMakeLists.txt
new file mode 100644
index 0000000000..1033b2c12a
--- /dev/null
+++ b/tests/auto/quickcontrols/cursor/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from cursor.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_cursor LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_cursor Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_cursor
+    SOURCES
+        tst_cursor.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:cursor.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_cursor CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/cursor/data/buttons.qml b/tests/auto/quickcontrols/cursor/data/buttons.qml
index b2a3cccc34..b2a3cccc34 100644
--- a/tests/auto/quickcontrols2/cursor/data/buttons.qml
+++ b/tests/auto/quickcontrols/cursor/data/buttons.qml
diff --git a/tests/auto/quickcontrols2/cursor/data/containers.qml b/tests/auto/quickcontrols/cursor/data/containers.qml
index 420a1a592d..420a1a592d 100644
--- a/tests/auto/quickcontrols2/cursor/data/containers.qml
+++ b/tests/auto/quickcontrols/cursor/data/containers.qml
diff --git a/tests/auto/quickcontrols2/cursor/data/editable.qml b/tests/auto/quickcontrols/cursor/data/editable.qml
index 1750c481b9..1750c481b9 100644
--- a/tests/auto/quickcontrols2/cursor/data/editable.qml
+++ b/tests/auto/quickcontrols/cursor/data/editable.qml
diff --git a/tests/auto/quickcontrols2/cursor/data/pageindicator.qml b/tests/auto/quickcontrols/cursor/data/pageindicator.qml
index 3f9178a50d..3f9178a50d 100644
--- a/tests/auto/quickcontrols2/cursor/data/pageindicator.qml
+++ b/tests/auto/quickcontrols/cursor/data/pageindicator.qml
diff --git a/tests/auto/quickcontrols2/cursor/data/scrollbar.qml b/tests/auto/quickcontrols/cursor/data/scrollbar.qml
index 1269cc9c6b..1269cc9c6b 100644
--- a/tests/auto/quickcontrols2/cursor/data/scrollbar.qml
+++ b/tests/auto/quickcontrols/cursor/data/scrollbar.qml
diff --git a/tests/auto/quickcontrols2/cursor/data/sliders.qml b/tests/auto/quickcontrols/cursor/data/sliders.qml
index ae2f8a962d..ae2f8a962d 100644
--- a/tests/auto/quickcontrols2/cursor/data/sliders.qml
+++ b/tests/auto/quickcontrols/cursor/data/sliders.qml
diff --git a/tests/auto/quickcontrols2/cursor/tst_cursor.cpp b/tests/auto/quickcontrols/cursor/tst_cursor.cpp
index 02a25848dc..02a25848dc 100644
--- a/tests/auto/quickcontrols2/cursor/tst_cursor.cpp
+++ b/tests/auto/quickcontrols/cursor/tst_cursor.cpp
diff --git a/tests/auto/quickcontrols/customization/CMakeLists.txt b/tests/auto/quickcontrols/customization/CMakeLists.txt
new file mode 100644
index 0000000000..5e2acab350
--- /dev/null
+++ b/tests/auto/quickcontrols/customization/CMakeLists.txt
@@ -0,0 +1,54 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from customization.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_customization LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_customization Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_customization
+    SOURCES
+        tst_customization.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_customization CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_customization CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/AbstractButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/AbstractButton.qml
index 82e9e4bd4a..82e9e4bd4a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/AbstractButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/AbstractButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ApplicationWindow.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ApplicationWindow.qml
index 92067837d3..92067837d3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ApplicationWindow.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/BusyIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/empty/BusyIndicator.qml
index 2364737a9d..2364737a9d 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/BusyIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/BusyIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Button.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Button.qml
index 7f14f150c1..7f14f150c1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Button.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Button.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/CheckBox.qml b/tests/auto/quickcontrols/customization/data/styles/empty/CheckBox.qml
index 29b63ab1d4..29b63ab1d4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/CheckBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/CheckBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/CheckDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/empty/CheckDelegate.qml
index 0760efad05..0760efad05 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/CheckDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/CheckDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ComboBox.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ComboBox.qml
index 4bb5b6538e..4bb5b6538e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ComboBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ComboBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Container.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Container.qml
index bcf0a906ac..bcf0a906ac 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Container.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Container.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Control.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Control.qml
index 0a1db09a82..0a1db09a82 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Control.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Control.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/DelayButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/DelayButton.qml
index 849a82f9f7..849a82f9f7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/DelayButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/DelayButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Dial.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Dial.qml
index b4d062c47b..b4d062c47b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Dial.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Dial.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Dialog.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Dialog.qml
index b43550817a..b43550817a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Dialog.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Dialog.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/DialogButtonBox.qml b/tests/auto/quickcontrols/customization/data/styles/empty/DialogButtonBox.qml
index 14c4982d8c..14c4982d8c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/DialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Drawer.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Drawer.qml
index eee198aa10..eee198aa10 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Drawer.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Drawer.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Frame.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Frame.qml
index cb7dc659e8..cb7dc659e8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Frame.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Frame.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/GroupBox.qml b/tests/auto/quickcontrols/customization/data/styles/empty/GroupBox.qml
index 42a26c114d..42a26c114d 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/GroupBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/GroupBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ItemDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ItemDelegate.qml
index ff7cc8dac8..ff7cc8dac8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ItemDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ItemDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Label.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Label.qml
index a70541c788..a70541c788 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Label.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Label.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Menu.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Menu.qml
index 7f03fd0193..7f03fd0193 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Menu.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Menu.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBar.qml b/tests/auto/quickcontrols/customization/data/styles/empty/MenuBar.qml
index 742492a467..742492a467 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/MenuBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBarItem.qml b/tests/auto/quickcontrols/customization/data/styles/empty/MenuBarItem.qml
index b17f33bedc..b17f33bedc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBarItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/MenuBarItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuItem.qml b/tests/auto/quickcontrols/customization/data/styles/empty/MenuItem.qml
index c0639e3dc2..c0639e3dc2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/MenuItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/empty/MenuSeparator.qml
index f470175d9e..f470175d9e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/MenuSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Page.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Page.qml
index 39631703f7..39631703f7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Page.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Page.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/PageIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/empty/PageIndicator.qml
index fa47a9e8e1..fa47a9e8e1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/PageIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/PageIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Pane.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Pane.qml
index 090ca74ef0..090ca74ef0 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Pane.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Pane.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Popup.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Popup.qml
index 3fac8c15dd..3fac8c15dd 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Popup.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Popup.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ProgressBar.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ProgressBar.qml
index 19701a3566..19701a3566 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ProgressBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ProgressBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/RadioButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/RadioButton.qml
index e39736a523..e39736a523 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/RadioButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/RadioButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/RadioDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/empty/RadioDelegate.qml
index 1f4aa70f04..1f4aa70f04 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/RadioDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/RadioDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/RangeSlider.qml b/tests/auto/quickcontrols/customization/data/styles/empty/RangeSlider.qml
index 26f410b4b7..26f410b4b7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/RangeSlider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/RangeSlider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/RoundButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/RoundButton.qml
index adaaddc6e4..adaaddc6e4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/RoundButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/RoundButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollBar.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollBar.qml
index f10d4c9ce7..f10d4c9ce7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollIndicator.qml
index 211178f39a..211178f39a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollView.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollView.qml
index b80618674b..b80618674b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Slider.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Slider.qml
index 098b615ffa..098b615ffa 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Slider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Slider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/SpinBox.qml b/tests/auto/quickcontrols/customization/data/styles/empty/SpinBox.qml
index f7ef626944..f7ef626944 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/SpinBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/SpinBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/StackView.qml b/tests/auto/quickcontrols/customization/data/styles/empty/StackView.qml
index 5dc2edc34c..5dc2edc34c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/StackView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/StackView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/empty/SwipeDelegate.qml
index f802533d97..f802533d97 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/SwipeDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeView.qml b/tests/auto/quickcontrols/customization/data/styles/empty/SwipeView.qml
index b4b6d3be6c..b4b6d3be6c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/SwipeView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Switch.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Switch.qml
index ace8f83321..ace8f83321 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Switch.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Switch.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/SwitchDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/empty/SwitchDelegate.qml
index c516e8b178..c516e8b178 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/SwitchDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/TabBar.qml b/tests/auto/quickcontrols/customization/data/styles/empty/TabBar.qml
index 3f71b3a0ec..3f71b3a0ec 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/TabBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/TabBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/TabButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/TabButton.qml
index 1bf2625589..1bf2625589 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/TabButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/TabButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/TextArea.qml b/tests/auto/quickcontrols/customization/data/styles/empty/TextArea.qml
index 01807d1606..01807d1606 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/TextArea.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/TextArea.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/TextField.qml b/tests/auto/quickcontrols/customization/data/styles/empty/TextField.qml
index 6001e445a1..6001e445a1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/TextField.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/TextField.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolBar.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ToolBar.qml
index b8dd897b6e..b8dd897b6e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ToolBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ToolButton.qml
index c6d9c4df5b..c6d9c4df5b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ToolButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ToolSeparator.qml
index a9a26e562e..a9a26e562e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ToolSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolTip.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ToolTip.qml
index 73ccddb576..73ccddb576 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolTip.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ToolTip.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Tumbler.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Tumbler.qml
index 11c3b0b552..11c3b0b552 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Tumbler.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Tumbler.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/qmldir b/tests/auto/quickcontrols/customization/data/styles/empty/qmldir
index a5fcc4c7e5..a5fcc4c7e5 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/qmldir
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/qmldir
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/AbstractButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/AbstractButton.qml
index 2db395fe7a..2db395fe7a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/AbstractButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/AbstractButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ApplicationWindow.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ApplicationWindow.qml
index 846cc0fd00..846cc0fd00 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ApplicationWindow.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/BusyIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/identified/BusyIndicator.qml
index 177685b980..177685b980 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/BusyIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/BusyIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Button.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Button.qml
index 2fea6704dc..2fea6704dc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Button.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Button.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/CheckBox.qml b/tests/auto/quickcontrols/customization/data/styles/identified/CheckBox.qml
index 3813aeeb7a..3813aeeb7a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/CheckBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/CheckBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/CheckDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/identified/CheckDelegate.qml
index f78b3f7984..f78b3f7984 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/CheckDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/CheckDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ComboBox.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ComboBox.qml
index 0945e49bb4..0945e49bb4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ComboBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ComboBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Container.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Container.qml
index 941b9b7467..941b9b7467 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Container.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Container.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Control.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Control.qml
index f2f3928c8a..f2f3928c8a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Control.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Control.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/DelayButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/DelayButton.qml
index 18119a8aa6..18119a8aa6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/DelayButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/DelayButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Dial.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Dial.qml
index 84dea2aa70..84dea2aa70 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Dial.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Dial.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Dialog.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Dialog.qml
index 4beace01e7..4beace01e7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Dialog.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Dialog.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/DialogButtonBox.qml b/tests/auto/quickcontrols/customization/data/styles/identified/DialogButtonBox.qml
index 0cec0f5a6c..0cec0f5a6c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/DialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Drawer.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Drawer.qml
index d8634410cd..d8634410cd 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Drawer.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Drawer.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Frame.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Frame.qml
index 014b2a74b3..014b2a74b3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Frame.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Frame.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/GroupBox.qml b/tests/auto/quickcontrols/customization/data/styles/identified/GroupBox.qml
index 767259242c..767259242c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/GroupBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/GroupBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ItemDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ItemDelegate.qml
index c7d4002407..c7d4002407 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ItemDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ItemDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Label.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Label.qml
index c9b00ff1ca..c9b00ff1ca 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Label.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Label.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Menu.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Menu.qml
index 822824dca8..822824dca8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Menu.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Menu.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBar.qml b/tests/auto/quickcontrols/customization/data/styles/identified/MenuBar.qml
index 94b5997165..94b5997165 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/MenuBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBarItem.qml b/tests/auto/quickcontrols/customization/data/styles/identified/MenuBarItem.qml
index da6c584ebc..da6c584ebc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBarItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/MenuBarItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuItem.qml b/tests/auto/quickcontrols/customization/data/styles/identified/MenuItem.qml
index 4ba04908ad..4ba04908ad 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/MenuItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/identified/MenuSeparator.qml
index 6928eb01bc..6928eb01bc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/MenuSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Page.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Page.qml
index d63e4ce80d..d63e4ce80d 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Page.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Page.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/PageIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/identified/PageIndicator.qml
index c47cb69e9e..c47cb69e9e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/PageIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/PageIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Pane.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Pane.qml
index c5739700d3..c5739700d3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Pane.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Pane.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Popup.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Popup.qml
index e71be2f3de..e71be2f3de 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Popup.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Popup.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ProgressBar.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ProgressBar.qml
index d1cfd16419..d1cfd16419 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ProgressBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ProgressBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/RadioButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/RadioButton.qml
index ce64bdee5a..ce64bdee5a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/RadioButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/RadioButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/RadioDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/identified/RadioDelegate.qml
index eeba29faa7..eeba29faa7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/RadioDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/RadioDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/RangeSlider.qml b/tests/auto/quickcontrols/customization/data/styles/identified/RangeSlider.qml
index 1fae11c2fa..1fae11c2fa 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/RangeSlider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/RangeSlider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/RoundButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/RoundButton.qml
index b431a3a02c..b431a3a02c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/RoundButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/RoundButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollBar.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollBar.qml
index 4bb5da5a18..4bb5da5a18 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollIndicator.qml
index a62b36afa2..a62b36afa2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollView.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollView.qml
index 94cb1bc1a5..94cb1bc1a5 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Slider.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Slider.qml
index 5298a1556e..5298a1556e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Slider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Slider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/SpinBox.qml b/tests/auto/quickcontrols/customization/data/styles/identified/SpinBox.qml
index 2e285b0f47..2e285b0f47 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/SpinBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/SpinBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/StackView.qml b/tests/auto/quickcontrols/customization/data/styles/identified/StackView.qml
index 5c5cd31af4..5c5cd31af4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/StackView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/StackView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/identified/SwipeDelegate.qml
index 403b7d5a82..403b7d5a82 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/SwipeDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeView.qml b/tests/auto/quickcontrols/customization/data/styles/identified/SwipeView.qml
index 8c8345a524..8c8345a524 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/SwipeView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Switch.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Switch.qml
index 9fc0c0f010..9fc0c0f010 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Switch.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Switch.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/SwitchDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/identified/SwitchDelegate.qml
index 3f7f9568fb..3f7f9568fb 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/SwitchDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/TabBar.qml b/tests/auto/quickcontrols/customization/data/styles/identified/TabBar.qml
index 50e36498b7..50e36498b7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/TabBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/TabBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/TabButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/TabButton.qml
index 19145e14fd..19145e14fd 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/TabButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/TabButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/TextArea.qml b/tests/auto/quickcontrols/customization/data/styles/identified/TextArea.qml
index a7d4e212f0..a7d4e212f0 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/TextArea.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/TextArea.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/TextField.qml b/tests/auto/quickcontrols/customization/data/styles/identified/TextField.qml
index 3d78c4b73c..3d78c4b73c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/TextField.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/TextField.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolBar.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ToolBar.qml
index b328828267..b328828267 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ToolBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ToolButton.qml
index 465de9a6f1..465de9a6f1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ToolButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ToolSeparator.qml
index 81c8f40178..81c8f40178 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ToolSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolTip.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ToolTip.qml
index 2d8533dd0a..2d8533dd0a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolTip.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ToolTip.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Tumbler.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Tumbler.qml
index 67d4cd9b64..67d4cd9b64 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Tumbler.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Tumbler.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/qmldir b/tests/auto/quickcontrols/customization/data/styles/identified/qmldir
index 1ee2a92e11..1ee2a92e11 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/qmldir
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/qmldir
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/AbstractButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/AbstractButton.qml
index b29c8fa15e..b29c8fa15e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/AbstractButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/AbstractButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ApplicationWindow.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ApplicationWindow.qml
index 437410b72d..437410b72d 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ApplicationWindow.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/BusyIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/BusyIndicator.qml
index 6c1ed812b7..6c1ed812b7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/BusyIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/BusyIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Button.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Button.qml
index d0bfc4c563..d0bfc4c563 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Button.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Button.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckBox.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/CheckBox.qml
index 34d01e4e70..34d01e4e70 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/CheckBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/CheckDelegate.qml
index e17820ac4e..e17820ac4e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/CheckDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ComboBox.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ComboBox.qml
index 611358a381..611358a381 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ComboBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ComboBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Container.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Container.qml
index d6276f222e..d6276f222e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Container.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Container.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Control.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Control.qml
index bb924ce15c..bb924ce15c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Control.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Control.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/DelayButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/DelayButton.qml
index 60a1d67e62..60a1d67e62 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/DelayButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/DelayButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dial.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Dial.qml
index a16ad247ac..a16ad247ac 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dial.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Dial.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dialog.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Dialog.qml
index 2cd9bb9b20..2cd9bb9b20 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dialog.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Dialog.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/DialogButtonBox.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/DialogButtonBox.qml
index 23eea3c0df..23eea3c0df 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/DialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Drawer.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Drawer.qml
index 0fbc879fb2..0fbc879fb2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Drawer.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Drawer.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Frame.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Frame.qml
index c84280cb21..c84280cb21 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Frame.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Frame.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/GroupBox.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/GroupBox.qml
index 518a836e92..518a836e92 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/GroupBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/GroupBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ItemDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ItemDelegate.qml
index 7150c79aa4..7150c79aa4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ItemDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ItemDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Label.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Label.qml
index 662e22eac5..662e22eac5 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Label.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Label.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Menu.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Menu.qml
index 173c50f7e8..173c50f7e8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Menu.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Menu.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBar.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuBar.qml
index 680caa9ada..680caa9ada 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBarItem.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuBarItem.qml
index b3cdc391b9..b3cdc391b9 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBarItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuBarItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuItem.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuItem.qml
index 1f277bc466..1f277bc466 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuSeparator.qml
index e9ad13b303..e9ad13b303 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Page.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Page.qml
index 0ddf3f5b51..0ddf3f5b51 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Page.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Page.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/PageIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/PageIndicator.qml
index bc4c22f093..bc4c22f093 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/PageIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/PageIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Pane.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Pane.qml
index 816dcf5669..816dcf5669 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Pane.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Pane.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Popup.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Popup.qml
index 55dac84936..55dac84936 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Popup.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Popup.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ProgressBar.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ProgressBar.qml
index 9ce1cd99f3..9ce1cd99f3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ProgressBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ProgressBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/RadioButton.qml
index e76b465c69..e76b465c69 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/RadioButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/RadioDelegate.qml
index 4514f466c8..4514f466c8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/RadioDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RangeSlider.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/RangeSlider.qml
index d747ce8bc2..d747ce8bc2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RangeSlider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/RangeSlider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RoundButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/RoundButton.qml
index 5152ed430f..5152ed430f 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RoundButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/RoundButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollBar.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollBar.qml
index 55e74e088b..55e74e088b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollIndicator.qml
index 9bf0a176e1..9bf0a176e1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollView.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollView.qml
index 1029e4ed20..1029e4ed20 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Slider.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Slider.qml
index 52038ea8ed..52038ea8ed 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Slider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Slider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SpinBox.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/SpinBox.qml
index 388e82e51b..388e82e51b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SpinBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/SpinBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/StackView.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/StackView.qml
index 2664fea8d7..2664fea8d7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/StackView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/StackView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwipeDelegate.qml
index 71df762fe8..71df762fe8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwipeDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeView.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwipeView.qml
index b0801f7a74..b0801f7a74 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwipeView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Switch.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Switch.qml
index f413f5b310..f413f5b310 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Switch.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Switch.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwitchDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwitchDelegate.qml
index 9342280478..9342280478 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwitchDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabBar.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/TabBar.qml
index ec59e9eedc..ec59e9eedc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/TabBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/TabButton.qml
index 9a3eda7aa9..9a3eda7aa9 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/TabButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextArea.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/TextArea.qml
index fe03103e9f..fe03103e9f 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextArea.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/TextArea.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextField.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/TextField.qml
index ff2e08e82e..ff2e08e82e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextField.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/TextField.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolBar.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolBar.qml
index 73e8d45187..73e8d45187 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolButton.qml
index f45e98f851..f45e98f851 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolSeparator.qml
index 840bd16711..840bd16711 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolTip.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolTip.qml
index 9d6e77cb60..9d6e77cb60 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolTip.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolTip.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Tumbler.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Tumbler.qml
index dba21f56d1..dba21f56d1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Tumbler.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Tumbler.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/qmldir b/tests/auto/quickcontrols/customization/data/styles/incomplete/qmldir
index e8813bd518..e8813bd518 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/qmldir
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/qmldir
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/AbstractButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/AbstractButton.qml
index ba1b1cb8fa..ba1b1cb8fa 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/AbstractButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/AbstractButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ApplicationWindow.qml b/tests/auto/quickcontrols/customization/data/styles/override/ApplicationWindow.qml
index d2439bfb84..d2439bfb84 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ApplicationWindow.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/BusyIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/override/BusyIndicator.qml
index 827b45810a..827b45810a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/BusyIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/BusyIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Button.qml b/tests/auto/quickcontrols/customization/data/styles/override/Button.qml
index a5bea3ebfe..a5bea3ebfe 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Button.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Button.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/CheckBox.qml b/tests/auto/quickcontrols/customization/data/styles/override/CheckBox.qml
index aa7230cbd9..aa7230cbd9 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/CheckBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/CheckBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/CheckDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/override/CheckDelegate.qml
index ea0b768bb4..ea0b768bb4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/CheckDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/CheckDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ComboBox.qml b/tests/auto/quickcontrols/customization/data/styles/override/ComboBox.qml
index ba2467e0be..ba2467e0be 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ComboBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ComboBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Container.qml b/tests/auto/quickcontrols/customization/data/styles/override/Container.qml
index 68186cd2e0..68186cd2e0 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Container.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Container.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Control.qml b/tests/auto/quickcontrols/customization/data/styles/override/Control.qml
index b9ca4c2643..b9ca4c2643 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Control.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Control.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/DelayButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/DelayButton.qml
index 68ff2684d3..68ff2684d3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/DelayButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/DelayButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Dial.qml b/tests/auto/quickcontrols/customization/data/styles/override/Dial.qml
index e451b6b0c2..e451b6b0c2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Dial.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Dial.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Dialog.qml b/tests/auto/quickcontrols/customization/data/styles/override/Dialog.qml
index 1870887243..1870887243 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Dialog.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Dialog.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/DialogButtonBox.qml b/tests/auto/quickcontrols/customization/data/styles/override/DialogButtonBox.qml
index 4e7ceb0ab6..4e7ceb0ab6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/DialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Drawer.qml b/tests/auto/quickcontrols/customization/data/styles/override/Drawer.qml
index 0de7097601..0de7097601 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Drawer.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Drawer.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Frame.qml b/tests/auto/quickcontrols/customization/data/styles/override/Frame.qml
index 3e4effff0a..3e4effff0a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Frame.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Frame.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/GroupBox.qml b/tests/auto/quickcontrols/customization/data/styles/override/GroupBox.qml
index a50e3a519b..a50e3a519b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/GroupBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/GroupBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ItemDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/override/ItemDelegate.qml
index 4e4f8d0fdd..4e4f8d0fdd 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ItemDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ItemDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Label.qml b/tests/auto/quickcontrols/customization/data/styles/override/Label.qml
index 22ea5aab7c..22ea5aab7c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Label.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Label.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Menu.qml b/tests/auto/quickcontrols/customization/data/styles/override/Menu.qml
index 88d8510675..88d8510675 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Menu.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Menu.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/MenuBar.qml b/tests/auto/quickcontrols/customization/data/styles/override/MenuBar.qml
index 90aa93ca19..90aa93ca19 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/MenuBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/MenuBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/MenuBarItem.qml b/tests/auto/quickcontrols/customization/data/styles/override/MenuBarItem.qml
index 18db0060a1..18db0060a1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/MenuBarItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/MenuBarItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/MenuItem.qml b/tests/auto/quickcontrols/customization/data/styles/override/MenuItem.qml
index 43acebc514..43acebc514 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/MenuItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/MenuItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/MenuSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/override/MenuSeparator.qml
index 703e381698..703e381698 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/MenuSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/MenuSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Page.qml b/tests/auto/quickcontrols/customization/data/styles/override/Page.qml
index 2fa1ad4d44..2fa1ad4d44 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Page.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Page.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/PageIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/override/PageIndicator.qml
index 4e4cef6d90..4e4cef6d90 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/PageIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/PageIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Pane.qml b/tests/auto/quickcontrols/customization/data/styles/override/Pane.qml
index 8a281da2b0..8a281da2b0 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Pane.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Pane.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Popup.qml b/tests/auto/quickcontrols/customization/data/styles/override/Popup.qml
index 6dfa3b20e4..6dfa3b20e4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Popup.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Popup.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ProgressBar.qml b/tests/auto/quickcontrols/customization/data/styles/override/ProgressBar.qml
index e111790fe3..e111790fe3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ProgressBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ProgressBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/RadioButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/RadioButton.qml
index b7a3a0a10d..b7a3a0a10d 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/RadioButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/RadioButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/RadioDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/override/RadioDelegate.qml
index 83c0d73551..83c0d73551 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/RadioDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/RadioDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/RangeSlider.qml b/tests/auto/quickcontrols/customization/data/styles/override/RangeSlider.qml
index 3025960649..3025960649 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/RangeSlider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/RangeSlider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/RoundButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/RoundButton.qml
index 3949749ed2..3949749ed2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/RoundButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/RoundButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollBar.qml b/tests/auto/quickcontrols/customization/data/styles/override/ScrollBar.qml
index a546bf2eec..a546bf2eec 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ScrollBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/override/ScrollIndicator.qml
index f514210c1a..f514210c1a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ScrollIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollView.qml b/tests/auto/quickcontrols/customization/data/styles/override/ScrollView.qml
index ae6da7860b..ae6da7860b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ScrollView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Slider.qml b/tests/auto/quickcontrols/customization/data/styles/override/Slider.qml
index 5ced07590a..5ced07590a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Slider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Slider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/SpinBox.qml b/tests/auto/quickcontrols/customization/data/styles/override/SpinBox.qml
index 66c13d3cf8..66c13d3cf8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/SpinBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/SpinBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/StackView.qml b/tests/auto/quickcontrols/customization/data/styles/override/StackView.qml
index 8759551ae1..8759551ae1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/StackView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/StackView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/SwipeDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/override/SwipeDelegate.qml
index ae994c612c..ae994c612c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/SwipeDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/SwipeView.qml b/tests/auto/quickcontrols/customization/data/styles/override/SwipeView.qml
index d0b584bfd4..d0b584bfd4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/SwipeView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/SwipeView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Switch.qml b/tests/auto/quickcontrols/customization/data/styles/override/Switch.qml
index 83e5f2b56b..83e5f2b56b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Switch.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Switch.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/SwitchDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/override/SwitchDelegate.qml
index 5e75fdbd64..5e75fdbd64 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/SwitchDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/TabBar.qml b/tests/auto/quickcontrols/customization/data/styles/override/TabBar.qml
index 0437d3b5af..0437d3b5af 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/TabBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/TabBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/TabButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/TabButton.qml
index ab78b3246f..ab78b3246f 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/TabButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/TabButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/TextArea.qml b/tests/auto/quickcontrols/customization/data/styles/override/TextArea.qml
index 17d1883624..17d1883624 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/TextArea.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/TextArea.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/TextField.qml b/tests/auto/quickcontrols/customization/data/styles/override/TextField.qml
index 22c21fd751..22c21fd751 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/TextField.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/TextField.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ToolBar.qml b/tests/auto/quickcontrols/customization/data/styles/override/ToolBar.qml
index 957f3f7b5b..957f3f7b5b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ToolBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ToolBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ToolButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/ToolButton.qml
index 19999c8a4a..19999c8a4a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ToolButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ToolButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ToolSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/override/ToolSeparator.qml
index b88fba1bab..b88fba1bab 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ToolSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ToolSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ToolTip.qml b/tests/auto/quickcontrols/customization/data/styles/override/ToolTip.qml
index b4922d05eb..b4922d05eb 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ToolTip.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ToolTip.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Tumbler.qml b/tests/auto/quickcontrols/customization/data/styles/override/Tumbler.qml
index ac49cd7675..ac49cd7675 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Tumbler.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Tumbler.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/qmldir b/tests/auto/quickcontrols/customization/data/styles/override/qmldir
index f15ba96ab3..f15ba96ab3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/qmldir
+++ b/tests/auto/quickcontrols/customization/data/styles/override/qmldir
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/AbstractButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/AbstractButton.qml
index f0d9935706..f0d9935706 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/AbstractButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/AbstractButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ApplicationWindow.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ApplicationWindow.qml
index 8f3f02a05a..8f3f02a05a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ApplicationWindow.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/BusyIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/simple/BusyIndicator.qml
index d5520d2ba6..d5520d2ba6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/BusyIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/BusyIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Button.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Button.qml
index b71c5e3af9..b71c5e3af9 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Button.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Button.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/CheckBox.qml b/tests/auto/quickcontrols/customization/data/styles/simple/CheckBox.qml
index aef812111a..aef812111a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/CheckBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/CheckBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/CheckDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/simple/CheckDelegate.qml
index 06d5ac9cb0..06d5ac9cb0 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/CheckDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/CheckDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ComboBox.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ComboBox.qml
index c5519f1c2a..c5519f1c2a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ComboBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ComboBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Container.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Container.qml
index 85c59b4053..85c59b4053 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Container.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Container.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Control.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Control.qml
index 7e4808101b..7e4808101b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Control.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Control.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/DelayButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/DelayButton.qml
index db6dd16514..db6dd16514 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/DelayButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/DelayButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Dial.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Dial.qml
index 6365f50387..6365f50387 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Dial.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Dial.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Dialog.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Dialog.qml
index b17a593b84..b17a593b84 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Dialog.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Dialog.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/DialogButtonBox.qml b/tests/auto/quickcontrols/customization/data/styles/simple/DialogButtonBox.qml
index b994d6a8b6..b994d6a8b6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/DialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Drawer.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Drawer.qml
index 3b6257b4f2..3b6257b4f2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Drawer.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Drawer.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Frame.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Frame.qml
index e1730dfbe6..e1730dfbe6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Frame.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Frame.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/GroupBox.qml b/tests/auto/quickcontrols/customization/data/styles/simple/GroupBox.qml
index 9aaad3a0c1..9aaad3a0c1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/GroupBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/GroupBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ItemDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ItemDelegate.qml
index 0f5c22addd..0f5c22addd 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ItemDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ItemDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Label.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Label.qml
index f128725923..f128725923 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Label.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Label.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Menu.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Menu.qml
index f494d37711..f494d37711 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Menu.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Menu.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBar.qml b/tests/auto/quickcontrols/customization/data/styles/simple/MenuBar.qml
index ee6aecefe6..ee6aecefe6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/MenuBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBarItem.qml b/tests/auto/quickcontrols/customization/data/styles/simple/MenuBarItem.qml
index f0271ba20f..f0271ba20f 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBarItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/MenuBarItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuItem.qml b/tests/auto/quickcontrols/customization/data/styles/simple/MenuItem.qml
index 7dee9ce2f3..7dee9ce2f3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/MenuItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/simple/MenuSeparator.qml
index bbb90b6f62..bbb90b6f62 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/MenuSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Page.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Page.qml
index 4dc17112e9..4dc17112e9 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Page.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Page.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/PageIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/simple/PageIndicator.qml
index 59ce9282dc..59ce9282dc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/PageIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/PageIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Pane.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Pane.qml
index 0873baa770..0873baa770 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Pane.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Pane.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Popup.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Popup.qml
index ebdb88f8a2..ebdb88f8a2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Popup.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Popup.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ProgressBar.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ProgressBar.qml
index c6cd7bb7d6..c6cd7bb7d6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ProgressBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ProgressBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/RadioButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/RadioButton.qml
index a80230c455..a80230c455 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/RadioButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/RadioButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/RadioDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/simple/RadioDelegate.qml
index cdded1165c..cdded1165c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/RadioDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/RadioDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/RangeSlider.qml b/tests/auto/quickcontrols/customization/data/styles/simple/RangeSlider.qml
index 0227f4d296..0227f4d296 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/RangeSlider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/RangeSlider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/RoundButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/RoundButton.qml
index 0a9e5e13d1..0a9e5e13d1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/RoundButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/RoundButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollBar.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollBar.qml
index a5cd90089c..a5cd90089c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollIndicator.qml
index ce1d6a919c..ce1d6a919c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollView.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollView.qml
index 765bb87f4a..765bb87f4a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Slider.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Slider.qml
index b91e93941f..b91e93941f 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Slider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Slider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/SpinBox.qml b/tests/auto/quickcontrols/customization/data/styles/simple/SpinBox.qml
index 6c4cee6298..6c4cee6298 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/SpinBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/SpinBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/StackView.qml b/tests/auto/quickcontrols/customization/data/styles/simple/StackView.qml
index 35b668df49..35b668df49 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/StackView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/StackView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/simple/SwipeDelegate.qml
index 95ddab00cc..95ddab00cc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/SwipeDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeView.qml b/tests/auto/quickcontrols/customization/data/styles/simple/SwipeView.qml
index 73ecba8586..73ecba8586 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/SwipeView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Switch.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Switch.qml
index c8e42d3ada..c8e42d3ada 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Switch.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Switch.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/SwitchDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/simple/SwitchDelegate.qml
index 00831df6c3..00831df6c3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/SwitchDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/TabBar.qml b/tests/auto/quickcontrols/customization/data/styles/simple/TabBar.qml
index 282a11aa52..282a11aa52 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/TabBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/TabBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/TabButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/TabButton.qml
index 83de47fe54..83de47fe54 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/TabButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/TabButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/TextArea.qml b/tests/auto/quickcontrols/customization/data/styles/simple/TextArea.qml
index 6125d255be..6125d255be 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/TextArea.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/TextArea.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/TextField.qml b/tests/auto/quickcontrols/customization/data/styles/simple/TextField.qml
index a49bbed804..a49bbed804 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/TextField.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/TextField.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolBar.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ToolBar.qml
index 0e7c697722..0e7c697722 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ToolBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ToolButton.qml
index e91a0d9335..e91a0d9335 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ToolButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ToolSeparator.qml
index c766f50754..c766f50754 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ToolSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolTip.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ToolTip.qml
index 58bf428f72..58bf428f72 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolTip.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ToolTip.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Tumbler.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Tumbler.qml
index 3e7a2f486b..3e7a2f486b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Tumbler.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Tumbler.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/qmldir b/tests/auto/quickcontrols/customization/data/styles/simple/qmldir
index e5159885cb..e5159885cb 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/qmldir
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/qmldir
diff --git a/tests/auto/quickcontrols2/customization/dummy_imports.qml b/tests/auto/quickcontrols/customization/dummy_imports.qml
index 40d9cea712..40d9cea712 100644
--- a/tests/auto/quickcontrols2/customization/dummy_imports.qml
+++ b/tests/auto/quickcontrols/customization/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/customization/tst_customization.cpp b/tests/auto/quickcontrols/customization/tst_customization.cpp
index 1ee39ae254..1ee39ae254 100644
--- a/tests/auto/quickcontrols2/customization/tst_customization.cpp
+++ b/tests/auto/quickcontrols/customization/tst_customization.cpp
diff --git a/tests/auto/quickcontrols2/designer/CMakeLists.txt b/tests/auto/quickcontrols/designer/CMakeLists.txt
index 9ad0512f80..9ad0512f80 100644
--- a/tests/auto/quickcontrols2/designer/CMakeLists.txt
+++ b/tests/auto/quickcontrols/designer/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/designer/dummy_imports.qml b/tests/auto/quickcontrols/designer/dummy_imports.qml
index 401692e570..401692e570 100644
--- a/tests/auto/quickcontrols2/designer/dummy_imports.qml
+++ b/tests/auto/quickcontrols/designer/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/designer/tst_designer.cpp b/tests/auto/quickcontrols/designer/tst_designer.cpp
index 760f739a02..760f739a02 100644
--- a/tests/auto/quickcontrols2/designer/tst_designer.cpp
+++ b/tests/auto/quickcontrols/designer/tst_designer.cpp
diff --git a/tests/auto/quickcontrols2/focus/BLACKLIST b/tests/auto/quickcontrols/focus/BLACKLIST
index 730d384475..730d384475 100644
--- a/tests/auto/quickcontrols2/focus/BLACKLIST
+++ b/tests/auto/quickcontrols/focus/BLACKLIST
diff --git a/tests/auto/quickcontrols/focus/CMakeLists.txt b/tests/auto/quickcontrols/focus/CMakeLists.txt
new file mode 100644
index 0000000000..2fc401451f
--- /dev/null
+++ b/tests/auto/quickcontrols/focus/CMakeLists.txt
@@ -0,0 +1,54 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from focus.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_focus LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_focus Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_focus
+    SOURCES
+        tst_focus.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_focus CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_focus CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/focus/data/activeFocusOnTab.qml b/tests/auto/quickcontrols/focus/data/activeFocusOnTab.qml
index b158c673f0..b158c673f0 100644
--- a/tests/auto/quickcontrols2/focus/data/activeFocusOnTab.qml
+++ b/tests/auto/quickcontrols/focus/data/activeFocusOnTab.qml
diff --git a/tests/auto/quickcontrols2/focus/data/focusReason.qml b/tests/auto/quickcontrols/focus/data/focusReason.qml
index 0f8a61f05e..0f8a61f05e 100644
--- a/tests/auto/quickcontrols2/focus/data/focusReason.qml
+++ b/tests/auto/quickcontrols/focus/data/focusReason.qml
diff --git a/tests/auto/quickcontrols2/focus/data/keyNavigation.qml b/tests/auto/quickcontrols/focus/data/keyNavigation.qml
index f1a10a2569..f1a10a2569 100644
--- a/tests/auto/quickcontrols2/focus/data/keyNavigation.qml
+++ b/tests/auto/quickcontrols/focus/data/keyNavigation.qml
diff --git a/tests/auto/quickcontrols2/focus/data/visualFocus.qml b/tests/auto/quickcontrols/focus/data/visualFocus.qml
index ec35905e27..ec35905e27 100644
--- a/tests/auto/quickcontrols2/focus/data/visualFocus.qml
+++ b/tests/auto/quickcontrols/focus/data/visualFocus.qml
diff --git a/tests/auto/quickcontrols2/focus/tst_focus.cpp b/tests/auto/quickcontrols/focus/tst_focus.cpp
index ca70146885..ca70146885 100644
--- a/tests/auto/quickcontrols2/focus/tst_focus.cpp
+++ b/tests/auto/quickcontrols/focus/tst_focus.cpp
diff --git a/tests/auto/quickcontrols/font/CMakeLists.txt b/tests/auto/quickcontrols/font/CMakeLists.txt
new file mode 100644
index 0000000000..ab62726cd3
--- /dev/null
+++ b/tests/auto/quickcontrols/font/CMakeLists.txt
@@ -0,0 +1,56 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from font.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_font LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_font Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_font
+    SOURCES
+        tst_font.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:font.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_font CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_font CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/font/data/font-appwindow-custom.qml b/tests/auto/quickcontrols/font/data/font-appwindow-custom.qml
index fa621ae6a0..fa621ae6a0 100644
--- a/tests/auto/quickcontrols2/font/data/font-appwindow-custom.qml
+++ b/tests/auto/quickcontrols/font/data/font-appwindow-custom.qml
diff --git a/tests/auto/quickcontrols2/font/data/font-appwindow-default.qml b/tests/auto/quickcontrols/font/data/font-appwindow-default.qml
index f9c767b876..f9c767b876 100644
--- a/tests/auto/quickcontrols2/font/data/font-appwindow-default.qml
+++ b/tests/auto/quickcontrols/font/data/font-appwindow-default.qml
diff --git a/tests/auto/quickcontrols2/font/data/font-control-custom.qml b/tests/auto/quickcontrols/font/data/font-control-custom.qml
index c7ee583d04..c7ee583d04 100644
--- a/tests/auto/quickcontrols2/font/data/font-control-custom.qml
+++ b/tests/auto/quickcontrols/font/data/font-control-custom.qml
diff --git a/tests/auto/quickcontrols2/font/data/font-control-default.qml b/tests/auto/quickcontrols/font/data/font-control-default.qml
index 7cd58e12b3..7cd58e12b3 100644
--- a/tests/auto/quickcontrols2/font/data/font-control-default.qml
+++ b/tests/auto/quickcontrols/font/data/font-control-default.qml
diff --git a/tests/auto/quickcontrols2/font/data/font-popup-custom.qml b/tests/auto/quickcontrols/font/data/font-popup-custom.qml
index fcf942e3a5..fcf942e3a5 100644
--- a/tests/auto/quickcontrols2/font/data/font-popup-custom.qml
+++ b/tests/auto/quickcontrols/font/data/font-popup-custom.qml
diff --git a/tests/auto/quickcontrols2/font/data/font-popup-default.qml b/tests/auto/quickcontrols/font/data/font-popup-default.qml
index b9db73c9fb..b9db73c9fb 100644
--- a/tests/auto/quickcontrols2/font/data/font-popup-default.qml
+++ b/tests/auto/quickcontrols/font/data/font-popup-default.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-childcontrol.qml b/tests/auto/quickcontrols/font/data/inheritance-childcontrol.qml
index f476020517..f476020517 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-childcontrol.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-childcontrol.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-childpopup.qml b/tests/auto/quickcontrols/font/data/inheritance-childpopup.qml
index 8b7a033bd7..8b7a033bd7 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-childpopup.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-childpopup.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-control.qml b/tests/auto/quickcontrols/font/data/inheritance-control.qml
index 2cd5c125f4..2cd5c125f4 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-control.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-control.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildcontrol.qml b/tests/auto/quickcontrols/font/data/inheritance-dynamicchildcontrol.qml
index 18305058bc..18305058bc 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildcontrol.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-dynamicchildcontrol.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildpopup.qml b/tests/auto/quickcontrols/font/data/inheritance-dynamicchildpopup.qml
index 6b16f1a46b..6b16f1a46b 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildpopup.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-dynamicchildpopup.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-dynamiccontrol.qml b/tests/auto/quickcontrols/font/data/inheritance-dynamiccontrol.qml
index df0e13bf2c..df0e13bf2c 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-dynamiccontrol.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-dynamiccontrol.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-dynamicpopup.qml b/tests/auto/quickcontrols/font/data/inheritance-dynamicpopup.qml
index 76b7d7cbda..76b7d7cbda 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-dynamicpopup.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-dynamicpopup.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-popup.qml b/tests/auto/quickcontrols/font/data/inheritance-popup.qml
index a5010f0f11..a5010f0f11 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-popup.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-popup.qml
diff --git a/tests/auto/quickcontrols2/font/data/listview.qml b/tests/auto/quickcontrols/font/data/listview.qml
index aa07a337cf..aa07a337cf 100644
--- a/tests/auto/quickcontrols2/font/data/listview.qml
+++ b/tests/auto/quickcontrols/font/data/listview.qml
diff --git a/tests/auto/quickcontrols2/font/data/resolve.qml b/tests/auto/quickcontrols/font/data/resolve.qml
index 00e5c767bb..00e5c767bb 100644
--- a/tests/auto/quickcontrols2/font/data/resolve.qml
+++ b/tests/auto/quickcontrols/font/data/resolve.qml
diff --git a/tests/auto/quickcontrols2/font/tst_font.cpp b/tests/auto/quickcontrols/font/tst_font.cpp
index 26caf0c476..26caf0c476 100644
--- a/tests/auto/quickcontrols2/font/tst_font.cpp
+++ b/tests/auto/quickcontrols/font/tst_font.cpp
diff --git a/tests/auto/quickcontrols/palette/CMakeLists.txt b/tests/auto/quickcontrols/palette/CMakeLists.txt
new file mode 100644
index 0000000000..d0dad952a6
--- /dev/null
+++ b/tests/auto/quickcontrols/palette/CMakeLists.txt
@@ -0,0 +1,70 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from palette.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_palette LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_palette Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_palette
+    SOURCES
+        tst_palette.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qmake_immediate_resource_files
+    "qtquickcontrols2.conf"
+)
+
+qt_internal_add_resource(tst_palette "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:palette.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_palette CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_palette CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/palette/data/bindings.qml b/tests/auto/quickcontrols/palette/data/bindings.qml
index a584007e54..a584007e54 100644
--- a/tests/auto/quickcontrols2/palette/data/bindings.qml
+++ b/tests/auto/quickcontrols/palette/data/bindings.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-childcontrol.qml b/tests/auto/quickcontrols/palette/data/inheritance-childcontrol.qml
index f476020517..f476020517 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-childcontrol.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-childcontrol.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-childpopup.qml b/tests/auto/quickcontrols/palette/data/inheritance-childpopup.qml
index 8b7a033bd7..8b7a033bd7 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-childpopup.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-childpopup.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-control.qml b/tests/auto/quickcontrols/palette/data/inheritance-control.qml
index 2cd5c125f4..2cd5c125f4 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-control.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-control.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildcontrol.qml b/tests/auto/quickcontrols/palette/data/inheritance-dynamicchildcontrol.qml
index 18305058bc..18305058bc 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildcontrol.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-dynamicchildcontrol.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildpopup.qml b/tests/auto/quickcontrols/palette/data/inheritance-dynamicchildpopup.qml
index 6b16f1a46b..6b16f1a46b 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildpopup.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-dynamicchildpopup.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamiccontrol.qml b/tests/auto/quickcontrols/palette/data/inheritance-dynamiccontrol.qml
index df0e13bf2c..df0e13bf2c 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamiccontrol.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-dynamiccontrol.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicpopup.qml b/tests/auto/quickcontrols/palette/data/inheritance-dynamicpopup.qml
index 76b7d7cbda..76b7d7cbda 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicpopup.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-dynamicpopup.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-popup.qml b/tests/auto/quickcontrols/palette/data/inheritance-popup.qml
index a5010f0f11..a5010f0f11 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-popup.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-popup.qml
diff --git a/tests/auto/quickcontrols2/palette/data/listview.qml b/tests/auto/quickcontrols/palette/data/listview.qml
index 92816fde19..92816fde19 100644
--- a/tests/auto/quickcontrols2/palette/data/listview.qml
+++ b/tests/auto/quickcontrols/palette/data/listview.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-appwindow-custom.qml b/tests/auto/quickcontrols/palette/data/palette-appwindow-custom.qml
index 22876b90fa..22876b90fa 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-appwindow-custom.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-appwindow-custom.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-appwindow-default.qml b/tests/auto/quickcontrols/palette/data/palette-appwindow-default.qml
index f9c767b876..f9c767b876 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-appwindow-default.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-appwindow-default.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-control-custom.qml b/tests/auto/quickcontrols/palette/data/palette-control-custom.qml
index 4c4206cdfd..4c4206cdfd 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-control-custom.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-control-custom.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-control-default.qml b/tests/auto/quickcontrols/palette/data/palette-control-default.qml
index 7cd58e12b3..7cd58e12b3 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-control-default.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-control-default.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-popup-custom.qml b/tests/auto/quickcontrols/palette/data/palette-popup-custom.qml
index c534d30156..c534d30156 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-popup-custom.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-popup-custom.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-popup-default.qml b/tests/auto/quickcontrols/palette/data/palette-popup-default.qml
index b9db73c9fb..b9db73c9fb 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-popup-default.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-popup-default.qml
diff --git a/tests/auto/quickcontrols2/palette/data/resolve.qml b/tests/auto/quickcontrols/palette/data/resolve.qml
index 78cf091848..78cf091848 100644
--- a/tests/auto/quickcontrols2/palette/data/resolve.qml
+++ b/tests/auto/quickcontrols/palette/data/resolve.qml
diff --git a/tests/auto/quickcontrols2/palette/data/set-palette.qml b/tests/auto/quickcontrols/palette/data/set-palette.qml
index b987a7d6b1..b987a7d6b1 100644
--- a/tests/auto/quickcontrols2/palette/data/set-palette.qml
+++ b/tests/auto/quickcontrols/palette/data/set-palette.qml
diff --git a/tests/auto/quickcontrols2/palette/qtquickcontrols2.conf b/tests/auto/quickcontrols/palette/qtquickcontrols2.conf
index c5de6b36dd..c5de6b36dd 100644
--- a/tests/auto/quickcontrols2/palette/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/palette/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/palette/tst_palette.cpp b/tests/auto/quickcontrols/palette/tst_palette.cpp
index e3a53f0c21..e3a53f0c21 100644
--- a/tests/auto/quickcontrols2/palette/tst_palette.cpp
+++ b/tests/auto/quickcontrols/palette/tst_palette.cpp
diff --git a/tests/auto/quickcontrols2/platform/CMakeLists.txt b/tests/auto/quickcontrols/platform/CMakeLists.txt
index a2f77fdd9c..a2f77fdd9c 100644
--- a/tests/auto/quickcontrols2/platform/CMakeLists.txt
+++ b/tests/auto/quickcontrols/platform/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/platform/data/tst_colordialog.qml b/tests/auto/quickcontrols/platform/data/tst_colordialog.qml
index 093a99b31b..093a99b31b 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_colordialog.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_colordialog.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_filedialog.qml b/tests/auto/quickcontrols/platform/data/tst_filedialog.qml
index 63a6747e67..63a6747e67 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_filedialog.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_filedialog.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_folderdialog.qml b/tests/auto/quickcontrols/platform/data/tst_folderdialog.qml
index 67a5bf0ac0..67a5bf0ac0 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_folderdialog.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_folderdialog.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_fontdialog.qml b/tests/auto/quickcontrols/platform/data/tst_fontdialog.qml
index 884ea7e7d2..884ea7e7d2 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_fontdialog.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_fontdialog.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_menu.qml b/tests/auto/quickcontrols/platform/data/tst_menu.qml
index fb9949c8b7..fb9949c8b7 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_menu.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_menu.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_menubar.qml b/tests/auto/quickcontrols/platform/data/tst_menubar.qml
index ea0d005528..ea0d005528 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_menubar.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_menubar.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_menuitem.qml b/tests/auto/quickcontrols/platform/data/tst_menuitem.qml
index a446bf8c4d..a446bf8c4d 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_menuitem.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_menuitem.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_menuitemgroup.qml b/tests/auto/quickcontrols/platform/data/tst_menuitemgroup.qml
index 74f3a59a48..74f3a59a48 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_menuitemgroup.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_menuitemgroup.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_menuseparator.qml b/tests/auto/quickcontrols/platform/data/tst_menuseparator.qml
index 4fee4b9374..4fee4b9374 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_menuseparator.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_menuseparator.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_messagedialog.qml b/tests/auto/quickcontrols/platform/data/tst_messagedialog.qml
index 93ed4e261e..93ed4e261e 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_messagedialog.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_messagedialog.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_standardpaths.qml b/tests/auto/quickcontrols/platform/data/tst_standardpaths.qml
index 95cdbdf49d..95cdbdf49d 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_standardpaths.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_standardpaths.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_systemtrayicon.qml b/tests/auto/quickcontrols/platform/data/tst_systemtrayicon.qml
index 3f043d275f..3f043d275f 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_systemtrayicon.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_systemtrayicon.qml
diff --git a/tests/auto/quickcontrols2/platform/tst_platform.cpp b/tests/auto/quickcontrols/platform/tst_platform.cpp
index 94bf1d6a59..94bf1d6a59 100644
--- a/tests/auto/quickcontrols2/platform/tst_platform.cpp
+++ b/tests/auto/quickcontrols/platform/tst_platform.cpp
diff --git a/tests/auto/quickcontrols2/pointerhandlers/CMakeLists.txt b/tests/auto/quickcontrols/pointerhandlers/CMakeLists.txt
index 6cd01e0fdd..6cd01e0fdd 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/CMakeLists.txt
+++ b/tests/auto/quickcontrols/pointerhandlers/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/pointerhandlers/data/controlandmousearea.qml b/tests/auto/quickcontrols/pointerhandlers/data/controlandmousearea.qml
index 00c680453a..00c680453a 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/data/controlandmousearea.qml
+++ b/tests/auto/quickcontrols/pointerhandlers/data/controlandmousearea.qml
diff --git a/tests/auto/quickcontrols2/pointerhandlers/data/controlinsidecontrol.qml b/tests/auto/quickcontrols/pointerhandlers/data/controlinsidecontrol.qml
index 69d855ec57..69d855ec57 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/data/controlinsidecontrol.qml
+++ b/tests/auto/quickcontrols/pointerhandlers/data/controlinsidecontrol.qml
diff --git a/tests/auto/quickcontrols2/pointerhandlers/data/draggableButton.qml b/tests/auto/quickcontrols/pointerhandlers/data/draggableButton.qml
index 288578acb3..288578acb3 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/data/draggableButton.qml
+++ b/tests/auto/quickcontrols/pointerhandlers/data/draggableButton.qml
diff --git a/tests/auto/quickcontrols2/pointerhandlers/data/tapHandlerButton.qml b/tests/auto/quickcontrols/pointerhandlers/data/tapHandlerButton.qml
index 4d5c70f544..4d5c70f544 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/data/tapHandlerButton.qml
+++ b/tests/auto/quickcontrols/pointerhandlers/data/tapHandlerButton.qml
diff --git a/tests/auto/quickcontrols2/pointerhandlers/tst_pointerhandlers.cpp b/tests/auto/quickcontrols/pointerhandlers/tst_pointerhandlers.cpp
index aa83175252..aa83175252 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/tst_pointerhandlers.cpp
+++ b/tests/auto/quickcontrols/pointerhandlers/tst_pointerhandlers.cpp
diff --git a/tests/auto/quickcontrols2/pressandhold/CMakeLists.txt b/tests/auto/quickcontrols/pressandhold/CMakeLists.txt
index 8d8c967a56..8d8c967a56 100644
--- a/tests/auto/quickcontrols2/pressandhold/CMakeLists.txt
+++ b/tests/auto/quickcontrols/pressandhold/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/pressandhold/data/dependencies.qml b/tests/auto/quickcontrols/pressandhold/data/dependencies.qml
index 280cfd2962..280cfd2962 100644
--- a/tests/auto/quickcontrols2/pressandhold/data/dependencies.qml
+++ b/tests/auto/quickcontrols/pressandhold/data/dependencies.qml
diff --git a/tests/auto/quickcontrols2/pressandhold/tst_pressandhold.cpp b/tests/auto/quickcontrols/pressandhold/tst_pressandhold.cpp
index 98013a1d0c..98013a1d0c 100644
--- a/tests/auto/quickcontrols2/pressandhold/tst_pressandhold.cpp
+++ b/tests/auto/quickcontrols/pressandhold/tst_pressandhold.cpp
diff --git a/tests/auto/quickcontrols/qquickapplicationwindow/CMakeLists.txt b/tests/auto/quickcontrols/qquickapplicationwindow/CMakeLists.txt
new file mode 100644
index 0000000000..9828a23490
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickapplicationwindow.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickapplicationwindow LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickapplicationwindow Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickapplicationwindow
+    SOURCES
+        tst_qquickapplicationwindow.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qquickapplicationwindow.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/activeFocusControl.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/activeFocusControl.qml
index f699a27fc1..f699a27fc1 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/activeFocusControl.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/activeFocusControl.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/activefocusontab.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/activefocusontab.qml
index 7798c4ff1d..7798c4ff1d 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/activefocusontab.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/activefocusontab.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/attachedProperties.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/attachedProperties.qml
index 4bb773a831..4bb773a831 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/attachedProperties.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/attachedProperties.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/basicapplicationwindow.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/basicapplicationwindow.qml
index ba4bf1597e..ba4bf1597e 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/basicapplicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/basicapplicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/clearfocusondestruction.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/clearfocusondestruction.qml
index 56dfa89e68..56dfa89e68 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/clearfocusondestruction.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/clearfocusondestruction.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/defaultFocus.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/defaultFocus.qml
index 02ff15ff45..02ff15ff45 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/defaultFocus.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/defaultFocus.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/fill.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/fill.qml
index d57c4c4f71..d57c4c4f71 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/fill.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/fill.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/focusAfterPopupClosed.qml
index 5e13ac274a..5e13ac274a 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/focusAfterPopupClosed.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/focusAfterPopupClosed.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/font.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/font.qml
index 4f33439811..4f33439811 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/font.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/font.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/layout.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/layout.qml
index 11f2371673..11f2371673 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/layout.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/layout.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/layoutLayout.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/layoutLayout.qml
index e27fe07b12..e27fe07b12 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/layoutLayout.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/layoutLayout.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/locale.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/locale.qml
index 7e0b40095e..7e0b40095e 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/locale.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/locale.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/opacity.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/opacity.qml
index ea2de5ccd2..ea2de5ccd2 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/opacity.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/opacity.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/quickcontrols/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
index e055340dde..e055340dde 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
diff --git a/tests/auto/quickcontrols2/qquickcolor/CMakeLists.txt b/tests/auto/quickcontrols/qquickcolor/CMakeLists.txt
index efd06f15ff..efd06f15ff 100644
--- a/tests/auto/quickcontrols2/qquickcolor/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickcolor/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/qquickcolor/data/tst_color.qml b/tests/auto/quickcontrols/qquickcolor/data/tst_color.qml
index d7b6848c3c..d7b6848c3c 100644
--- a/tests/auto/quickcontrols2/qquickcolor/data/tst_color.qml
+++ b/tests/auto/quickcontrols/qquickcolor/data/tst_color.qml
diff --git a/tests/auto/quickcontrols2/qquickcolor/tst_qquickcolor.cpp b/tests/auto/quickcontrols/qquickcolor/tst_qquickcolor.cpp
index ba92ef5b86..ba92ef5b86 100644
--- a/tests/auto/quickcontrols2/qquickcolor/tst_qquickcolor.cpp
+++ b/tests/auto/quickcontrols/qquickcolor/tst_qquickcolor.cpp
diff --git a/tests/auto/quickcontrols/qquickcontrol/CMakeLists.txt b/tests/auto/quickcontrols/qquickcontrol/CMakeLists.txt
new file mode 100644
index 0000000000..861d1388ab
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickcontrol/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickcontrol.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickcontrol LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickcontrol Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickcontrol
+    SOURCES
+        tst_qquickcontrol.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qquickcontrol.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickcontrol CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickcontrol CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickcontrol/data/flickable.qml b/tests/auto/quickcontrols/qquickcontrol/data/flickable.qml
index 9378e3f9c0..9378e3f9c0 100644
--- a/tests/auto/quickcontrols2/qquickcontrol/data/flickable.qml
+++ b/tests/auto/quickcontrols/qquickcontrol/data/flickable.qml
diff --git a/tests/auto/quickcontrols2/qquickcontrol/data/fractionalFontSize.qml b/tests/auto/quickcontrols/qquickcontrol/data/fractionalFontSize.qml
index a4574e460e..a4574e460e 100644
--- a/tests/auto/quickcontrols2/qquickcontrol/data/fractionalFontSize.qml
+++ b/tests/auto/quickcontrols/qquickcontrol/data/fractionalFontSize.qml
diff --git a/tests/auto/quickcontrols2/qquickcontrol/data/resizeBackgroundKeepsBindings.qml b/tests/auto/quickcontrols/qquickcontrol/data/resizeBackgroundKeepsBindings.qml
index 9a6a159990..9a6a159990 100644
--- a/tests/auto/quickcontrols2/qquickcontrol/data/resizeBackgroundKeepsBindings.qml
+++ b/tests/auto/quickcontrols/qquickcontrol/data/resizeBackgroundKeepsBindings.qml
diff --git a/tests/auto/quickcontrols2/qquickcontrol/tst_qquickcontrol.cpp b/tests/auto/quickcontrols/qquickcontrol/tst_qquickcontrol.cpp
index ddb4b7ff8b..ddb4b7ff8b 100644
--- a/tests/auto/quickcontrols2/qquickcontrol/tst_qquickcontrol.cpp
+++ b/tests/auto/quickcontrols/qquickcontrol/tst_qquickcontrol.cpp
diff --git a/tests/auto/quickcontrols2/qquickdrawer/BLACKLIST b/tests/auto/quickcontrols/qquickdrawer/BLACKLIST
index 0a440d4ad3..0a440d4ad3 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickdrawer/BLACKLIST
diff --git a/tests/auto/quickcontrols/qquickdrawer/CMakeLists.txt b/tests/auto/quickcontrols/qquickdrawer/CMakeLists.txt
new file mode 100644
index 0000000000..ed18a0c7e8
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickdrawer/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickdrawer.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickdrawer LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickdrawer Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickdrawer
+    SOURCES
+        tst_qquickdrawer.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qquickdrawer.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickdrawer CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-button.qml b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-button.qml
index ebba679f97..ebba679f97 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-button.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-button.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-hover.qml b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-hover.qml
index d3a9ba499f..d3a9ba499f 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-hover.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-hover.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-wheel.qml b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-wheel.qml
index f59bf5b2db..f59bf5b2db 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-wheel.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-wheel.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow.qml b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow.qml
index dcc37f4307..dcc37f4307 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/dragHandlerInteraction.qml b/tests/auto/quickcontrols/qquickdrawer/data/dragHandlerInteraction.qml
index a2774222f5..a2774222f5 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/dragHandlerInteraction.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/dragHandlerInteraction.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/dragOverModalShadow.qml b/tests/auto/quickcontrols/qquickdrawer/data/dragOverModalShadow.qml
index 73d01fe968..73d01fe968 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/dragOverModalShadow.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/dragOverModalShadow.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/flickable.qml b/tests/auto/quickcontrols/qquickdrawer/data/flickable.qml
index 4ef4605f72..4ef4605f72 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/flickable.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/flickable.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/grabber.qml b/tests/auto/quickcontrols/qquickdrawer/data/grabber.qml
index fdcce390d7..fdcce390d7 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/grabber.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/grabber.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/header.qml b/tests/auto/quickcontrols/qquickdrawer/data/header.qml
index c68202ab1d..c68202ab1d 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/header.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/header.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/multiTouch.qml b/tests/auto/quickcontrols/qquickdrawer/data/multiTouch.qml
index e9e9aa7a18..e9e9aa7a18 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/multiTouch.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/multiTouch.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/multiple.qml b/tests/auto/quickcontrols/qquickdrawer/data/multiple.qml
index 0f9f8ab63a..0f9f8ab63a 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/multiple.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/multiple.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/reposition.qml b/tests/auto/quickcontrols/qquickdrawer/data/reposition.qml
index 4c9eea2b67..4c9eea2b67 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/reposition.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/reposition.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/slider.qml b/tests/auto/quickcontrols/qquickdrawer/data/slider.qml
index f1deb12500..f1deb12500 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/slider.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/slider.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/topEdgeScreenEdge.qml b/tests/auto/quickcontrols/qquickdrawer/data/topEdgeScreenEdge.qml
index 8bf3b2b4fc..8bf3b2b4fc 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/topEdgeScreenEdge.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/topEdgeScreenEdge.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window-button.qml b/tests/auto/quickcontrols/qquickdrawer/data/window-button.qml
index 2f0d4af7e6..2f0d4af7e6 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window-button.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/window-button.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window-hover.qml b/tests/auto/quickcontrols/qquickdrawer/data/window-hover.qml
index 81a14dc700..81a14dc700 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window-hover.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/window-hover.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window-wheel.qml b/tests/auto/quickcontrols/qquickdrawer/data/window-wheel.qml
index 802c60bf1c..802c60bf1c 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window-wheel.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/window-wheel.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window.qml b/tests/auto/quickcontrols/qquickdrawer/data/window.qml
index fbdc4047d7..fbdc4047d7 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/window.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer.cpp b/tests/auto/quickcontrols/qquickdrawer/tst_qquickdrawer.cpp
index 344d96b6fb..344d96b6fb 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer.cpp
+++ b/tests/auto/quickcontrols/qquickdrawer/tst_qquickdrawer.cpp
diff --git a/tests/auto/quickcontrols/qquickheaderview/CMakeLists.txt b/tests/auto/quickcontrols/qquickheaderview/CMakeLists.txt
new file mode 100644
index 0000000000..095ebaf6f5
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickheaderview/CMakeLists.txt
@@ -0,0 +1,58 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickheaderview.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickheaderview LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickheaderview Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickheaderview
+    SOURCES
+        tst_qquickheaderview.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qquickheaderview.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickheaderview CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickheaderview CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickheaderview/data/ListModel.qml b/tests/auto/quickcontrols/qquickheaderview/data/ListModel.qml
index de63fc600b..de63fc600b 100644
--- a/tests/auto/quickcontrols2/qquickheaderview/data/ListModel.qml
+++ b/tests/auto/quickcontrols/qquickheaderview/data/ListModel.qml
diff --git a/tests/auto/quickcontrols2/qquickheaderview/data/Window.qml b/tests/auto/quickcontrols/qquickheaderview/data/Window.qml
index 6082fab42e..6082fab42e 100644
--- a/tests/auto/quickcontrols2/qquickheaderview/data/Window.qml
+++ b/tests/auto/quickcontrols/qquickheaderview/data/Window.qml
diff --git a/tests/auto/quickcontrols2/qquickheaderview/tst_qquickheaderview.cpp b/tests/auto/quickcontrols/qquickheaderview/tst_qquickheaderview.cpp
index 28b92fef71..28b92fef71 100644
--- a/tests/auto/quickcontrols2/qquickheaderview/tst_qquickheaderview.cpp
+++ b/tests/auto/quickcontrols/qquickheaderview/tst_qquickheaderview.cpp
diff --git a/tests/auto/quickcontrols2/qquickiconimage/BLACKLIST b/tests/auto/quickcontrols/qquickiconimage/BLACKLIST
index 70c935375d..70c935375d 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickiconimage/BLACKLIST
diff --git a/tests/auto/quickcontrols/qquickiconimage/CMakeLists.txt b/tests/auto/quickcontrols/qquickiconimage/CMakeLists.txt
new file mode 100644
index 0000000000..4e2794f8e4
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickiconimage/CMakeLists.txt
@@ -0,0 +1,93 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickiconimage.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickiconimage LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickiconimage Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickiconimage
+    SOURCES
+        tst_qquickiconimage.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::QuickControls2ImplPrivate
+        Qt::QuickPrivate
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Qml
+        Qt::QmlPrivate
+        Qt::Quick
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(resources_resource_files
+    "icons/testtheme/16x16/actions/appointment-new.png"
+    "icons/testtheme/22x22/actions/+testselector/appointment-new.png"
+    "icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png"
+    "icons/testtheme/22x22/actions/appointment-new.png"
+    "icons/testtheme/22x22/actions/appointment-new@2x.png"
+    "icons/testtheme/22x22/actions/color-test-original.png"
+    "icons/testtheme/22x22/actions/color-test-original@2x.png"
+    "icons/testtheme/22x22/actions/color-test-tinted.png"
+    "icons/testtheme/22x22/actions/color-test-tinted@2x.png"
+    "icons/testtheme/22x22@2/actions/+testselector/appointment-new.png"
+    "icons/testtheme/22x22@2/actions/appointment-new.png"
+    "icons/testtheme/appointment-new.svg"
+    "icons/testtheme/index.theme"
+)
+
+qt_internal_add_resource(tst_qquickiconimage "resources"
+    PREFIX
+        "/"
+    FILES
+        ${resources_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg
+    LIBRARIES
+        Qt::Svg
+)
+
+qt_internal_extend_target(tst_qquickiconimage CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/alignment.qml b/tests/auto/quickcontrols/qquickiconimage/data/alignment.qml
index e6861520b9..e6861520b9 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/alignment.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/alignment.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/color.qml b/tests/auto/quickcontrols/qquickiconimage/data/color.qml
index b44b43885c..b44b43885c 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/color.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/color.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/fileSelectors.qml b/tests/auto/quickcontrols/qquickiconimage/data/fileSelectors.qml
index e6861520b9..e6861520b9 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/fileSelectors.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/fileSelectors.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/imageProvider.qml b/tests/auto/quickcontrols/qquickiconimage/data/imageProvider.qml
index 9b18a99e35..9b18a99e35 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/imageProvider.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/imageProvider.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingNoSizes.qml b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingNoSizes.qml
index d457d205d5..d457d205d5 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingNoSizes.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingNoSizes.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSize.qml b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingSourceSize.qml
index e6861520b9..e6861520b9 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSize.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingSourceSize.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
index 5e7ebefca4..5e7ebefca4 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/root.qml b/tests/auto/quickcontrols/qquickiconimage/data/root.qml
index ed02d2df7a..ed02d2df7a 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/root.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/root.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingNoSizes.qml b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingNoSizes.qml
index 34fc6b339c..34fc6b339c 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingNoSizes.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingNoSizes.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSize.qml b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceSize.qml
index 9f1b629074..9f1b629074 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSize.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceSize.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
index 4dc3ac7588..4dc3ac7588 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceTooLarge.qml b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceTooLarge.qml
index a54d998aa5..a54d998aa5 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceTooLarge.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceTooLarge.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/svgNoSizes.qml b/tests/auto/quickcontrols/qquickiconimage/data/svgNoSizes.qml
index e29c23c5b2..e29c23c5b2 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/svgNoSizes.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/svgNoSizes.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/svgSourceBindingSourceSize.qml b/tests/auto/quickcontrols/qquickiconimage/data/svgSourceBindingSourceSize.qml
index 4674e8f14b..4674e8f14b 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/svgSourceBindingSourceSize.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/svgSourceBindingSourceSize.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/translucentColors.qml b/tests/auto/quickcontrols/qquickiconimage/data/translucentColors.qml
index 61ad329d55..61ad329d55 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/translucentColors.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/translucentColors.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png
index 4356af9516..4356af9516 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png
index d3134a55d4..d3134a55d4 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png
index 250b94b019..250b94b019 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png
index 04cd010a68..04cd010a68 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png
index a63bbaf4c5..a63bbaf4c5 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png
index c17d166402..c17d166402 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png
index d4411658f9..d4411658f9 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png
index 6f7938e365..6f7938e365 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png
index 9215fc423b..9215fc423b 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png
index 250b94b019..250b94b019 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png
index a63bbaf4c5..a63bbaf4c5 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/appointment-new.svg b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/appointment-new.svg
index 4cb14f82f0..4cb14f82f0 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/appointment-new.svg
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/appointment-new.svg
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/index.theme b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/index.theme
index 6ab6c15c42..6ab6c15c42 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/index.theme
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/index.theme
diff --git a/tests/auto/quickcontrols2/qquickiconimage/tst_qquickiconimage.cpp b/tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage.cpp
index 83df118de3..83df118de3 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/tst_qquickiconimage.cpp
+++ b/tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage.cpp
diff --git a/tests/auto/quickcontrols/qquickiconlabel/CMakeLists.txt b/tests/auto/quickcontrols/qquickiconlabel/CMakeLists.txt
new file mode 100644
index 0000000000..dc543c5267
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickiconlabel/CMakeLists.txt
@@ -0,0 +1,59 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickiconlabel.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickiconlabel LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickiconlabel Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickiconlabel
+    SOURCES
+        tst_qquickiconlabel.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::QuickControls2ImplPrivate
+        Qt::QuickPrivate
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Qml
+        Qt::QmlPrivate
+        Qt::Quick
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickiconlabel CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/a.png b/tests/auto/quickcontrols/qquickiconlabel/data/a.png
index fe839a40e4..fe839a40e4 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/a.png
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/a.png
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/colorChanges.qml b/tests/auto/quickcontrols/qquickiconlabel/data/colorChanges.qml
index 35785313db..35785313db 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/colorChanges.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/colorChanges.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/iconSourceContext.qml b/tests/auto/quickcontrols/qquickiconlabel/data/iconSourceContext.qml
index 8cf09666d0..8cf09666d0 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/iconSourceContext.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/iconSourceContext.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/iconlabel.qml b/tests/auto/quickcontrols/qquickiconlabel/data/iconlabel.qml
index e181526cfd..e181526cfd 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/iconlabel.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/iconlabel.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/quickcontrols/qquickiconlabel/data/spacingWithOnlyIcon.qml
index a1d90afbf4..a1d90afbf4 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyIcon.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/spacingWithOnlyIcon.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyText.qml b/tests/auto/quickcontrols/qquickiconlabel/data/spacingWithOnlyText.qml
index 5894434b30..5894434b30 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyText.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/spacingWithOnlyText.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/sub/Actions.qml b/tests/auto/quickcontrols/qquickiconlabel/data/sub/Actions.qml
index 20bd6a5e6b..20bd6a5e6b 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/sub/Actions.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/sub/Actions.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/tst_qquickiconlabel.cpp b/tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel.cpp
index 8d42cf5faf..8d42cf5faf 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/tst_qquickiconlabel.cpp
+++ b/tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel.cpp
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/BLACKLIST b/tests/auto/quickcontrols/qquickimaginestyle/BLACKLIST
index 27e33c71b3..27e33c71b3 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickimaginestyle/BLACKLIST
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/CMakeLists.txt b/tests/auto/quickcontrols/qquickimaginestyle/CMakeLists.txt
index 1985784386..1985784386 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickimaginestyle/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/control-assets/button-background.9.png b/tests/auto/quickcontrols/qquickimaginestyle/control-assets/button-background.9.png
index 18ec9e6f4f..18ec9e6f4f 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/control-assets/button-background.9.png
+++ b/tests/auto/quickcontrols/qquickimaginestyle/control-assets/button-background.9.png
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/data/tst_imagine.qml b/tests/auto/quickcontrols/qquickimaginestyle/data/tst_imagine.qml
index c6bb83f72a..c6bb83f72a 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/data/tst_imagine.qml
+++ b/tests/auto/quickcontrols/qquickimaginestyle/data/tst_imagine.qml
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickimaginestyle/qtquickcontrols2.conf
index cc58a8e374..cc58a8e374 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickimaginestyle/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-1.png b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/button-background-1.png
index 980eec3c92..980eec3c92 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-1.png
+++ b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/button-background-1.png
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-2.png b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/button-background-2.png
index 8e2639d03b..8e2639d03b 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-2.png
+++ b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/button-background-2.png
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/wobble.frag.qsb b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/wobble.frag.qsb
index 248c00b526..248c00b526 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/wobble.frag.qsb
+++ b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/wobble.frag.qsb
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/tst_qquickimaginestyle.cpp b/tests/auto/quickcontrols/qquickimaginestyle/tst_qquickimaginestyle.cpp
index 6cdbbca8e9..6cdbbca8e9 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/tst_qquickimaginestyle.cpp
+++ b/tests/auto/quickcontrols/qquickimaginestyle/tst_qquickimaginestyle.cpp
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyle/CMakeLists.txt b/tests/auto/quickcontrols/qquickmaterialstyle/CMakeLists.txt
index 784da21614..784da21614 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickmaterialstyle/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyle/data/tst_material.qml b/tests/auto/quickcontrols/qquickmaterialstyle/data/tst_material.qml
index 34754420d0..34754420d0 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyle/data/tst_material.qml
+++ b/tests/auto/quickcontrols/qquickmaterialstyle/data/tst_material.qml
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyle/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickmaterialstyle/qtquickcontrols2.conf
index b6c7c87ea1..b6c7c87ea1 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyle/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickmaterialstyle/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyle/tst_qquickmaterialstyle.cpp b/tests/auto/quickcontrols/qquickmaterialstyle/tst_qquickmaterialstyle.cpp
index 3594f4b1b0..3594f4b1b0 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyle/tst_qquickmaterialstyle.cpp
+++ b/tests/auto/quickcontrols/qquickmaterialstyle/tst_qquickmaterialstyle.cpp
diff --git a/tests/auto/quickcontrols/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/quickcontrols/qquickmaterialstyleconf/CMakeLists.txt
new file mode 100644
index 0000000000..864914711b
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/CMakeLists.txt
@@ -0,0 +1,72 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickmaterialstyleconf.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickmaterialstyleconf LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickmaterialstyleconf Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickmaterialstyleconf
+    SOURCES
+        tst_qquickmaterialstyleconf.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qquickmaterialstyleconf_resource_files
+    "qtquickcontrols2.conf"
+    "variant-dense.conf"
+    "variant-normal.conf"
+)
+
+qt_internal_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf"
+    PREFIX
+        "/"
+    FILES
+        ${qquickmaterialstyleconf_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qquickmaterialstyleconf.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/data/applicationwindow.qml b/tests/auto/quickcontrols/qquickmaterialstyleconf/data/applicationwindow.qml
index 40a384c42f..40a384c42f 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/data/applicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickmaterialstyleconf/qtquickcontrols2.conf
index 30cee878be..30cee878be 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp b/tests/auto/quickcontrols/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
index 722f846d90..722f846d90 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-dense.conf b/tests/auto/quickcontrols/qquickmaterialstyleconf/variant-dense.conf
index 6636894ea4..6636894ea4 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-dense.conf
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/variant-dense.conf
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-normal.conf b/tests/auto/quickcontrols/qquickmaterialstyleconf/variant-normal.conf
index 08778e92a4..08778e92a4 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-normal.conf
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/variant-normal.conf
diff --git a/tests/auto/quickcontrols2/qquickmenu/BLACKLIST b/tests/auto/quickcontrols/qquickmenu/BLACKLIST
index fed4c6e561..fed4c6e561 100644
--- a/tests/auto/quickcontrols2/qquickmenu/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickmenu/BLACKLIST
diff --git a/tests/auto/quickcontrols/qquickmenu/CMakeLists.txt b/tests/auto/quickcontrols/qquickmenu/CMakeLists.txt
new file mode 100644
index 0000000000..84499748b1
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickmenu/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickmenu.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickmenu LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickmenu Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickmenu
+    SOURCES
+        tst_qquickmenu.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qquickmenu.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickmenu CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/actionShortcuts.qml b/tests/auto/quickcontrols/qquickmenu/data/actionShortcuts.qml
index 3d839b98d4..3d839b98d4 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/actionShortcuts.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/actionShortcuts.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/actions.qml b/tests/auto/quickcontrols/qquickmenu/data/actions.qml
index 0c4449d888..0c4449d888 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/actions.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/actions.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/addItem.qml b/tests/auto/quickcontrols/qquickmenu/data/addItem.qml
index 5678210e25..5678210e25 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/addItem.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/addItem.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/applicationWindowScrollable.qml b/tests/auto/quickcontrols/qquickmenu/data/applicationWindowScrollable.qml
index eb8140eea5..eb8140eea5 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/applicationWindowScrollable.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/applicationWindowScrollable.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/applicationwindow.qml b/tests/auto/quickcontrols/qquickmenu/data/applicationwindow.qml
index 1b42ee6965..1b42ee6965 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/applicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/customMenuCullItems.qml b/tests/auto/quickcontrols/qquickmenu/data/customMenuCullItems.qml
index 0f56ecdd87..0f56ecdd87 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/customMenuCullItems.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/customMenuCullItems.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/customMenuUseRepeaterAsTheContentItem.qml b/tests/auto/quickcontrols/qquickmenu/data/customMenuUseRepeaterAsTheContentItem.qml
index bfa8f66be5..bfa8f66be5 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/customMenuUseRepeaterAsTheContentItem.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/customMenuUseRepeaterAsTheContentItem.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/delegateFromSeparateComponent.qml b/tests/auto/quickcontrols/qquickmenu/data/delegateFromSeparateComponent.qml
index 44a7d8d54a..44a7d8d54a 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/delegateFromSeparateComponent.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/delegateFromSeparateComponent.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/disableWhenTriggered.qml b/tests/auto/quickcontrols/qquickmenu/data/disableWhenTriggered.qml
index e59026677a..e59026677a 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/disableWhenTriggered.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/disableWhenTriggered.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/disabledMenuItemKeyNavigation.qml b/tests/auto/quickcontrols/qquickmenu/data/disabledMenuItemKeyNavigation.qml
index c9c893bb9c..c9c893bb9c 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/disabledMenuItemKeyNavigation.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/disabledMenuItemKeyNavigation.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml b/tests/auto/quickcontrols/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
index 1db3e351bc..1db3e351bc 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/menuItemWidths.qml b/tests/auto/quickcontrols/qquickmenu/data/menuItemWidths.qml
index ff99abd399..ff99abd399 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/menuItemWidths.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/menuItemWidths.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/menuSeparator.qml b/tests/auto/quickcontrols/qquickmenu/data/menuSeparator.qml
index b13cd534fd..b13cd534fd 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/menuSeparator.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/menuSeparator.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/mnemonics.qml b/tests/auto/quickcontrols/qquickmenu/data/mnemonics.qml
index 8929b00275..8929b00275 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/mnemonics.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/mnemonics.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/order.qml b/tests/auto/quickcontrols/qquickmenu/data/order.qml
index 185c9e45c3..185c9e45c3 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/order.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/order.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/popup.qml b/tests/auto/quickcontrols/qquickmenu/data/popup.qml
index 8201c9e03f..8201c9e03f 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/popup.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/popup.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/pressAndHold.qml b/tests/auto/quickcontrols/qquickmenu/data/pressAndHold.qml
index ac0f394604..ac0f394604 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/pressAndHold.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/pressAndHold.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/removeTakeItem.qml b/tests/auto/quickcontrols/qquickmenu/data/removeTakeItem.qml
index aa321cb3a9..aa321cb3a9 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/removeTakeItem.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/removeTakeItem.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/repeater.qml b/tests/auto/quickcontrols/qquickmenu/data/repeater.qml
index 3c056a1d38..3c056a1d38 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/repeater.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/repeater.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/scrollableWithPadding.qml b/tests/auto/quickcontrols/qquickmenu/data/scrollableWithPadding.qml
index 842cb33bfd..842cb33bfd 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/scrollableWithPadding.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/scrollableWithPadding.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/subMenuDisabled.qml b/tests/auto/quickcontrols/qquickmenu/data/subMenuDisabled.qml
index 4d5db0bd67..4d5db0bd67 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/subMenuDisabled.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/subMenuDisabled.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/subMenus.qml b/tests/auto/quickcontrols/qquickmenu/data/subMenus.qml
index 280fd404e8..280fd404e8 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/subMenus.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/subMenus.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/windowScrollable.qml b/tests/auto/quickcontrols/qquickmenu/data/windowScrollable.qml
index 97a06da63d..97a06da63d 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/windowScrollable.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/windowScrollable.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/tst_qquickmenu.cpp b/tests/auto/quickcontrols/qquickmenu/tst_qquickmenu.cpp
index 6a1d1ab803..6a1d1ab803 100644
--- a/tests/auto/quickcontrols2/qquickmenu/tst_qquickmenu.cpp
+++ b/tests/auto/quickcontrols/qquickmenu/tst_qquickmenu.cpp
diff --git a/tests/auto/quickcontrols2/qquickmenubar/BLACKLIST b/tests/auto/quickcontrols/qquickmenubar/BLACKLIST
index f059750550..f059750550 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickmenubar/BLACKLIST
diff --git a/tests/auto/quickcontrols/qquickmenubar/CMakeLists.txt b/tests/auto/quickcontrols/qquickmenubar/CMakeLists.txt
new file mode 100644
index 0000000000..081084818b
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickmenubar/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickmenubar.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickmenubar LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickmenubar Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickmenubar
+    SOURCES
+        tst_qquickmenubar.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qquickmenubar.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickmenubar CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickmenubar/data/checkHighlightWhenDismissed.qml b/tests/auto/quickcontrols/qquickmenubar/data/checkHighlightWhenDismissed.qml
index 2f8132e2fc..2f8132e2fc 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/data/checkHighlightWhenDismissed.qml
+++ b/tests/auto/quickcontrols/qquickmenubar/data/checkHighlightWhenDismissed.qml
diff --git a/tests/auto/quickcontrols2/qquickmenubar/data/delegateFromSeparateComponent.qml b/tests/auto/quickcontrols/qquickmenubar/data/delegateFromSeparateComponent.qml
index ac03210fa0..ac03210fa0 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/data/delegateFromSeparateComponent.qml
+++ b/tests/auto/quickcontrols/qquickmenubar/data/delegateFromSeparateComponent.qml
diff --git a/tests/auto/quickcontrols2/qquickmenubar/data/empty.qml b/tests/auto/quickcontrols/qquickmenubar/data/empty.qml
index 870c3a0bc4..870c3a0bc4 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/data/empty.qml
+++ b/tests/auto/quickcontrols/qquickmenubar/data/empty.qml
diff --git a/tests/auto/quickcontrols2/qquickmenubar/data/menubar.qml b/tests/auto/quickcontrols/qquickmenubar/data/menubar.qml
index 9edb7606ba..9edb7606ba 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/data/menubar.qml
+++ b/tests/auto/quickcontrols/qquickmenubar/data/menubar.qml
diff --git a/tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp b/tests/auto/quickcontrols/qquickmenubar/tst_qquickmenubar.cpp
index 95006ba77c..95006ba77c 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp
+++ b/tests/auto/quickcontrols/qquickmenubar/tst_qquickmenubar.cpp
diff --git a/tests/auto/quickcontrols/qquickninepatchimage/CMakeLists.txt b/tests/auto/quickcontrols/qquickninepatchimage/CMakeLists.txt
new file mode 100644
index 0000000000..3151a57df0
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickninepatchimage/CMakeLists.txt
@@ -0,0 +1,60 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickninepatchimage.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickninepatchimage LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickninepatchimage Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/*.png)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickninepatchimage
+    SOURCES
+        tst_qquickninepatchimage.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Qml
+        Qt::QmlPrivate
+        Qt::Quick
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/foo.9.png
index bac09a4d1a..bac09a4d1a 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/foo.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@2x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@2x.9.png
index 43e4b47881..43e4b47881 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@2x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@2x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@3x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@3x.9.png
index 4d199c8424..4d199c8424 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@3x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@3x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@4x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@4x.9.png
index 018b8341a2..018b8341a2 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@4x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@4x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all.9.png
index a189942957..a189942957 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@2x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@2x.9.png
index d00d719cc2..d00d719cc2 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@2x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@2x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@3x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@3x.9.png
index 6130fd5020..6130fd5020 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@3x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@3x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@4x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@4x.9.png
index 2c2d1694d4..2c2d1694d4 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@4x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@4x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright.9.png
index 2b3e58cbf1..2b3e58cbf1 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@2x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@2x.9.png
index 70aceb618f..70aceb618f 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@2x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@2x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@3x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@3x.9.png
index 032400ceda..032400ceda 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@3x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@3x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@4x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@4x.9.png
index d5cf85aa10..d5cf85aa10 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@4x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@4x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft.9.png
index 05a2ff703c..05a2ff703c 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@2x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@2x.9.png
index a88f87a5ce..a88f87a5ce 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@2x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@2x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@3x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@3x.9.png
index 16349d2287..16349d2287 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@3x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@3x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@4x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@4x.9.png
index 160fab6164..160fab6164 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@4x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@4x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/ninepatchimage.qml b/tests/auto/quickcontrols/qquickninepatchimage/data/ninepatchimage.qml
index 410a61f9fe..410a61f9fe 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/ninepatchimage.qml
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/ninepatchimage.qml
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/padding.9.png
index 8a65afadec..8a65afadec 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/padding.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@2x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@2x.9.png
index 101fc0cbbe..101fc0cbbe 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@2x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@2x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@3x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@3x.9.png
index e07a93a231..e07a93a231 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@3x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@3x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@4x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@4x.9.png
index a3506444b1..a3506444b1 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@4x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@4x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/tst_qquickninepatchimage.cpp b/tests/auto/quickcontrols/qquickninepatchimage/tst_qquickninepatchimage.cpp
index c1fb1f7264..c1fb1f7264 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/tst_qquickninepatchimage.cpp
+++ b/tests/auto/quickcontrols/qquickninepatchimage/tst_qquickninepatchimage.cpp
diff --git a/tests/auto/quickcontrols2/qquickpopup/BLACKLIST b/tests/auto/quickcontrols/qquickpopup/BLACKLIST
index aa31440328..aa31440328 100644
--- a/tests/auto/quickcontrols2/qquickpopup/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickpopup/BLACKLIST
diff --git a/tests/auto/quickcontrols/qquickpopup/CMakeLists.txt b/tests/auto/quickcontrols/qquickpopup/CMakeLists.txt
new file mode 100644
index 0000000000..2f89595851
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickpopup/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickpopup.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickpopup LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickpopup Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickpopup
+    SOURCES
+        tst_qquickpopup.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qquickpopup.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickpopup CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusAfterExit.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusAfterExit.qml
index 359dc772f2..359dc772f2 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusAfterExit.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusAfterExit.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose1.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose1.qml
index 81893bbcbd..81893bbcbd 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose1.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose1.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose2.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose2.qml
index 6cb1c5ad07..6cb1c5ad07 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose2.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose2.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose3.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose3.qml
index 89165e355e..89165e355e 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose3.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose3.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
index 3a85f7d580..3a85f7d580 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnDelayedEnter.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnDelayedEnter.qml
index 37a595ec25..37a595ec25 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnDelayedEnter.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnDelayedEnter.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-hover.qml b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow-hover.qml
index d4c8b78355..d4c8b78355 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-hover.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow-hover.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-wheel.qml b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow-wheel.qml
index 1668b042e0..1668b042e0 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-wheel.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow-wheel.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow.qml b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow.qml
index 46c4dda18b..46c4dda18b 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/centerInOverlayWithinStackViewItem.qml b/tests/auto/quickcontrols/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
index 1c96bb687c..1c96bb687c 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithNestedPopups.qml b/tests/auto/quickcontrols/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
index 6aeede9aff..6aeede9aff 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml b/tests/auto/quickcontrols/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
index b1d7413e9b..b1d7413e9b 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/countChanged.qml b/tests/auto/quickcontrols/qquickpopup/data/countChanged.qml
index e95be76e56..e95be76e56 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/countChanged.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/countChanged.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/cursor.qml b/tests/auto/quickcontrols/qquickpopup/data/cursor.qml
index 3eefa7570e..3eefa7570e 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/cursor.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/cursor.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/destroyDuringExitTransition.qml b/tests/auto/quickcontrols/qquickpopup/data/destroyDuringExitTransition.qml
index dacffd3199..dacffd3199 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/destroyDuringExitTransition.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/destroyDuringExitTransition.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/dialog.qml b/tests/auto/quickcontrols/qquickpopup/data/dialog.qml
index 112bfaefcd..112bfaefcd 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/dialog.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/dialog.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/dimmerContainmentMask.qml b/tests/auto/quickcontrols/qquickpopup/data/dimmerContainmentMask.qml
index 30a412a1cc..30a412a1cc 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/dimmerContainmentMask.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/dimmerContainmentMask.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/disabledPalette.qml b/tests/auto/quickcontrols/qquickpopup/data/disabledPalette.qml
index 4b54b5b1fd..4b54b5b1fd 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/disabledPalette.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/disabledPalette.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/grabber.qml b/tests/auto/quickcontrols/qquickpopup/data/grabber.qml
index ec76829f4f..ec76829f4f 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/grabber.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/grabber.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/invisibleToolTipOpen.qml b/tests/auto/quickcontrols/qquickpopup/data/invisibleToolTipOpen.qml
index 6607dc6fd5..6607dc6fd5 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/invisibleToolTipOpen.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/invisibleToolTipOpen.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/modelessOnModalOnModeless.qml b/tests/auto/quickcontrols/qquickpopup/data/modelessOnModalOnModeless.qml
index 5da5a5524b..5da5a5524b 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/modelessOnModalOnModeless.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/modelessOnModalOnModeless.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/nested.qml b/tests/auto/quickcontrols/qquickpopup/data/nested.qml
index d88142f661..d88142f661 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/nested.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/nested.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/orientation.qml b/tests/auto/quickcontrols/qquickpopup/data/orientation.qml
index 198f716fc0..198f716fc0 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/orientation.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/orientation.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/relativeZOrder.qml b/tests/auto/quickcontrols/qquickpopup/data/relativeZOrder.qml
index 41ca158969..41ca158969 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/relativeZOrder.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/relativeZOrder.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/releaseAfterExitTransition.qml b/tests/auto/quickcontrols/qquickpopup/data/releaseAfterExitTransition.qml
index f3a1f218c1..f3a1f218c1 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/releaseAfterExitTransition.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/releaseAfterExitTransition.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/shrinkPopupThatWasLargerThanWindowHeight.qml b/tests/auto/quickcontrols/qquickpopup/data/shrinkPopupThatWasLargerThanWindowHeight.qml
index b9b8874622..b9b8874622 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/shrinkPopupThatWasLargerThanWindowHeight.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/shrinkPopupThatWasLargerThanWindowHeight.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/shrinkPopupThatWasLargerThanWindowWidth.qml b/tests/auto/quickcontrols/qquickpopup/data/shrinkPopupThatWasLargerThanWindowWidth.qml
index aa78353eb0..aa78353eb0 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/shrinkPopupThatWasLargerThanWindowWidth.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/shrinkPopupThatWasLargerThanWindowWidth.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/tabFence.qml b/tests/auto/quickcontrols/qquickpopup/data/tabFence.qml
index a96cf1687c..a96cf1687c 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/tabFence.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/tabFence.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/toolTipCrashOnClose.qml b/tests/auto/quickcontrols/qquickpopup/data/toolTipCrashOnClose.qml
index f40fa0939c..f40fa0939c 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/toolTipCrashOnClose.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/toolTipCrashOnClose.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/window-hover.qml b/tests/auto/quickcontrols/qquickpopup/data/window-hover.qml
index fa61e8b706..fa61e8b706 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/window-hover.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/window-hover.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/window-wheel.qml b/tests/auto/quickcontrols/qquickpopup/data/window-wheel.qml
index ae9c2ecdfd..ae9c2ecdfd 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/window-wheel.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/window-wheel.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/window.qml b/tests/auto/quickcontrols/qquickpopup/data/window.qml
index 6ffe5165fe..6ffe5165fe 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/window.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/window.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp b/tests/auto/quickcontrols/qquickpopup/tst_qquickpopup.cpp
index 607603d28f..607603d28f 100644
--- a/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/quickcontrols/qquickpopup/tst_qquickpopup.cpp
diff --git a/tests/auto/quickcontrols/qquickstyle/CMakeLists.txt b/tests/auto/quickcontrols/qquickstyle/CMakeLists.txt
new file mode 100644
index 0000000000..86f0cd278a
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickstyle/CMakeLists.txt
@@ -0,0 +1,71 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickstyle.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickstyle LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickstyle Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickstyle
+    SOURCES
+        tst_qquickstyle.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qmake_custom_resource_files
+    "data/Custom/Label.qml"
+    "data/Custom/qmldir"
+)
+
+qt_internal_add_resource(tst_qquickstyle "qmake_custom"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_custom_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qquickstyle.pro:<TRUE>:
+# OTHER_FILES = "data/CmdLineArgStyle/Control.qml" "data/CmdLineArgStyle/qmldir" "data/EnvVarStyle/Control.qml" "data/EnvVarStyle/qmldir" "data/EnvVarFallbackStyle/Control.qml" "data/EnvVarFallbackStyle/qmldir"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickstyle CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/Control.qml b/tests/auto/quickcontrols/qquickstyle/data/CmdLineArgStyle/Control.qml
index 744dcd8f08..744dcd8f08 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/Control.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/CmdLineArgStyle/Control.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/qmldir b/tests/auto/quickcontrols/qquickstyle/data/CmdLineArgStyle/qmldir
index c2cc85c263..c2cc85c263 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/qmldir
+++ b/tests/auto/quickcontrols/qquickstyle/data/CmdLineArgStyle/qmldir
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/Custom/Label.qml b/tests/auto/quickcontrols/qquickstyle/data/Custom/Label.qml
index 744dcd8f08..744dcd8f08 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/Custom/Label.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/Custom/Label.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/Custom/qmldir b/tests/auto/quickcontrols/qquickstyle/data/Custom/qmldir
index 08de6fa804..08de6fa804 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/Custom/qmldir
+++ b/tests/auto/quickcontrols/qquickstyle/data/Custom/qmldir
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/Control.qml b/tests/auto/quickcontrols/qquickstyle/data/EnvVarFallbackStyle/Control.qml
index 744dcd8f08..744dcd8f08 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/Control.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/EnvVarFallbackStyle/Control.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/qmldir b/tests/auto/quickcontrols/qquickstyle/data/EnvVarFallbackStyle/qmldir
index bebd8e07c6..bebd8e07c6 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/qmldir
+++ b/tests/auto/quickcontrols/qquickstyle/data/EnvVarFallbackStyle/qmldir
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/Control.qml b/tests/auto/quickcontrols/qquickstyle/data/EnvVarStyle/Control.qml
index 744dcd8f08..744dcd8f08 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/Control.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/EnvVarStyle/Control.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/qmldir b/tests/auto/quickcontrols/qquickstyle/data/EnvVarStyle/qmldir
index 42223a1930..42223a1930 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/qmldir
+++ b/tests/auto/quickcontrols/qquickstyle/data/EnvVarStyle/qmldir
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/basic.conf b/tests/auto/quickcontrols/qquickstyle/data/basic.conf
index 17ef59ee02..17ef59ee02 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/basic.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/basic.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/custom.conf b/tests/auto/quickcontrols/qquickstyle/data/custom.conf
index ac79338ce5..ac79338ce5 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/custom.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/custom.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/dependencies.qml b/tests/auto/quickcontrols/qquickstyle/data/dependencies.qml
index 280cfd2962..280cfd2962 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/dependencies.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/dependencies.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/designer/ButtonSpecifics.qml b/tests/auto/quickcontrols/qquickstyle/data/designer/ButtonSpecifics.qml
index 21226ed2a7..21226ed2a7 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/designer/ButtonSpecifics.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/designer/ButtonSpecifics.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/dummy.dSYM/empty b/tests/auto/quickcontrols/qquickstyle/data/dummy.dSYM/empty
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/dummy.dSYM/empty
+++ b/tests/auto/quickcontrols/qquickstyle/data/dummy.dSYM/empty
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/dummyStyles/DummyStyle/Button.qml b/tests/auto/quickcontrols/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
index dcacc01140..dcacc01140 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/fusion.conf b/tests/auto/quickcontrols/qquickstyle/data/fusion.conf
index 1f343e656f..1f343e656f 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/fusion.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/fusion.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/imagine.conf b/tests/auto/quickcontrols/qquickstyle/data/imagine.conf
index 919bbcf09e..919bbcf09e 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/imagine.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/imagine.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/material.conf b/tests/auto/quickcontrols/qquickstyle/data/material.conf
index 27c7931a92..27c7931a92 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/material.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/material.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/universal.conf b/tests/auto/quickcontrols/qquickstyle/data/universal.conf
index a5ac3ca3f0..a5ac3ca3f0 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/universal.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/universal.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle.cpp b/tests/auto/quickcontrols/qquickstyle/tst_qquickstyle.cpp
index e7572164b8..e7572164b8 100644
--- a/tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle.cpp
+++ b/tests/auto/quickcontrols/qquickstyle/tst_qquickstyle.cpp
diff --git a/tests/auto/quickcontrols/qquicktextarea/CMakeLists.txt b/tests/auto/quickcontrols/qquicktextarea/CMakeLists.txt
new file mode 100644
index 0000000000..01518834f1
--- /dev/null
+++ b/tests/auto/quickcontrols/qquicktextarea/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquicktextarea LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquicktextarea Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquicktextarea
+    SOURCES
+        tst_qquicktextarea.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquicktextarea CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquicktextarea CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_default.qml b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_default.qml
index cb51b80545..cb51b80545 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_default.qml
+++ b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_default.qml
diff --git a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_old_default.qml b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_old_default.qml
index 1401be36c1..1401be36c1 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_old_default.qml
+++ b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_old_default.qml
diff --git a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_old_overridden.qml b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_old_overridden.qml
index c0e6fb60a8..c0e6fb60a8 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_old_overridden.qml
+++ b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_old_overridden.qml
diff --git a/tests/auto/quickcontrols2/qquicktextarea/data/twoInAColumn.qml b/tests/auto/quickcontrols/qquicktextarea/data/twoInAColumn.qml
index 944f5598ac..944f5598ac 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/data/twoInAColumn.qml
+++ b/tests/auto/quickcontrols/qquicktextarea/data/twoInAColumn.qml
diff --git a/tests/auto/quickcontrols2/qquicktextarea/tst_qquicktextarea.cpp b/tests/auto/quickcontrols/qquicktextarea/tst_qquicktextarea.cpp
index 1c40b078f7..1c40b078f7 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/tst_qquicktextarea.cpp
+++ b/tests/auto/quickcontrols/qquicktextarea/tst_qquicktextarea.cpp
diff --git a/tests/auto/quickcontrols/qquicktextfield/CMakeLists.txt b/tests/auto/quickcontrols/qquicktextfield/CMakeLists.txt
new file mode 100644
index 0000000000..2377010e0e
--- /dev/null
+++ b/tests/auto/quickcontrols/qquicktextfield/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquicktextfield LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquicktextfield Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquicktextfield
+    SOURCES
+        tst_qquicktextfield.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquicktextfield CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquicktextfield CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_default.qml b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_default.qml
index 2bcaf2abd4..2bcaf2abd4 100644
--- a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_default.qml
+++ b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_default.qml
diff --git a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_old_default.qml b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_old_default.qml
index 0eb774a322..0eb774a322 100644
--- a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_old_default.qml
+++ b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_old_default.qml
diff --git a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_old_overridden.qml b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_old_overridden.qml
index 0e357e032f..0e357e032f 100644
--- a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_old_overridden.qml
+++ b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_old_overridden.qml
diff --git a/tests/auto/quickcontrols2/qquicktextfield/tst_qquicktextfield.cpp b/tests/auto/quickcontrols/qquicktextfield/tst_qquicktextfield.cpp
index 19219bb79e..19219bb79e 100644
--- a/tests/auto/quickcontrols2/qquicktextfield/tst_qquicktextfield.cpp
+++ b/tests/auto/quickcontrols/qquicktextfield/tst_qquicktextfield.cpp
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/BLACKLIST b/tests/auto/quickcontrols/qquicktreeviewdelegate/BLACKLIST
index ed6d7fd2cf..ed6d7fd2cf 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/BLACKLIST
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/BLACKLIST
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/CMakeLists.txt b/tests/auto/quickcontrols/qquicktreeviewdelegate/CMakeLists.txt
index 63f06f0564..63f06f0564 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/data/unmodified.qml b/tests/auto/quickcontrols/qquicktreeviewdelegate/data/unmodified.qml
index c3edb37d1c..c3edb37d1c 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/data/unmodified.qml
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/data/unmodified.qml
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/testmodel.cpp b/tests/auto/quickcontrols/qquicktreeviewdelegate/testmodel.cpp
index 6c6da8452b..6c6da8452b 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/testmodel.cpp
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/testmodel.cpp
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/testmodel.h b/tests/auto/quickcontrols/qquicktreeviewdelegate/testmodel.h
index f886c56d4a..f886c56d4a 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/testmodel.h
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/testmodel.h
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/tst_qquicktreeviewdelegate.cpp b/tests/auto/quickcontrols/qquicktreeviewdelegate/tst_qquicktreeviewdelegate.cpp
index 834729e133..834729e133 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/tst_qquicktreeviewdelegate.cpp
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/tst_qquicktreeviewdelegate.cpp
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/CMakeLists.txt b/tests/auto/quickcontrols/qquickuniversalstyle/CMakeLists.txt
index a7f8ebfd6f..a7f8ebfd6f 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickuniversalstyle/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/data/tst_universal.qml b/tests/auto/quickcontrols/qquickuniversalstyle/data/tst_universal.qml
index 2ce0cadb38..2ce0cadb38 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/data/tst_universal.qml
+++ b/tests/auto/quickcontrols/qquickuniversalstyle/data/tst_universal.qml
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickuniversalstyle/qtquickcontrols2.conf
index 8c6dd807e3..8c6dd807e3 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickuniversalstyle/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle.cpp b/tests/auto/quickcontrols/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
index 1d2d6332f7..1d2d6332f7 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
+++ b/tests/auto/quickcontrols/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
diff --git a/tests/auto/quickcontrols/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/quickcontrols/qquickuniversalstyleconf/CMakeLists.txt
new file mode 100644
index 0000000000..57a946b818
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickuniversalstyleconf/CMakeLists.txt
@@ -0,0 +1,70 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from qquickuniversalstyleconf.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquickuniversalstyleconf LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_qquickuniversalstyleconf Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qquickuniversalstyleconf
+    SOURCES
+        tst_qquickuniversalstyleconf.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qquickuniversalstyleconf_resource_files
+    "qtquickcontrols2.conf"
+)
+
+qt_internal_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf"
+    PREFIX
+        "/"
+    FILES
+        ${qquickuniversalstyleconf_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qquickuniversalstyleconf.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/data/applicationwindow.qml b/tests/auto/quickcontrols/qquickuniversalstyleconf/data/applicationwindow.qml
index acbccdeab0..acbccdeab0 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickuniversalstyleconf/data/applicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickuniversalstyleconf/qtquickcontrols2.conf
index 0ec1325871..0ec1325871 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickuniversalstyleconf/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp b/tests/auto/quickcontrols/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
index b75668fb66..b75668fb66 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
+++ b/tests/auto/quickcontrols/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
diff --git a/tests/auto/quickcontrols2/revisions/CMakeLists.txt b/tests/auto/quickcontrols/revisions/CMakeLists.txt
index 8c51f85d20..8c51f85d20 100644
--- a/tests/auto/quickcontrols2/revisions/CMakeLists.txt
+++ b/tests/auto/quickcontrols/revisions/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/revisions/data/dependencies.qml b/tests/auto/quickcontrols/revisions/data/dependencies.qml
index bb95421995..bb95421995 100644
--- a/tests/auto/quickcontrols2/revisions/data/dependencies.qml
+++ b/tests/auto/quickcontrols/revisions/data/dependencies.qml
diff --git a/tests/auto/quickcontrols2/revisions/tst_revisions.cpp b/tests/auto/quickcontrols/revisions/tst_revisions.cpp
index 51f0f02aae..51f0f02aae 100644
--- a/tests/auto/quickcontrols2/revisions/tst_revisions.cpp
+++ b/tests/auto/quickcontrols/revisions/tst_revisions.cpp
diff --git a/tests/auto/quickcontrols/sanity/CMakeLists.txt b/tests/auto/quickcontrols/sanity/CMakeLists.txt
new file mode 100644
index 0000000000..b279f71919
--- /dev/null
+++ b/tests/auto/quickcontrols/sanity/CMakeLists.txt
@@ -0,0 +1,58 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from sanity.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_sanity LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_sanity Test:
+#####################################################################
+
+qt_internal_add_test(tst_sanity
+    SOURCES
+        tst_sanity.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Qml
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+        Qt::QmlCompilerPrivate
+)
+
+#### Keys ignored in scope 1:.:.:sanity.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/BLACKLIST"
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_sanity CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
+
+qt_internal_extend_target(tst_sanity CONDITION WEBOS
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"/usr/lib/qml/QtQuick/Controls\\\"
+)
diff --git a/tests/auto/quickcontrols2/sanity/data/dependencies.qml b/tests/auto/quickcontrols/sanity/data/dependencies.qml
index 280cfd2962..280cfd2962 100644
--- a/tests/auto/quickcontrols2/sanity/data/dependencies.qml
+++ b/tests/auto/quickcontrols/sanity/data/dependencies.qml
diff --git a/tests/auto/quickcontrols2/sanity/tst_sanity.cpp b/tests/auto/quickcontrols/sanity/tst_sanity.cpp
index 150d38b5aa..150d38b5aa 100644
--- a/tests/auto/quickcontrols2/sanity/tst_sanity.cpp
+++ b/tests/auto/quickcontrols/sanity/tst_sanity.cpp
diff --git a/tests/auto/quickcontrols/snippets/CMakeLists.txt b/tests/auto/quickcontrols/snippets/CMakeLists.txt
new file mode 100644
index 0000000000..adad1e69c5
--- /dev/null
+++ b/tests/auto/quickcontrols/snippets/CMakeLists.txt
@@ -0,0 +1,70 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from snippets.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_snippets LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_snippets Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
+list(APPEND test_data ${test_data_glob})
+
+set(SNIPPETS_PATH \\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols/doc/snippets\\\")
+
+if(WEBOS)
+    # Collect snippets for webOS
+    file(GLOB_RECURSE test_snippets_glob
+        RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols/doc/snippets/*)
+    list(APPEND test_snippets ${test_snippets_glob})
+
+    # Copy snippets to a location which is included in the webOS emulator image
+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/snippets)
+    file(COPY ${test_snippets} DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/data/snippets)
+
+    set(SNIPPETS_PATH \\\"./data/snippets\\\")
+endif()
+
+qt_internal_add_test(tst_snippets
+    SOURCES
+        tst_snippets.cpp
+    DEFINES
+        QQC2_SNIPPETS_PATH=${SNIPPETS_PATH}
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Quick
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qmake_immediate_resource_files
+    "qtquickcontrols2.conf"
+)
+
+qt_internal_add_resource(tst_snippets "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:snippets.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/data/*.qml"
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/quickcontrols2/snippets/data/dependencies.qml b/tests/auto/quickcontrols/snippets/data/dependencies.qml
index 8785d0b08e..8785d0b08e 100644
--- a/tests/auto/quickcontrols2/snippets/data/dependencies.qml
+++ b/tests/auto/quickcontrols/snippets/data/dependencies.qml
diff --git a/tests/auto/quickcontrols2/snippets/qtquickcontrols2.conf b/tests/auto/quickcontrols/snippets/qtquickcontrols2.conf
index bd15777684..bd15777684 100644
--- a/tests/auto/quickcontrols2/snippets/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/snippets/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/snippets/tst_snippets.cpp b/tests/auto/quickcontrols/snippets/tst_snippets.cpp
index b16066a693..b16066a693 100644
--- a/tests/auto/quickcontrols2/snippets/tst_snippets.cpp
+++ b/tests/auto/quickcontrols/snippets/tst_snippets.cpp
diff --git a/tests/auto/quickcontrols/styleimports/CMakeLists.txt b/tests/auto/quickcontrols/styleimports/CMakeLists.txt
new file mode 100644
index 0000000000..d852024e0c
--- /dev/null
+++ b/tests/auto/quickcontrols/styleimports/CMakeLists.txt
@@ -0,0 +1,74 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from styleimports.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_styleimports LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_styleimports Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_styleimports
+    SOURCES
+        tst_styleimports.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2ImplPrivate
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qmake_resourcestyle_resource_files
+    "resources/ResourceStyle/Button.qml"
+    "resources/ResourceStyle/qmldir"
+)
+
+qt_internal_add_resource(tst_styleimports "qmake_resourcestyle"
+    PREFIX
+        "/"
+    BASE
+        "resources"
+    FILES
+        ${qmake_resourcestyle_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:styleimports.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml" "data/qmldir" "data/FileSystemStyle/*.qml" "data/FileSystemStyle/qmldir" "data/PlatformStyle/*.qml" "data/PlatformStyle/+linux/*.qml" "data/PlatformStyle/+macos/*.qml" "data/PlatformStyle/+windows/*.qml" "data/PlatformStyle/qmldir"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_styleimports CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/styleimports/data/+FileSystemStyle/CustomComponent.qml b/tests/auto/quickcontrols/styleimports/data/+FileSystemStyle/CustomComponent.qml
index ee5ffe1151..ee5ffe1151 100644
--- a/tests/auto/quickcontrols2/styleimports/data/+FileSystemStyle/CustomComponent.qml
+++ b/tests/auto/quickcontrols/styleimports/data/+FileSystemStyle/CustomComponent.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/CustomComponent.qml b/tests/auto/quickcontrols/styleimports/data/CustomComponent.qml
index 220630f812..220630f812 100644
--- a/tests/auto/quickcontrols2/styleimports/data/CustomComponent.qml
+++ b/tests/auto/quickcontrols/styleimports/data/CustomComponent.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/applicationWindowWithButton.qml b/tests/auto/quickcontrols/styleimports/data/applicationWindowWithButton.qml
index 512bd0bb08..512bd0bb08 100644
--- a/tests/auto/quickcontrols2/styleimports/data/applicationWindowWithButton.qml
+++ b/tests/auto/quickcontrols/styleimports/data/applicationWindowWithButton.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/customStyleSelector.qml b/tests/auto/quickcontrols/styleimports/data/customStyleSelector.qml
index a3def8b14b..a3def8b14b 100644
--- a/tests/auto/quickcontrols2/styleimports/data/customStyleSelector.qml
+++ b/tests/auto/quickcontrols/styleimports/data/customStyleSelector.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Action.qml b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Action.qml
index fcf336e983..fcf336e983 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Action.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Action.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Button.qml b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Button.qml
index a5078b14c2..a5078b14c2 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Label.qml b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Label.qml
index 3233d3646b..3233d3646b 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Label.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Label.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/qmldir b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/qmldir
index 5deb93b653..5deb93b653 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/qmldir
+++ b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/qmldir
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+linux/Button.qml b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+linux/Button.qml
index 15c04d7721..15c04d7721 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+linux/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+linux/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+macos/Button.qml b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+macos/Button.qml
index 6c07ec028a..6c07ec028a 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+macos/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+macos/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+windows/Button.qml b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+windows/Button.qml
index 6a94679c2b..6a94679c2b 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+windows/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+windows/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/Button.qml b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/Button.qml
index fce35efdf7..fce35efdf7 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/qmldir b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/qmldir
index ce2545171b..ce2545171b 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/qmldir
+++ b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/qmldir
diff --git a/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/Button.qml b/tests/auto/quickcontrols/styleimports/resources/ResourceStyle/Button.qml
index 3a97e9de1f..3a97e9de1f 100644
--- a/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/resources/ResourceStyle/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/qmldir b/tests/auto/quickcontrols/styleimports/resources/ResourceStyle/qmldir
index 4cb1a835bd..4cb1a835bd 100644
--- a/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/qmldir
+++ b/tests/auto/quickcontrols/styleimports/resources/ResourceStyle/qmldir
diff --git a/tests/auto/quickcontrols2/styleimports/tst_styleimports.cpp b/tests/auto/quickcontrols/styleimports/tst_styleimports.cpp
index e2bb80fb4e..e2bb80fb4e 100644
--- a/tests/auto/quickcontrols2/styleimports/tst_styleimports.cpp
+++ b/tests/auto/quickcontrols/styleimports/tst_styleimports.cpp
diff --git a/tests/auto/quickcontrols/styleimportscompiletimematerial/CMakeLists.txt b/tests/auto/quickcontrols/styleimportscompiletimematerial/CMakeLists.txt
new file mode 100644
index 0000000000..6ad1aa865e
--- /dev/null
+++ b/tests/auto/quickcontrols/styleimportscompiletimematerial/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from styleimportscompiletimematerial.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_styleimportscompiletimematerial LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_styleimportscompiletimematerial Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_styleimportscompiletimematerial
+    SOURCES
+        tst_styleimportscompiletimematerial.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:styleimportscompiletimematerial.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_styleimportscompiletimematerial CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_styleimportscompiletimematerial CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml b/tests/auto/quickcontrols/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml
index 2c8a8dadfd..2c8a8dadfd 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml
+++ b/tests/auto/quickcontrols/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp b/tests/auto/quickcontrols/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp
index dc582ea6c2..dc582ea6c2 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp
+++ b/tests/auto/quickcontrols/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp
diff --git a/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/CMakeLists.txt b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/CMakeLists.txt
new file mode 100644
index 0000000000..fb9ba22659
--- /dev/null
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from styleimportscompiletimeqmlonly.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_styleimportscompiletimeqmlonly LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_styleimportscompiletimeqmlonly Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_styleimportscompiletimeqmlonly
+    SOURCES
+        tst_styleimportscompiletimeqmlonly.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:styleimportscompiletimeqmlonly.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml" "data/QmlOnly/*.qml" "data/QmlOnly/qmldir"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_styleimportscompiletimeqmlonly CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_styleimportscompiletimeqmlonly CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml
index 16b83c93d3..16b83c93d3 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir
index 5e60f09534..5e60f09534 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml
index 4d0492232c..4d0492232c 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/dummy_imports.qml b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/dummy_imports.qml
index aa37fd14b0..aa37fd14b0 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/dummy_imports.qml
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp
index ec5d51f846..ec5d51f846 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp
diff --git a/tests/auto/quickcontrols/translation/CMakeLists.txt b/tests/auto/quickcontrols/translation/CMakeLists.txt
new file mode 100644
index 0000000000..c1c47e139d
--- /dev/null
+++ b/tests/auto/quickcontrols/translation/CMakeLists.txt
@@ -0,0 +1,71 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from translation.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_translation LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_translation Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_translation
+    SOURCES
+        tst_translation.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qmake_immediate_resource_files
+    "qml_jp.qm"
+    "qtbase_fr.qm"
+)
+
+qt_internal_add_resource(tst_translation "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:translation.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_translation CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_translation CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/quickcontrols2/translation/data/comboBox.qml b/tests/auto/quickcontrols/translation/data/comboBox.qml
index e6a58787ae..e6a58787ae 100644
--- a/tests/auto/quickcontrols2/translation/data/comboBox.qml
+++ b/tests/auto/quickcontrols/translation/data/comboBox.qml
diff --git a/tests/auto/quickcontrols2/translation/data/dialogButtonBox.qml b/tests/auto/quickcontrols/translation/data/dialogButtonBox.qml
index ababa65019..ababa65019 100644
--- a/tests/auto/quickcontrols2/translation/data/dialogButtonBox.qml
+++ b/tests/auto/quickcontrols/translation/data/dialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/translation/data/dialogButtonBoxWithCustomButtons.qml b/tests/auto/quickcontrols/translation/data/dialogButtonBoxWithCustomButtons.qml
index 6e8dca8ad5..6e8dca8ad5 100644
--- a/tests/auto/quickcontrols2/translation/data/dialogButtonBoxWithCustomButtons.qml
+++ b/tests/auto/quickcontrols/translation/data/dialogButtonBoxWithCustomButtons.qml
diff --git a/tests/auto/quickcontrols2/translation/data/stackView.qml b/tests/auto/quickcontrols/translation/data/stackView.qml
index 44d85c2ea1..44d85c2ea1 100644
--- a/tests/auto/quickcontrols2/translation/data/stackView.qml
+++ b/tests/auto/quickcontrols/translation/data/stackView.qml
diff --git a/tests/auto/quickcontrols2/translation/qml_jp.qm b/tests/auto/quickcontrols/translation/qml_jp.qm
index a3712e9964..a3712e9964 100644
--- a/tests/auto/quickcontrols2/translation/qml_jp.qm
+++ b/tests/auto/quickcontrols/translation/qml_jp.qm
diff --git a/tests/auto/quickcontrols2/translation/qml_jp.ts b/tests/auto/quickcontrols/translation/qml_jp.ts
index 303c142fd8..303c142fd8 100644
--- a/tests/auto/quickcontrols2/translation/qml_jp.ts
+++ b/tests/auto/quickcontrols/translation/qml_jp.ts
diff --git a/tests/auto/quickcontrols2/translation/qtbase_fr.qm b/tests/auto/quickcontrols/translation/qtbase_fr.qm
index 176675a820..176675a820 100644
--- a/tests/auto/quickcontrols2/translation/qtbase_fr.qm
+++ b/tests/auto/quickcontrols/translation/qtbase_fr.qm
diff --git a/tests/auto/quickcontrols2/translation/qtbase_fr.ts b/tests/auto/quickcontrols/translation/qtbase_fr.ts
index 7aff8bd760..7aff8bd760 100644
--- a/tests/auto/quickcontrols2/translation/qtbase_fr.ts
+++ b/tests/auto/quickcontrols/translation/qtbase_fr.ts
diff --git a/tests/auto/quickcontrols2/translation/tst_translation.cpp b/tests/auto/quickcontrols/translation/tst_translation.cpp
index f0798d0367..f0798d0367 100644
--- a/tests/auto/quickcontrols2/translation/tst_translation.cpp
+++ b/tests/auto/quickcontrols/translation/tst_translation.cpp
diff --git a/tests/auto/quickcontrols2/accessibility/CMakeLists.txt b/tests/auto/quickcontrols2/accessibility/CMakeLists.txt
deleted file mode 100644
index 2a47abd632..0000000000
--- a/tests/auto/quickcontrols2/accessibility/CMakeLists.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from accessibility.pro.
-
-if(NOT QT_FEATURE_accessibility)
-    return()
-endif()
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_accessibility LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_accessibility Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_accessibility
-    SOURCES
-        tst_accessibility.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:accessibility.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-# _REQUIREMENTS = "qtConfig(accessibility)"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_accessibility CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/controls/data/tst_splitview.qml b/tests/auto/quickcontrols2/controls/data/tst_splitview.qml
deleted file mode 100644
index 2cdd28457f..0000000000
--- a/tests/auto/quickcontrols2/controls/data/tst_splitview.qml
+++ /dev/null
@@ -1,2584 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-import QtCore
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Window
-import QtTest
-import Qt.test.controls
-
-TestCase {
-    id: testCase
-    width: 400
-    height: 400
-    visible: true
-    when: windowShown
-    name: "SplitView"
-
-    function initTestCase() {
-        // For the serialization tests.
-        Qt.application.name = "qtquickcontrols2-splitview-auto-test"
-        Qt.application.domain = "org.qt-project"
-        Qt.application.organization = "QtProject"
-    }
-
-    function findHandles(splitView) {
-        var handles = []
-        for (var i = 0; i < splitView.children.length; ++i) {
-            var child = splitView.children[i]
-            if (child.objectName.toLowerCase().indexOf("handle") !== -1)
-                handles.push(child)
-        }
-        return handles
-    }
-
-    function compareSizes(control, expectedGeometries, context) {
-        if (context === undefined)
-            context = ""
-        else
-            context = " (" + context + ")"
-
-        compare(control.count, Math.floor(expectedGeometries.length / 2) + 1,
-            "Mismatch in actual vs expected number of split items" + context)
-
-        var handles = findHandles(control)
-        compare(handles.length, Math.floor(expectedGeometries.length / 2),
-            "Mismatch in actual vs expected number of handle items" + context)
-
-        for (var i = 0, splitItemIndex = 0, handleItemIndex = 0; i < expectedGeometries.length; ++i) {
-            var item = null
-            var itemType = ""
-            var typeSpecificIndex = -1
-            if (i % 2 == 0) {
-                item = control.itemAt(splitItemIndex)
-                itemType = "split item"
-                typeSpecificIndex = splitItemIndex
-                ++splitItemIndex
-            } else {
-                item = handles[handleItemIndex]
-                itemType = "handle item"
-                typeSpecificIndex = handleItemIndex
-                ++handleItemIndex
-            }
-
-            verify(item, itemType + " at index " + typeSpecificIndex + " should not be null" + context)
-
-            var expectedGeometry = expectedGeometries[i]
-            if (expectedGeometry.hasOwnProperty("hidden")) {
-                // It's geometry doesn't matter because it's hidden.
-                verify(!item.visible, itemType + " at index " + typeSpecificIndex + " should be hidden" + context)
-                continue
-            }
-
-            // Note that the indices mentioned here account for handles; they do not
-            // match the indices reported by QQuickSplitView's logging categories.
-            compare(item.x, expectedGeometry.x, "Mismatch in actual vs expected x value of "
-                + itemType + " at index " + typeSpecificIndex + context)
-            compare(item.y, expectedGeometry.y, "Mismatch in actual vs expected y value of "
-                + itemType + " at index " + typeSpecificIndex + context)
-            compare(item.width, expectedGeometry.width, "Mismatch in actual vs expected width value of "
-                + itemType + " at index " + typeSpecificIndex + context)
-            compare(item.height, expectedGeometry.height, "Mismatch in actual vs expected height value of "
-                + itemType + " at index " + typeSpecificIndex + context)
-        }
-    }
-
-    property real defaultHorizontalHandleWidth: 10
-    property real defaultVerticalHandleHeight: 10
-
-
-    Component {
-        id: signalSpyComponent
-        SignalSpy {}
-    }
-
-    Component {
-        id: handleComponent
-        Rectangle {
-            objectName: "handle"
-            implicitWidth: defaultHorizontalHandleWidth
-            implicitHeight: defaultVerticalHandleHeight
-            color: "#444"
-
-            Text {
-                objectName: "handleText_" + text
-                text: parent.x + "," + parent.y + " " + parent.width + "x" + parent.height
-                color: "white"
-                anchors.centerIn: parent
-                rotation: 90
-            }
-        }
-    }
-
-    Component {
-        id: defaultSplitView
-
-        SplitView {}
-    }
-
-    Component {
-        id: splitViewComponent
-
-        SplitView {
-            anchors.fill: parent
-            handle: handleComponent
-        }
-    }
-
-    Component {
-        id: rectangleComponent
-
-        Rectangle {}
-    }
-
-    function test_defaults() {
-        failOnWarning(/.?/)
-
-        let control = createTemporaryObject(defaultSplitView, testCase)
-        verify(control)
-    }
-
-    function test_addItemsAfterCompletion() {
-        var control = createTemporaryObject(splitViewComponent, testCase)
-        verify(control)
-
-        var item0 = rectangleComponent.createObject(control, { implicitWidth: 25, color: "salmon" })
-        verify(item0)
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        // The last item fills the width by default, and since there is only one item...
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, testCase.width)
-        compare(item0.height, testCase.height)
-
-        var item1 = rectangleComponent.createObject(control, { implicitWidth: 25, color: "steelblue" })
-        verify(item1)
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        // Now that a second item has been added, the first item goes back to its preferred (implicit) width.
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, item0.implicitWidth)
-        compare(item0.height, testCase.height)
-        var handles = findHandles(control)
-        var handle0 = handles[0]
-        compare(handle0.x, item0.implicitWidth)
-        compare(handle0.y, 0)
-        compare(handle0.width, defaultHorizontalHandleWidth)
-        compare(handle0.height, testCase.height)
-        compare(item1.x, item0.implicitWidth + defaultHorizontalHandleWidth)
-        compare(item1.y, 0)
-        compare(item1.width, testCase.width - item0.implicitWidth - defaultHorizontalHandleWidth)
-        compare(item1.height, testCase.height)
-    }
-
-    function test_addItemsWithNoSizeAfterCompletion() {
-        var control = createTemporaryObject(splitViewComponent, testCase)
-        verify(control)
-
-        var item0 = rectangleComponent.createObject(control, { color: "salmon" })
-        verify(item0)
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, testCase.width)
-        compare(item0.height, testCase.height)
-
-        var item1 = rectangleComponent.createObject(control, { color: "steelblue" })
-        verify(item1)
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, 0)
-        compare(item0.height, testCase.height)
-        var handles = findHandles(control)
-        var handle0 = handles[0]
-        compare(handle0.x, 0)
-        compare(handle0.y, 0)
-        compare(handle0.width, defaultHorizontalHandleWidth)
-        compare(handle0.height, testCase.height)
-        compare(item1.x, defaultHorizontalHandleWidth)
-        compare(item1.y, 0)
-        compare(item1.width, testCase.width - defaultHorizontalHandleWidth)
-        compare(item1.height, testCase.height)
-    }
-
-    Component {
-        id: threeZeroSizedItemsComponent
-
-        SplitView {
-            anchors.fill: parent
-            handle: handleComponent
-
-            Rectangle {
-                objectName: "salmon"
-                color: objectName
-            }
-            Rectangle {
-                objectName: "navajowhite"
-                color: objectName
-            }
-            Rectangle {
-                objectName: "steelblue"
-                color: objectName
-            }
-        }
-    }
-
-    function test_changeAttachedPropertiesAfterCompletion() {
-        var control = createTemporaryObject(threeZeroSizedItemsComponent, testCase)
-        verify(control)
-
-        var item0 = control.itemAt(0)
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, 0)
-        compare(item0.height, testCase.height)
-
-        var handles = findHandles(control)
-        var handle0 = handles[0]
-        compare(handle0.x, 0)
-        compare(handle0.y, 0)
-        compare(handle0.width, defaultHorizontalHandleWidth)
-        compare(handle0.height, testCase.height)
-
-        var item1 = control.itemAt(1)
-        compare(item1.x, defaultHorizontalHandleWidth)
-        compare(item1.y, 0)
-        compare(item1.width, 0)
-        compare(item1.height, testCase.height)
-
-        var handle1 = handles[1]
-        compare(handle1.x, defaultHorizontalHandleWidth)
-        compare(handle1.y, 0)
-        compare(handle1.width, defaultHorizontalHandleWidth)
-        compare(handle1.height, testCase.height)
-
-        var item2 = control.itemAt(2)
-        compare(item2.x, defaultHorizontalHandleWidth * 2)
-        compare(item2.y, 0)
-        compare(item2.width, testCase.width - item2.x)
-        compare(item2.height, testCase.height)
-
-        item0.SplitView.preferredWidth = 25
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, 25)
-        compare(item0.height, testCase.height)
-        compare(handle0.x, item0.width)
-        compare(handle0.y, 0)
-        compare(handle0.width, defaultHorizontalHandleWidth)
-        compare(handle0.height, testCase.height)
-        compare(item1.x, 25 + defaultHorizontalHandleWidth)
-        compare(item1.y, 0)
-        compare(item1.width, 0)
-        compare(item1.height, testCase.height)
-        compare(handle1.x, item1.x + item1.width)
-        compare(handle1.y, 0)
-        compare(handle1.width, defaultHorizontalHandleWidth)
-        compare(handle1.height, testCase.height)
-        compare(item2.x, item1.x + item1.width + defaultHorizontalHandleWidth)
-        compare(item2.y, 0)
-        compare(item2.width, testCase.width - item2.x)
-        compare(item2.height, testCase.height)
-
-        item0.SplitView.minimumWidth = 50
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, 50)
-        compare(item0.height, testCase.height)
-        compare(handle0.x, item0.width)
-        compare(handle0.y, 0)
-        compare(handle0.width, defaultHorizontalHandleWidth)
-        compare(handle0.height, testCase.height)
-        compare(item1.x, 50 + defaultHorizontalHandleWidth)
-        compare(item1.y, 0)
-        compare(item1.width, 0)
-        compare(item1.height, testCase.height)
-        compare(handle1.x, item1.x + item1.width)
-        compare(handle1.y, 0)
-        compare(handle1.width, defaultHorizontalHandleWidth)
-        compare(handle1.height, testCase.height)
-        compare(item2.x, item1.x + item1.width + defaultHorizontalHandleWidth)
-        compare(item2.y, 0)
-        compare(item2.width, testCase.width - item2.x)
-        compare(item2.height, testCase.height)
-
-        item0.SplitView.preferredWidth = 100
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, 100)
-        compare(item0.height, testCase.height)
-        compare(handle0.x, item0.width)
-        compare(handle0.y, 0)
-        compare(handle0.width, defaultHorizontalHandleWidth)
-        compare(handle0.height, testCase.height)
-        compare(item1.x, 100 + defaultHorizontalHandleWidth)
-        compare(item1.y, 0)
-        compare(item1.width, 0)
-        compare(item1.height, testCase.height)
-        compare(handle1.x, item1.x + item1.width)
-        compare(handle1.y, 0)
-        compare(handle1.width, defaultHorizontalHandleWidth)
-        compare(handle1.height, testCase.height)
-        compare(item2.x, item1.x + item1.width + defaultHorizontalHandleWidth)
-        compare(item2.y, 0)
-        compare(item2.width, testCase.width - item2.x)
-        compare(item2.height, testCase.height)
-
-        item0.SplitView.maximumWidth = 75
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, 75)
-        compare(item0.height, testCase.height)
-        compare(handle0.x, item0.width)
-        compare(handle0.y, 0)
-        compare(handle0.width, defaultHorizontalHandleWidth)
-        compare(handle0.height, testCase.height)
-        compare(item1.x, 75 + defaultHorizontalHandleWidth)
-        compare(item1.y, 0)
-        compare(item1.width, 0)
-        compare(item1.height, testCase.height)
-        compare(handle1.x, item1.x + item1.width)
-        compare(handle1.y, 0)
-        compare(handle1.width, defaultHorizontalHandleWidth)
-        compare(handle1.height, testCase.height)
-        compare(item2.x, item1.x + item1.width + defaultHorizontalHandleWidth)
-        compare(item2.y, 0)
-        compare(item2.width, testCase.width - item2.x)
-        compare(item2.height, testCase.height)
-
-        item1.SplitView.fillWidth = true
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, 75)
-        compare(item0.height, testCase.height)
-        compare(handle0.x, item0.width)
-        compare(handle0.y, 0)
-        compare(handle0.width, defaultHorizontalHandleWidth)
-        compare(handle0.height, testCase.height)
-        compare(item1.x, 75 + defaultHorizontalHandleWidth)
-        compare(item1.y, 0)
-        compare(item1.width, testCase.width - 75 - defaultHorizontalHandleWidth * 2)
-        compare(item1.height, testCase.height)
-        compare(handle1.x, item1.x + item1.width)
-        compare(handle1.y, 0)
-        compare(handle1.width, defaultHorizontalHandleWidth)
-        compare(handle1.height, testCase.height)
-        compare(item2.x, testCase.width)
-        compare(item2.y, 0)
-        compare(item2.width, 0)
-        compare(item2.height, testCase.height)
-    }
-
-    Component {
-        id: itemComponent
-        Item {}
-    }
-
-    Component {
-        id: objectComponent
-        QtObject {}
-    }
-
-    function test_useAttachedPropertiesIncorrectly_data() {
-        var properties = [ "fillWidth", "fillHeight", "minimumWidth", "minimumHeight",
-            "preferredWidth", "preferredHeight",  "maximumWidth", "maximumHeight" ]
-
-        var data = []
-
-        for (var i = 0; i < properties.length; ++i) {
-            var property = properties[i]
-            data.push({ tag: "Item," + property, component: itemComponent, property: property,
-                expectedWarning: /.*SplitView: attached properties must be accessed through a direct child of SplitView/ })
-        }
-
-        for (i = 0; i < properties.length; ++i) {
-            property = properties[i]
-            data.push({ tag: "QtObject," + property, component: objectComponent, property: property,
-                expectedWarning: /.*SplitView: attached properties can only be used on Items/ })
-        }
-
-        return data
-    }
-
-    function test_useAttachedPropertiesIncorrectly(data) {
-        // The object (whatever it may be) is not managed by a SplitView.
-        var object = createTemporaryObject(data.component, testCase, { objectName: data.tag })
-        verify(object)
-
-        ignoreWarning(data.expectedWarning)
-        // Should warn, but not crash.
-        object.SplitView[data.property] = 1;
-    }
-
-    function test_sizes_data() {
-        var splitViewWidth = testCase.width
-        var splitViewHeight = testCase.height
-        var data = [
-            {
-                // When the combined size of items is too large, the non-fill items should just exceed
-                // the size of the SplitView, exactly as they would were they in a RowLayout, for example.
-                tag: "fillItemOnLeft",
-                expectedGeometries: [
-                    // We're the fill item, but since the combined implicitWidths
-                    // of the other two items take up all the space, we get none.
-                    { x: 0, y: 0, width: 0, height: splitViewHeight },
-                    // First handle.
-                    { x: 0, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // The second item does not fill, so its width should be unchanged.
-                    { x: defaultHorizontalHandleWidth, y: 0, width: 200, height: splitViewHeight },
-                    // Second handle.
-                    { x: 200 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: splitViewHeight },
-                    // The third item also gets its implicitWidth.
-                    { x: 200 + defaultHorizontalHandleWidth * 2, y: 0, width: 200, height: splitViewHeight }
-                ]
-            },
-            {
-                // Same as above except vertical.
-                tag: "fillItemOnTop",
-                expectedGeometries: [
-                    // We're the fill item, but since the combined implicitHeights
-                    // of the other two items take up all the space, we get none.
-                    { x: 0, y: 0, width: splitViewWidth, height: 0 },
-                    // First handle.
-                    { x: 0, y: 0, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    // The second item does not fill, so its height should be unchanged.
-                    { x: 0, y: defaultVerticalHandleHeight, width: splitViewWidth, height: 200 },
-                    // Second handle.
-                    { x: 0, y: 200 + defaultVerticalHandleHeight, width: splitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    // The third item also gets its implicitHeight.
-                    { x: 0, y: 200 + defaultVerticalHandleHeight * 2, width: splitViewWidth, height: 200 }
-                ]
-            },
-            {
-                tag: "fillItemInMiddle",
-                expectedGeometries: [
-                    // Our size is fixed.
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    // First handle.
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // The second item fills.
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0,
-                        width: splitViewWidth - 25 - 200 - defaultHorizontalHandleWidth * 2, height: splitViewHeight },
-                    // Second handle.
-                    { x: splitViewWidth - 200 - defaultHorizontalHandleWidth, y: 0,
-                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // The third item's size is also fixed.
-                    { x: splitViewWidth - 200, y: 0, width: 200, height: splitViewHeight }
-                ]
-            }
-        ]
-        return data
-    }
-
-    function test_sizes(data) {
-        var component = Qt.createComponent("splitview/" + data.tag + ".qml")
-        compare(component.status, Component.Ready, component.errorString());
-        var control = createTemporaryObject(component, testCase, { "handle": handleComponent })
-        verify(control)
-
-        compareSizes(control, data.expectedGeometries)
-    }
-
-    Component {
-        id: threeSizedItemsComponent
-
-        SplitView {
-            anchors.fill: parent
-            handle: handleComponent
-
-            Rectangle {
-                objectName: "salmon"
-                color: objectName
-                implicitWidth: 25
-                implicitHeight: 25
-            }
-            Rectangle {
-                objectName: "navajowhite"
-                color: objectName
-                implicitWidth: 100
-                implicitHeight: 100
-            }
-            Rectangle {
-                objectName: "steelblue"
-                color: objectName
-                implicitWidth: 200
-                implicitHeight: 200
-            }
-        }
-    }
-
-    function test_resetAttachedProperties_data() {
-        var splitViewWidth = testCase.width
-        var splitViewHeight = testCase.height
-        var data = [
-            {
-                tag: "resetMinimumWidth",
-                orientation: Qt.Horizontal,
-                // Set the minimumWidth to 50. It should be used instead of implicitWidth since it's greater than 25.
-                splitItemIndex: 0,
-                propertyName: "minimumWidth",
-                propertyValue: 50,
-                expectedGeometriesBefore: [
-                    { x: 0, y: 0, width: 50, height: splitViewHeight },
-                    { x: 50, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 50 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 50 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: splitViewHeight },
-                    { x: 50 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: splitViewWidth - 50 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
-                ],
-                // minimumWidth is now undefined, so implicitWidth should be used instead.
-                expectedGeometriesAfter: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: splitViewWidth - 25 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
-                ]
-            },
-            {
-                tag: "resetMinimumHeight",
-                orientation: Qt.Vertical,
-                // Set the minimumHeight to 50. It should be used instead of implicitHeight since it's greater than 25.
-                splitItemIndex: 0,
-                propertyName: "minimumHeight",
-                propertyValue: 50,
-                expectedGeometriesBefore: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 50 },
-                    { x: 0, y: 50, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 50 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
-                        height: splitViewHeight - 50 - 100 - defaultVerticalHandleHeight * 2 }
-                ],
-                // preferredHeight is now undefined, so implicitHeight should be used instead.
-                expectedGeometriesAfter: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
-                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
-                        height: splitViewHeight - 25 - 100 - defaultVerticalHandleHeight * 2 }
-                ]
-            },
-            {
-                tag: "resetPreferredWidth",
-                orientation: Qt.Horizontal,
-                // Set the preferredWidth to 50; it should be used instead of implicitWidth.
-                splitItemIndex: 0,
-                propertyName: "preferredWidth",
-                propertyValue: 50,
-                expectedGeometriesBefore: [
-                    { x: 0, y: 0, width: 50, height: splitViewHeight },
-                    { x: 50, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 50 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 50 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: splitViewHeight },
-                    { x: 50 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: splitViewWidth - 50 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
-                ],
-                // preferredWidth is now undefined, so implicitWidth should be used instead.
-                expectedGeometriesAfter: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: splitViewWidth - 25 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
-                ]
-            },
-            {
-                tag: "resetPreferredHeight",
-                orientation: Qt.Vertical,
-                // Set the preferredHeight to 50; it should be used instead of implicitHeight.
-                splitItemIndex: 0,
-                propertyName: "preferredHeight",
-                propertyValue: 50,
-                expectedGeometriesBefore: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 50 },
-                    { x: 0, y: 50, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 50 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
-                        height: splitViewHeight - 50 - 100 - defaultVerticalHandleHeight * 2 }
-                ],
-                // preferredHeight is now undefined, so implicitHeight should be used instead.
-                expectedGeometriesAfter: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
-                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
-                        height: splitViewHeight - 25 - 100 - defaultVerticalHandleHeight * 2 }
-                ]
-            },
-            {
-                tag: "resetMaximumWidth",
-                orientation: Qt.Horizontal,
-                // Set the maximumWidth to 15. It should be used instead of implicitWidth since it's less than 25.
-                splitItemIndex: 0,
-                propertyName: "maximumWidth",
-                propertyValue: 15,
-                expectedGeometriesBefore: [
-                    { x: 0, y: 0, width: 15, height: splitViewHeight },
-                    { x: 15, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 15 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 15 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: splitViewHeight },
-                    { x: 15 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: splitViewWidth - 15 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
-                ],
-                // maximumWidth is now undefined, so implicitWidth should be used instead.
-                expectedGeometriesAfter: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: splitViewWidth - 25 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
-                ]
-            },
-            {
-                tag: "resetMaximumHeight",
-                orientation: Qt.Vertical,
-                // Set the preferredHeight to 15. It should be used instead of implicitHeight if it's not undefined.
-                splitItemIndex: 0,
-                propertyName: "maximumHeight",
-                propertyValue: 15,
-                expectedGeometriesBefore: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 15 },
-                    { x: 0, y: 15, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 15 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 15 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    { x: 0, y: 15 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
-                        height: splitViewHeight - 15 - 100 - defaultVerticalHandleHeight * 2 }
-                ],
-                // preferredHeight is now undefined, so implicitHeight should be used instead.
-                expectedGeometriesAfter: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
-                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: splitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth,
-                        height: splitViewHeight - 25 - 100 - defaultVerticalHandleHeight * 2 }
-                ]
-            },
-        ]
-        return data;
-    }
-
-    function test_resetAttachedProperties(data) {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
-            { "orientation": data.orientation })
-        verify(control)
-
-        var splitItem = control.itemAt(data.splitItemIndex)
-        splitItem.SplitView[data.propertyName] = data.propertyValue
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometriesBefore, "after setting attached property")
-
-        splitItem.SplitView[data.propertyName] = undefined
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometriesAfter, "after resetting attached property")
-    }
-
-    function test_orientation() {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
-        verify(control)
-
-        var item0 = control.itemAt(0)
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, item0.implicitWidth)
-        compare(item0.height, testCase.height)
-
-        var handles = findHandles(control)
-        var handle0 = handles[0]
-        compare(handle0.x, item0.implicitWidth)
-        compare(handle0.y, 0)
-        compare(handle0.width, defaultHorizontalHandleWidth)
-        compare(handle0.height, testCase.height)
-
-        var item1 = control.itemAt(1)
-        compare(item1.x, item0.width + defaultHorizontalHandleWidth)
-        compare(item1.y, 0)
-        compare(item1.width, item1.implicitWidth)
-        compare(item1.height, testCase.height)
-
-        var handle1 = handles[1]
-        compare(handle1.x, item1.x + item1.width)
-        compare(handle1.y, 0)
-        compare(handle1.width, defaultHorizontalHandleWidth)
-        compare(handle1.height, testCase.height)
-
-        var item2 = control.itemAt(2)
-        compare(item2.x, item0.width + item1.width + defaultHorizontalHandleWidth * 2)
-        compare(item2.y, 0)
-        compare(item2.width, testCase.width - item2.x)
-        compare(item2.height, testCase.height)
-
-        control.orientation = Qt.Vertical
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compare(item0.x, 0)
-        compare(item0.y, 0)
-        compare(item0.width, testCase.width)
-        compare(item0.height, item0.implicitHeight)
-        handles = findHandles(control)
-        handle0 = handles[0]
-        compare(handle0.x, 0)
-        compare(handle0.y, item0.implicitHeight)
-        compare(handle0.width, testCase.width)
-        compare(handle0.height, defaultVerticalHandleHeight)
-        compare(item1.x, 0)
-        compare(item1.y, item0.height + defaultVerticalHandleHeight)
-        compare(item1.width, testCase.width)
-        compare(item1.height, item1.implicitHeight)
-        handle1 = handles[1]
-        compare(handle1.x, 0)
-        compare(handle1.y, item1.y + item1.height)
-        compare(handle1.width, testCase.width)
-        compare(handle1.height, defaultVerticalHandleHeight)
-        compare(item2.x, 0)
-        compare(item2.y, item0.height + item1.height + defaultVerticalHandleHeight * 2)
-        compare(item2.width, testCase.width)
-        compare(item2.height, testCase.height - item2.y)
-    }
-
-    readonly property int splitViewMargins: 50
-
-    Component {
-        id: threeItemsMinSizeAndFillComponent
-
-        SplitView {
-            anchors.fill: parent
-            handle: handleComponent
-
-            Rectangle {
-                objectName: "salmon"
-                color: objectName
-                implicitWidth: 25
-                implicitHeight: 25
-                SplitView.minimumWidth: 25
-                SplitView.minimumHeight: 25
-                SplitView.fillWidth: true
-                SplitView.fillHeight: true
-            }
-            Rectangle {
-                objectName: "navajowhite"
-                color: objectName
-                implicitWidth: 100
-                implicitHeight: 100
-            }
-            Rectangle {
-                objectName: "steelblue"
-                color: objectName
-                implicitWidth: 200
-                implicitHeight: 200
-            }
-        }
-    }
-
-    Component {
-        id: repeaterSplitViewComponent
-
-        SplitView {
-            anchors.fill: parent
-            handle: handleComponent
-
-            property alias repeater: repeater
-
-            Repeater {
-                id: repeater
-                model: 3
-                delegate: Rectangle {
-                    objectName: "rectDelegate" + index
-
-                    SplitView.preferredWidth: 25
-
-                    color: "#aaff0000"
-
-                    Text {
-                        text: parent.x + "," + parent.y + " " + parent.width + "x" + parent.height
-                        color: "white"
-                        rotation: 90
-                        anchors.centerIn: parent
-                    }
-                }
-            }
-        }
-    }
-
-    Component {
-        id: hiddenItemSplitViewComponent
-
-        SplitView {
-            anchors.fill: parent
-            handle: handleComponent
-
-            Rectangle {
-                objectName: "steelblue"
-                color: objectName
-
-                SplitView.minimumWidth: 50
-            }
-            Rectangle {
-                objectName: "tomato"
-                color: objectName
-
-                SplitView.fillWidth: true
-                SplitView.preferredWidth: 200
-            }
-            Rectangle {
-                objectName: "navajowhite"
-                color: objectName
-                visible: false
-
-                SplitView.minimumWidth: visible ? 100 : 0
-            }
-            Rectangle {
-                objectName: "mediumseagreen"
-                color: objectName
-
-                SplitView.minimumWidth: 50
-            }
-        }
-    }
-
-    function test_dragHandle_data() {
-        var splitViewWidth = testCase.width - splitViewMargins * 2
-        var splitViewHeight = testCase.height - splitViewMargins * 2
-        var data = [
-            {
-                tag: "fillThirdItemAndDragFirstHandlePastRightSide",
-                component: threeSizedItemsComponent,
-                orientation: Qt.Horizontal,
-                // The index of the item that will fill.
-                fillIndex: 2,
-                // The index of the handle to be dragged.
-                handleIndex: 0,
-                // The position where the center of the handle will be.
-                newHandlePos: Qt.point(testCase.width + 20, testCase.height / 2),
-                // The expected geometry of each item managed by the SplitView before dragging the handle.
-                expectedGeometriesBeforeDrag: [
-                    // First item.
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    // First handle.
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // Second item.
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    // Second handle.
-                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // Third item (fills).
-                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: splitViewWidth - 25 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
-                ],
-                // The expected geometry of each item managed by the SplitView after dragging the handle.
-                expectedGeometriesAfterDrag: [
-                    // The fill item is to the right of the handle at index 0, so the handle belongs
-                    // to the left item: us. We should consume all of the fill item's width.
-                    { x: 0, y: 0, width: splitViewWidth - 100 - defaultHorizontalHandleWidth * 2,
-                        height: splitViewHeight },
-                    // First handle.
-                    { x: splitViewWidth - defaultHorizontalHandleWidth * 2 - 100,
-                        y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // The second item does not fill, so its width should be unchanged.
-                    { x: splitViewWidth - 100 - defaultHorizontalHandleWidth,
-                        y: 0, width: 100, height: splitViewHeight },
-                    // Second handle.
-                    { x: splitViewWidth - defaultHorizontalHandleWidth,
-                        y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // The last item does fill, so it should lose all of its width.
-                    { x: splitViewWidth, y: 0, width: 0, height: splitViewHeight }
-                ]
-            },
-            {
-                tag: "fillThirdItemAndDragFirstHandlePastBottomSide",
-                component: threeSizedItemsComponent,
-                orientation: Qt.Vertical,
-                fillIndex: 2,
-                handleIndex: 0,
-                newHandlePos: Qt.point(testCase.width / 2, testCase.height + 20),
-                expectedGeometriesBeforeDrag: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
-                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2,
-                        width: splitViewWidth, height: splitViewHeight - 25 - 100 - defaultVerticalHandleHeight * 2 }
-                ],
-                // The expected geometry of each item managed by the SplitView after dragging the handle.
-                expectedGeometriesAfterDrag: [
-                    // The fill item is to the bottom of the handle at index 0, so the handle belongs
-                    // to the top item: us. We should consume all of the fill item's width.
-                    { x: 0, y: 0, width: splitViewWidth,
-                        height: splitViewHeight - 100 - defaultVerticalHandleHeight * 2 },
-                    // First handle.
-                    { x: 0, y: splitViewHeight - defaultVerticalHandleHeight * 2 - 100,
-                        width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    // The second item does not fill, so its height should be unchanged.
-                    { x: 0, y: splitViewWidth - 100 - defaultVerticalHandleHeight,
-                        width: splitViewWidth, height: 100 },
-                    // Second handle.
-                    { x: 0, y: splitViewHeight - defaultVerticalHandleHeight,
-                        width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    // The last item does fill, so it should lose all of its width.
-                    { x: 0, y: splitViewHeight, width: splitViewWidth, height: 0 }
-                ]
-            },
-            {
-                tag: "fillThirdItemAndDragSecondHandlePastLeftSide",
-                component: threeSizedItemsComponent,
-                orientation: Qt.Horizontal,
-                fillIndex: 2,
-                handleIndex: 1,
-                newHandlePos: Qt.point(-20, testCase.height / 2),
-                expectedGeometriesBeforeDrag: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: splitViewWidth - 25 - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
-                ],
-                expectedGeometriesAfterDrag: [
-                    // The fill item is to the right of the handle at index 1, so the handle belongs
-                    // to the second item; our width should be unchanged.
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    // First handle.
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // The second item is the one being resized, and since we're dragging its handle
-                    // to the left, its width should decrease.
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 0, height: splitViewHeight },
-                    // Second handle.
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: splitViewHeight },
-                    // The last item fills, so it should get the second item's lost width.
-                    { x: 25 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: splitViewWidth - 25 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
-                ]
-            },
-            {
-                tag: "fillThirdItemAndDragSecondHandlePastTopSide",
-                component: threeSizedItemsComponent,
-                orientation: Qt.Vertical,
-                fillIndex: 2,
-                handleIndex: 1,
-                newHandlePos: Qt.point(testCase.width / 2, -20),
-                expectedGeometriesBeforeDrag: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
-                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2,
-                        width: splitViewWidth, height: splitViewHeight - 25 - 100 - defaultVerticalHandleHeight * 2 }
-                ],
-                expectedGeometriesAfterDrag: [
-                    // The fill item is to the bottom of the handle at index 1, so the handle belongs
-                    // to the second item; our height should be unchanged.
-                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
-                    // First handle.
-                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    // The second item is the one being resized, and since we're dragging its handle
-                    // to the top, its height should decrease.
-                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth, height: 0 },
-                    // Second handle.
-                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: splitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    // The last item fills, so it should get the second item's lost height.
-                    { x: 0, y: 25 + defaultVerticalHandleHeight * 2,
-                        width: splitViewWidth, height: splitViewHeight - 25 - defaultVerticalHandleHeight * 2 }
-                ]
-            },
-            {
-                // First item should start off empty and then eventually take up all of 3rd item's space
-                // as the handle is dragged past the right side.
-                tag: "fillFirstItemAndDragSecondHandlePastRightSide",
-                component: threeSizedItemsComponent,
-                orientation: Qt.Horizontal,
-                fillIndex: 0,
-                handleIndex: 1,
-                newHandlePos: Qt.point(testCase.width + 20, testCase.height / 2),
-                expectedGeometriesBeforeDrag: [
-                    { x: 0, y: 0, width: 0, height: splitViewHeight },
-                    { x: 0, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 100 + defaultHorizontalHandleWidth * 2, y: 0, width: 200, height: splitViewHeight }
-                ],
-                expectedGeometriesAfterDrag: [
-                    // The fill item is to the left of the handle at index 1, so the handle belongs
-                    // to the third item. Since we're moving the handle to the right side of the
-                    // SplitView, our width should grow as we consume the width of the third item.
-                    { x: 0, y: 0, width: splitViewWidth - 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight },
-                    // First handle.
-                    { x: splitViewWidth - 100 - defaultHorizontalHandleWidth * 2, y: 0,
-                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // The second item's width remains unchanged.
-                    { x: splitViewWidth - 100 - defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    // Second handle.
-                    { x: splitViewWidth - defaultHorizontalHandleWidth, y: 0,
-                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // The last item loses its width.
-                    { x: splitViewWidth, y: 0, width: 0, height: splitViewHeight }
-                ]
-            },
-            {
-                // First item should start off empty and then eventually take up all of 3rd item's space
-                // as the handle is dragged past the bottom side.
-                tag: "fillFirstItemAndDragSecondHandlePastBottomSide",
-                component: threeSizedItemsComponent,
-                orientation: Qt.Vertical,
-                fillIndex: 0,
-                handleIndex: 1,
-                newHandlePos: Qt.point(testCase.width / 2, testCase.height + 20),
-                expectedGeometriesBeforeDrag: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 0 },
-                    { x: 0, y: 0, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 100 + defaultVerticalHandleHeight, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 100 + defaultVerticalHandleHeight * 2, width: splitViewWidth, height: 200 }
-                ],
-                expectedGeometriesAfterDrag: [
-                    // The fill item is to the top of the handle at index 1, so the handle belongs
-                    // to the third item. Since we're moving the handle to the bottom side of the
-                    // SplitView, our height should grow as we consume the height of the third item.
-                    { x: 0, y: 0, width: splitViewWidth, height: splitViewHeight - 100 - defaultVerticalHandleHeight * 2 },
-                    // First handle.
-                    { x: 0, y: splitViewHeight - 100 - defaultVerticalHandleHeight * 2,
-                        width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    // The second item's width remains unchanged.
-                    { x: 0, y: splitViewHeight - 100 - defaultVerticalHandleHeight, width: splitViewWidth, height: 100 },
-                    // Second handle.
-                    { x: 0, y: splitViewHeight - defaultVerticalHandleHeight,
-                        width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    // The last item loses its width.
-                    { x: 0, y: splitViewHeight, width: splitViewHeight, height: 0 }
-                ]
-            },
-            {
-                tag: "fillFirstItemAndDragFirstHandlePastLeftSide",
-                component: threeSizedItemsComponent,
-                orientation: Qt.Horizontal,
-                fillIndex: 0,
-                handleIndex: 0,
-                newHandlePos: Qt.point(-20, testCase.height / 2),
-                expectedGeometriesBeforeDrag: [
-                    { x: 0, y: 0, width: 0, height: splitViewHeight },
-                    { x: 0, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // The second item's implicitWidth is 100, and ours is 200. The available width is 300,
-                    // so both items get their implicit widths.
-                    { x: 100 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 100, height: splitViewHeight }
-                ],
-                // Should be unchanged.
-                expectedGeometriesAfterDrag: [
-                    { x: 0, y: 0, width: 0, height: splitViewHeight },
-                    { x: 0, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 100 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 100, height: splitViewHeight }
-                ]
-            },
-            {
-                tag: "fillFirstItemWithMinWidthAndDragFirstHandlePastLeftSide",
-                component: threeItemsMinSizeAndFillComponent,
-                orientation: Qt.Horizontal,
-                fillIndex: 0,
-                handleIndex: 0,
-                newHandlePos: Qt.point(-20, testCase.height / 2),
-                expectedGeometriesBeforeDrag: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 100, height: splitViewHeight }
-                ],
-                // Should be unchanged.
-                expectedGeometriesAfterDrag: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 100, height: splitViewHeight }
-                ]
-            },
-            {
-                tag: "repeater",
-                component: repeaterSplitViewComponent,
-                orientation: Qt.Horizontal,
-                fillIndex: 2,
-                handleIndex: 1,
-                newHandlePos: Qt.point(200, testCase.height / 2),
-                expectedGeometriesBeforeDrag: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25 * 2 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 * 2 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 70 , height: splitViewHeight }
-                ],
-                expectedGeometriesAfterDrag: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 105, height: splitViewHeight },
-                    { x: 140, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 150, y: 0, width: 150, height: splitViewHeight }
-                ]
-            },
-            {
-                tag: "hiddenItemSplitViewComponent",
-                // [50] | [200 (fill)] | [hidden] | [50]
-                component: hiddenItemSplitViewComponent,
-                orientation: Qt.Horizontal,
-                fillIndex: 1,
-                handleIndex: 1,
-                // Drag to the horizontal centre of the SplitView.
-                newHandlePos: Qt.point(splitViewMargins + 150, testCase.height / 2),
-                expectedGeometriesBeforeDrag: [
-                    { x: 0, y: 0, width: 50, height: splitViewHeight },
-                    { x: 50, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 50 + defaultHorizontalHandleWidth, y: 0, width: 200 - defaultHorizontalHandleWidth * 2, height: splitViewHeight },
-                    { x: 250 - (defaultHorizontalHandleWidth * 2) + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { hidden: true }, // Third item should be hidden.
-                    { hidden: true }, // Handle for third item should be hidden.
-                    { x: 250 - (defaultHorizontalHandleWidth * 2) + defaultHorizontalHandleWidth * 2, y: 0, width: 50, height: splitViewHeight }
-                ],
-                expectedGeometriesAfterDrag: [
-                    { x: 0, y: 0, width: 50, height: splitViewHeight },
-                    { x: 50, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // Width of the fill item should end up smaller.
-                    { x: 50 + defaultHorizontalHandleWidth, y: 0, width: 100 - defaultHorizontalHandleWidth * 2, height: splitViewHeight },
-                    { x: 150 - (defaultHorizontalHandleWidth * 2) + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { hidden: true }, // Third item should be hidden.
-                    { hidden: true }, // Handle for third item should be hidden.
-                    // Width of the last item should grow.
-                    { x: 150 - (defaultHorizontalHandleWidth * 2) + defaultHorizontalHandleWidth * 2, y: 0, width: 150, height: splitViewHeight }
-                ]
-            }
-        ]
-        return data
-    }
-
-    function test_dragHandle(data) {
-        var control = createTemporaryObject(data.component, testCase)
-        verify(control)
-
-        control.orientation = data.orientation
-
-        // Ensure that there is space to drag outside of the SplitView.
-        control.anchors.margins = splitViewMargins
-
-        var fillItem = control.itemAt(data.fillIndex)
-        if (control.orientation === Qt.Horizontal)
-            fillItem.SplitView.fillWidth = true
-        else
-            fillItem.SplitView.fillHeight = true
-
-        // Check the sizes (and visibility) of the items before the drag.
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometriesBeforeDrag, "before drag")
-
-        // Drag the handle.
-        var handles = findHandles(control)
-        var targetHandle = handles[data.handleIndex]
-        verify(targetHandle.visible)
-        mousePress(targetHandle)
-        verify(control.resizing)
-        // newHandlePos is in scene coordinates, so map it to coordinates local to the handle.
-        var localPos = testCase.mapToItem(targetHandle, data.newHandlePos.x, data.newHandlePos.y)
-        mouseMove(targetHandle, localPos.x - targetHandle.width / 2, localPos.y - targetHandle.height / 2)
-        verify(control.resizing)
-        compareSizes(control, data.expectedGeometriesAfterDrag, "after drag move")
-
-        // The geometries should remain unchanged after releasing.
-        mouseRelease(targetHandle, localPos.x - targetHandle.width / 2, localPos.y - targetHandle.height / 2, Qt.LeftButton)
-        verify(!control.resizing)
-        compareSizes(control, data.expectedGeometriesAfterDrag, "after drag release")
-    }
-
-    function test_splitViewGeometryChanges_data() {
-        var defaultSplitViewWidth = testCase.width
-        var defaultSplitViewHeight = testCase.height
-
-        var data = [
-            {
-                tag: "growWidth",
-                orientation: Qt.Horizontal,
-                splitViewWidth: 800,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: 25, height: defaultSplitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: defaultSplitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: defaultSplitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: defaultSplitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: 800 - 25 - 100 - defaultHorizontalHandleWidth * 2, height: defaultSplitViewHeight }
-                ]
-            },
-            {
-                // Same as above except vertical.
-                tag: "growHeight",
-                orientation: Qt.Vertical,
-                splitViewHeight: 800,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: defaultSplitViewWidth, height: 25 },
-                    { x: 0, y: 25, width: defaultSplitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: defaultSplitViewWidth, height: 100 },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: defaultSplitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2, width: defaultSplitViewWidth,
-                        height: 800 - 25 - 100 - defaultVerticalHandleHeight * 2 }
-                ]
-            },
-            {
-                tag: "shrinkWidth",
-                orientation: Qt.Horizontal,
-                splitViewWidth: 200,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: 25, height: defaultSplitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: defaultSplitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: defaultSplitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: defaultSplitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: 200 - 25 - 100 - defaultHorizontalHandleWidth * 2, height: defaultSplitViewHeight }
-                ]
-            },
-            {
-                // Same as above except vertical.
-                tag: "shrinkHeight",
-                orientation: Qt.Vertical,
-                splitViewHeight: 200,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: defaultSplitViewWidth, height: 25 },
-                    { x: 0, y: 25, width: defaultSplitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + defaultVerticalHandleHeight, width: defaultSplitViewWidth, height: 100 },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight, width: defaultSplitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + 100 + defaultVerticalHandleHeight * 2, width: defaultSplitViewWidth,
-                        height: 200 - 25 - 100 - defaultVerticalHandleHeight * 2 }
-                ]
-            },
-        ]
-        return data
-    }
-
-    function test_splitViewGeometryChanges(data) {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
-            { "handle": handleComponent, "anchors.fill": undefined, "orientation": data.orientation })
-        verify(control)
-
-        if (data.hasOwnProperty("splitViewWidth"))
-            control.width = data.splitViewWidth
-        else
-            control.width = testCase.width
-
-        if (data.hasOwnProperty("splitViewHeight"))
-            control.height = data.splitViewHeight
-        else
-            control.height = testCase.height
-
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometries)
-    }
-
-    function test_splitItemImplicitSizeChanges_data() {
-        var defaultSplitViewWidth = testCase.width
-        var defaultSplitViewHeight = testCase.height
-
-        var data = [
-            {
-                tag: "growImplicitWidth",
-                orientation: Qt.Horizontal,
-                splitItemImplicitWidth: 50,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: 50, height: defaultSplitViewHeight },
-                    { x: 50, y: 0, width: defaultHorizontalHandleWidth, height: defaultSplitViewHeight },
-                    { x: 50 + defaultHorizontalHandleWidth, y: 0, width: 100, height: defaultSplitViewHeight },
-                    { x: 50 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth,
-                        height: defaultSplitViewHeight },
-                    { x: 50 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: defaultSplitViewWidth - 50 - 100 - defaultHorizontalHandleWidth * 2, height: defaultSplitViewHeight }
-                ]
-            },
-            {
-                tag: "growImplicitHeight",
-                orientation: Qt.Vertical,
-                splitItemImplicitHeight: 50,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: defaultSplitViewWidth, height: 50 },
-                    { x: 0, y: 50, width: defaultSplitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 50 + defaultVerticalHandleHeight, width: defaultSplitViewWidth, height: 100 },
-                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight, width: defaultSplitViewWidth,
-                        height: defaultVerticalHandleHeight },
-                    { x: 0, y: 50 + 100 + defaultVerticalHandleHeight * 2, width: defaultSplitViewWidth,
-                        height: defaultSplitViewHeight - 50 - 100 - defaultVerticalHandleHeight * 2 }
-                ]
-            }
-        ]
-        return data
-    }
-
-    // Tests that implicitWidth/Height changes in items are noticed by SplitView.
-    function test_splitItemImplicitSizeChanges(data) {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
-            { "handle": handleComponent, "orientation": data.orientation })
-        verify(control)
-
-        var firstItem = control.itemAt(0)
-
-        if (data.hasOwnProperty("splitItemImplicitWidth"))
-            firstItem.implicitWidth = data.splitItemImplicitWidth
-
-        if (data.hasOwnProperty("splitItemImplicitHeight"))
-            firstItem.implicitHeight = data.splitItemImplicitHeight
-
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometries)
-    }
-
-    Component {
-        id: largerHandle
-        Rectangle {
-            objectName: "largerHandle"
-            implicitWidth: 20
-            implicitHeight: 20
-            color: "#444"
-        }
-    }
-
-    Component {
-        id: smallerHandle
-        Rectangle {
-            objectName: "smallerHandle"
-            implicitWidth: 5
-            implicitHeight: 5
-            color: "#444"
-        }
-    }
-
-    function test_handleChanges_data() {
-        var splitViewWidth = testCase.width
-        var splitViewHeight = testCase.height
-
-        var data = [
-            {
-                tag: "growHandleWidth",
-                orientation: Qt.Horizontal,
-                handleComponent: largerHandle,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: 20, height: splitViewHeight },
-                    { x: 25 + 20, y: 0, width: 100, height: splitViewHeight },
-                    { x: 25 + 100 + 20, y: 0, width: 20, height: splitViewHeight },
-                    { x: 25 + 100 + 20 * 2, y: 0, width: splitViewWidth - 25 - 100 - 20 * 2,
-                        height: splitViewHeight }
-                ]
-            },
-            {
-                // Same as above except vertical.
-                tag: "growHandleHeight",
-                orientation: Qt.Vertical,
-                handleComponent: largerHandle,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
-                    { x: 0, y: 25, width: splitViewWidth, height: 20 },
-                    { x: 0, y: 25 + 20, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 25 + 100 + 20, width: splitViewWidth, height: 20 },
-                    { x: 0, y: 25 + 100 + 20 * 2, width: splitViewWidth,
-                        height: splitViewHeight - 25 - 100 - 20 * 2 }
-                ]
-            },
-            {
-                tag: "shrinkHandleWidth",
-                orientation: Qt.Horizontal,
-                handleComponent: smallerHandle,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: 5, height: splitViewHeight },
-                    { x: 25 + 5, y: 0, width: 100, height: splitViewHeight },
-                    { x: 25 + 100 + 5, y: 0, width: 5, height: splitViewHeight },
-                    { x: 25 + 100 + 5 * 2, y: 0, width: splitViewWidth - 25 - 100 - 5 * 2,
-                        height: splitViewHeight }
-                ]
-            },
-            {
-                // Same as above except vertical.
-                tag: "shrinkHandleHeight",
-                orientation: Qt.Vertical,
-                handleComponent: smallerHandle,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
-                    { x: 0, y: 25, width: splitViewWidth, height: 5 },
-                    { x: 0, y: 25 + 5, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 25 + 100 + 5, width: splitViewWidth, height: 5 },
-                    { x: 0, y: 25 + 100 + 5 * 2, width: splitViewWidth,
-                        height: splitViewHeight - 25 - 100 - 5 * 2 }
-                ]
-            }
-        ]
-        return data
-    }
-
-    function test_handleChanges(data) {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
-            { "orientation": data.orientation })
-        verify(control)
-
-        control.handle = data.handleComponent
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometries)
-    }
-
-    function test_insertRemoveItems_data() {
-        var splitViewWidth = testCase.width
-        var splitViewHeight = testCase.height
-
-        var data = [
-            {
-                tag: "insertItemAtHorizontalEnd",
-                orientation: Qt.Horizontal,
-                insertItemAtIndex: 3,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 100, height: splitViewHeight },
-                    { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0,
-                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // This was the fill item originally, but since no fill item is explicitly
-                    // specified, and we added an item to the right of it, it is no longer the fill item
-                    // because it's no longer last.
-                    { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: 200, height: splitViewHeight },
-                    // Handle for newly added item.
-                    { x: 25 + 100 + 200 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // Newly added item.
-                    { x: 25 + 100 + 200 + defaultHorizontalHandleWidth * 3, y: 0,
-                        width: splitViewWidth - 25 - 100 - 200 - defaultHorizontalHandleWidth * 3,
-                        height: splitViewHeight },
-                ]
-            },
-            {
-                tag: "insertItemAtHorizontalBeginning",
-                orientation: Qt.Horizontal,
-                insertItemAtIndex: 0,
-                expectedGeometries: [
-                    // Newly added item.
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25 * 2 + defaultHorizontalHandleWidth, y: 0,
-                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 * 2 + defaultHorizontalHandleWidth * 2, y: 0, width: 100, height: splitViewHeight },
-                    { x: 25 * 2 + 100 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // Fill item doesn't change.
-                    { x: 25 * 2 + 100 + defaultHorizontalHandleWidth * 3, y: 0,
-                        width: splitViewWidth - 25 * 2 - 100 - defaultHorizontalHandleWidth * 3,
-                        height: splitViewHeight },
-                ]
-            },
-            {
-                tag: "removeItemFromHorizontalEnd",
-                orientation: Qt.Horizontal,
-                removeItemAtIndex: 2,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0,
-                        width: splitViewWidth - 25 - defaultHorizontalHandleWidth, height: splitViewHeight },
-                ]
-            },
-            {
-                tag: "removeItemFromHorizontalBeginning",
-                orientation: Qt.Horizontal,
-                removeItemAtIndex: 0,
-                expectedGeometries: [
-                    { x: 0, y: 0, width: 100, height: splitViewHeight },
-                    { x: 100, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 100 + defaultHorizontalHandleWidth, y: 0,
-                        width: splitViewWidth - 100 - defaultHorizontalHandleWidth, height: splitViewHeight },
-                ]
-            }
-        ]
-        return data
-    }
-
-    Component {
-        id: smallRectComponent
-
-        Rectangle {
-            objectName: "darkseagreen"
-            color: objectName
-            implicitWidth: 25
-            implicitHeight: 25
-        }
-    }
-
-    function test_insertRemoveItems(data) {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
-            { "orientation": data.orientation })
-        verify(control)
-
-        if (data.hasOwnProperty("removeItemAtIndex")) {
-            var itemToRemove = control.itemAt(data.removeItemAtIndex)
-            verify(itemToRemove)
-
-            control.removeItem(itemToRemove)
-        } else if (data.hasOwnProperty("insertItemAtIndex")) {
-            var itemToAdd = smallRectComponent.createObject(control)
-            control.insertItem(data.insertItemAtIndex, itemToAdd)
-        }
-
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometries)
-    }
-
-    function test_removeAllItems() {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
-        verify(control)
-
-        while (control.count > 0)
-            var itemToRemove = control.removeItem(control.itemAt(0))
-        // Shouldn't crash.
-    }
-
-    function test_hideItems_data() {
-        var splitViewWidth = testCase.width
-        var splitViewHeight = testCase.height
-
-        var data = [
-            {
-                tag: "hideItemAtHorizontalEnd",
-                orientation: Qt.Horizontal,
-                hideIndices: [2],
-                expectedGeometries: [
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0,
-                        width: splitViewWidth - 25 - defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { hidden: true }, // Handle for second item should be hidden.
-                    { hidden: true } // Last item should be hidden.
-                ]
-            },
-            {
-                tag: "hideItemAtHorizontalBeginning",
-                orientation: Qt.Horizontal,
-                hideIndices: [0],
-                expectedGeometries: [
-                    { hidden: true }, // First item should be hidden.
-                    { hidden: true }, // Handle for first item should be hidden.
-                    { x: 0, y: 0, width: 100, height: splitViewHeight },
-                    { x: 100, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 100 + defaultHorizontalHandleWidth, y: 0,
-                        width: splitViewWidth - 100 - defaultHorizontalHandleWidth, height: splitViewHeight }
-                ]
-            },
-            {
-                tag: "hideItemAtVerticalEnd",
-                orientation: Qt.Vertical,
-                hideIndices: [2],
-                expectedGeometries: [
-                    { x: 0, y: 0, width: splitViewWidth, height: 25 },
-                    { x: 0, y: 25, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 25 + defaultVerticalHandleHeight,
-                        width: splitViewWidth, height: splitViewHeight - 25 - defaultVerticalHandleHeight },
-                    { hidden: true }, // Handle for second item should be hidden.
-                    { hidden: true } // Last item should be hidden.
-                ]
-            },
-            {
-                tag: "hideItemAtVerticalBeginning",
-                orientation: Qt.Vertical,
-                hideIndices: [0],
-                expectedGeometries: [
-                    { hidden: true }, // First item should be hidden.
-                    { hidden: true }, // Handle for first item should be hidden.
-                    { x: 0, y: 0, width: splitViewWidth, height: 100 },
-                    { x: 0, y: 100, width: splitViewWidth, height: defaultVerticalHandleHeight },
-                    { x: 0, y: 100 + defaultVerticalHandleHeight,
-                        width: splitViewWidth, height: splitViewHeight - 100 - defaultVerticalHandleHeight }
-                ]
-            },
-            {
-                // No handles should be visible when there's only one item.
-                tag: "hideLastTwoHorizontalItems",
-                orientation: Qt.Horizontal,
-                hideIndices: [1, 2],
-                expectedGeometries: [
-                    { x: 0, y: 0, width: splitViewWidth, height: splitViewHeight },
-                    { hidden: true }, // Handle for first item should be hidden.
-                    { hidden: true }, // Second item should be hidden.
-                    { hidden: true }, // Handle for second item should be hidden.
-                    { hidden: true } // Third item should be hidden.
-                ]
-            }
-        ]
-        return data
-    }
-
-    function test_hideItems(data) {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
-            { "orientation": data.orientation })
-        verify(control)
-
-        for (var i = 0; i < data.hideIndices.length; ++i) {
-            var itemToHide = control.itemAt(data.hideIndices[i])
-            verify(itemToHide)
-            itemToHide.visible = false
-        }
-
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometries)
-    }
-
-    function test_hideAndShowItems_data() {
-        var splitViewWidth = testCase.width
-        var splitViewHeight = testCase.height
-
-        var data = [
-            {
-                tag: "hideLastTwoHorizontalItems",
-                orientation: Qt.Horizontal,
-                hideIndices: [1, 2],
-                expectedGeometriesAfterHiding: [
-                    { x: 0, y: 0, width: splitViewWidth, height: splitViewHeight },
-                    { hidden: true }, // Handle for first item should be hidden.
-                    { hidden: true }, // Second item should be hidden.
-                    { hidden: true }, // Handle for second item should be hidden.
-                    { hidden: true } // Third item should be hidden.
-                ],
-                showIndices: [1],
-                expectedGeometriesAfterShowing: [
-                    // First item should be visible with its implicit size.
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    // Handle for first item should be visible.
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // Second item should be visible and fill.
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0,
-                        width: splitViewWidth - 25 - defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { hidden: true }, // Handle for second item should be hidden.
-                    { hidden: true } // Third item should be hidden.
-                ]
-            }
-        ]
-        return data
-    }
-
-    function test_hideAndShowItems(data) {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
-            { "orientation": data.orientation })
-        verify(control)
-
-        for (var i = 0; i < data.hideIndices.length; ++i) {
-            var itemToHide = control.itemAt(data.hideIndices[i])
-            verify(itemToHide)
-            itemToHide.visible = false
-        }
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometriesAfterHiding, "after hiding")
-
-        for (i = 0; i < data.showIndices.length; ++i) {
-            var itemToShow = control.itemAt(data.showIndices[i])
-            verify(itemToShow)
-            itemToShow.visible = true
-        }
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometriesAfterShowing, "after showing")
-    }
-
-    function test_moveHiddenItems_data() {
-        var splitViewWidth = testCase.width
-        var splitViewHeight = testCase.height
-
-        var data = [
-            {
-                tag: "hideSecondItemAndMoveItToFirst",
-                orientation: Qt.Horizontal,
-                hideIndices: [1],
-                moveFromIndex: 1,
-                moveToIndex: 0,
-                expectedGeometriesAfterMoving: [
-                    { hidden: true }, // First item (was second) should be hidden.
-                    { hidden: true }, // Handle for first item should be hidden.
-                    // Second item (was first) should get its implicit size.
-                    { x: 0, y: 0, width: 25, height: splitViewHeight },
-                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 25 + defaultHorizontalHandleWidth, y: 0,
-                        width: splitViewWidth - 25 - defaultHorizontalHandleWidth, height: splitViewHeight },
-                ],
-                showIndices: [0],
-                expectedGeometriesAfterShowing: [
-                    // First item (was second) should be visible with its implicit size.
-                    { x: 0, y: 0, width: 100, height: splitViewHeight },
-                    // Handle for first item (was second) should be visible.
-                    { x: 100, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    // Second item (was first) should be visible with its implicit size.
-                    { x: 100 + defaultHorizontalHandleWidth, y: 0,
-                        width: 25, height: splitViewHeight },
-                    { x: 100 + 25 + defaultHorizontalHandleWidth, y: 0,
-                        width: defaultHorizontalHandleWidth, height: splitViewHeight },
-                    { x: 100 + 25 + defaultHorizontalHandleWidth * 2, y: 0,
-                        width: splitViewWidth - 100 - 25 - defaultHorizontalHandleWidth * 2, height: splitViewHeight }
-                ]
-            }
-        ]
-        return data
-    }
-
-    function test_moveHiddenItems(data) {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase,
-            { "orientation": data.orientation })
-        verify(control)
-
-        for (var i = 0; i < data.hideIndices.length; ++i) {
-            var itemToHide = control.itemAt(data.hideIndices[i])
-            verify(itemToHide)
-            itemToHide.visible = false
-        }
-
-        control.moveItem(data.moveFromIndex, data.moveToIndex)
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometriesAfterMoving, "after moving")
-
-        for (i = 0; i < data.showIndices.length; ++i) {
-            var itemToShow = control.itemAt(data.showIndices[i])
-            verify(itemToShow)
-            itemToShow.visible = true
-        }
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compareSizes(control, data.expectedGeometriesAfterShowing, "after showing")
-    }
-
-    Component {
-        id: flickableComponent
-
-        Flickable {
-            anchors.fill: parent
-            anchors.margins: 100
-        }
-    }
-
-    function test_draggingHandleInFlickable() {
-        var flickable = createTemporaryObject(flickableComponent, testCase)
-        verify(flickable)
-
-        var control = threeSizedItemsComponent.createObject(flickable.contentItem)
-        verify(control)
-
-        control.anchors.fill = undefined
-        control.width = 400
-        control.height = control.parent.height - 100
-        flickable.contentWidth = control.width
-        flickable.contentHeight = control.height
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-
-        var contentXSpy = signalSpyComponent.createObject(flickable,
-            { target: flickable, signalName: "contentXChanged" })
-        verify(contentXSpy.valid)
-        var contentYSpy = signalSpyComponent.createObject(flickable,
-            { target: flickable, signalName: "contentYChanged" })
-        verify(contentYSpy.valid)
-
-        // Drag the first handle to the right;
-        // the flickable's contentX and contentY shouldn't change.
-        var firstItem = control.itemAt(0)
-        var firstItemOriginalWidth = firstItem.width
-        var handles = findHandles(control)
-        var firstHandle = handles[0]
-        // Add some vertical movement in there as well.
-        mouseDrag(firstHandle, firstHandle.width / 2, firstHandle.height / 2, 100, 50)
-        compare(contentXSpy.count, 0)
-        compare(contentYSpy.count, 0)
-        verify(firstItem.width > firstItemOriginalWidth)
-
-        // Now do the same except vertically.
-        control.orientation = Qt.Vertical
-        control.width = control.parent.width - 100
-        control.height = 400
-        var firstItemOriginalHeight = firstItem.height
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-
-        // Add some horizontal movement in there as well.
-        mouseDrag(firstHandle, firstHandle.width / 2, firstHandle.height / 2, 50, 100)
-        compare(contentXSpy.count, 0)
-        compare(contentYSpy.count, 0)
-        verify(firstItem.height > firstItemOriginalHeight)
-    }
-
-    Component {
-        id: splitViewHandleContainmentMaskComponent
-
-        MouseArea {
-            property alias mouseArea1: mouseArea1
-            property alias mouseArea2: mouseArea2
-            property alias splitView: splitView
-
-            anchors.fill: parent
-            hoverEnabled: true
-            acceptedButtons: Qt.LeftButton
-
-            Rectangle {
-                anchors.fill: parent
-                color: 'green'
-                opacity: 0.3
-            }
-
-            SplitView {
-                id: splitView
-
-                anchors {
-                    fill: parent
-                    margins: 100
-                }
-
-                handle: Rectangle {
-                    id: handleRoot
-
-                    readonly property bool containsMouse: SplitHandle.hovered
-                    readonly property int defaultSize: 2
-
-                    implicitWidth: splitView.orientation === Qt.Horizontal ? handleRoot.defaultSize : splitView.width
-                    implicitHeight: splitView.orientation === Qt.Vertical ? handleRoot.defaultSize : splitView.height
-
-                    color: 'red'
-                    objectName: "handle"
-
-                    Text {
-                        objectName: "handleText_" + text
-                        text: parent.x + "," + parent.y + " " + parent.width + "x" + parent.height
-                        color: "black"
-                        anchors.centerIn: parent
-                        rotation: 90
-                    }
-
-                    containmentMask: Item {
-                        readonly property real extraOverflow: 20
-
-                        x: splitView.orientation === Qt.Horizontal ? -extraOverflow : 0
-                        y: splitView.orientation === Qt.Horizontal ? 0 : -extraOverflow
-                        width: splitView.orientation === Qt.Horizontal ? handleRoot.defaultSize + (extraOverflow * 2): handleRoot.width
-                        height: splitView.orientation === Qt.Horizontal ? handleRoot.height : handleRoot.defaultSize + (extraOverflow * 2)
-                    }
-                }
-
-                MouseArea {
-                    id: mouseArea1
-
-                    SplitView.fillHeight: splitView.orientation === Qt.Horizontal
-                    SplitView.fillWidth: splitView.orientation === Qt.Vertical
-                    SplitView.preferredWidth: splitView.orientation === Qt.Horizontal ? parent.width / 2 : undefined
-                    SplitView.preferredHeight: splitView.orientation === Qt.Vertical ? parent.height / 2 : undefined
-                    hoverEnabled: true
-
-                    Rectangle {
-                        anchors.fill: parent
-                        color: 'cyan'
-                        opacity: 0.3
-                    }
-                }
-
-                MouseArea {
-                    id: mouseArea2
-
-                    SplitView.fillHeight: splitView.orientation === Qt.Horizontal
-                    SplitView.fillWidth: splitView.orientation === Qt.Vertical
-                    SplitView.preferredWidth: splitView.orientation === Qt.Horizontal ? parent.width / 2 : undefined
-                    SplitView.preferredHeight: splitView.orientation === Qt.Vertical ? parent.height / 2 : undefined
-                    hoverEnabled: true
-
-                    Rectangle {
-                        anchors.fill: parent
-                        color: 'cyan'
-                        opacity: 0.3
-                    }
-                }
-            }
-        }
-    }
-
-    function test_handleContainmentMask_data() {
-        const data = [
-            {
-                tag: "handleContainmentMaskHorizontalLeftEdgeDragRight",
-                orientation: Qt.Horizontal,
-                press: {
-                    x: (handle) => handle.containmentMask.x,
-                    y: (handle) => handle.height / 2
-                },
-                dx: 25,
-                dy: 0,
-            },
-            {
-                tag: "handleContainmentMaskHorizontalRightEdgeDragLeft",
-                orientation: Qt.Horizontal,
-                press: {
-                    x: (handle) => handle.containmentMask.x,
-                    y: (handle) => handle.height / 2
-                },
-                dx: -50,
-                dy: 0
-            },
-            {
-                tag: "handleContainmentMaskHorizontalTopEdgeDragRight",
-                orientation: Qt.Horizontal,
-                press: {
-                    x: (handle) => handle.containmentMask.x + handle.containmentMask.width - 1,
-                    y: (handle) => handle.height / 2
-                },
-                dx: 25,
-                dy: 0,
-            },
-            {
-                tag: "handleContainmentMaskHorizontalBottomEdgeDragLeft",
-                orientation: Qt.Horizontal,
-                press: {
-                    x: (handle) => handle.containmentMask.x + handle.containmentMask.width - 1,
-                    y: (handle) => handle.containmentMask.y
-                },
-                dx: -50,
-                dy: 0
-            },
-            {
-                tag: "handleContainmentMaskVerticalTopEdgeDragUp",
-                orientation: Qt.Vertical,
-                press: {
-                    x: (handle) => handle.width / 2,
-                    y: (handle) => handle.containmentMask.y
-                },
-                dx: 0,
-                dy: -40,
-            },
-            {
-                tag: "handleContainmentMaskVerticalTopEdgeDragDown",
-                orientation: Qt.Vertical,
-                press: {
-                    x: (handle) => handle.width / 2,
-                    y: (handle) => handle.containmentMask.y
-                },
-                dx: 0,
-                dy: 70
-            },
-            {
-                tag: "handleContainmentMaskVerticalBottomEdgeDragUp",
-                orientation: Qt.Vertical,
-                press: {
-                    x: (handle) => handle.width / 2,
-                    y: (handle) => handle.containmentMask.y + handle.containmentMask.height - 1
-                },
-                dx: 0,
-                dy: -40,
-            },
-            {
-                tag: "handleContainmentMaskVerticalBottomEdgeDragDown",
-                orientation: Qt.Vertical,
-                press: {
-                    x: (handle) => handle.width / 2,
-                    y: (handle) => handle.containmentMask.y + handle.containmentMask.height - 1
-                },
-                dx: 0,
-                dy: 70
-            }
-        ]
-
-        return data
-    }
-
-    function test_handleContainmentMask(data) {
-        const control = createTemporaryObject(splitViewHandleContainmentMaskComponent, testCase)
-        verify(control)
-        const splitView = control.splitView
-        splitView.orientation = data.orientation
-
-        const handle = findHandles(splitView)[0]
-        if (splitView.orientation === Qt.Vertical)
-            handle.height = handle.defaultHeight
-
-        verify(isPolishScheduled(splitView))
-        verify(waitForItemPolished(splitView))
-
-        const firstItem = control.mouseArea1
-        const secondItem = control.mouseArea2
-
-        const backgroundMouseAreaPress = signalSpyComponent.createObject(control,
-            { target: control, signalName: "onPressed" })
-
-        const mouseArea1Press = signalSpyComponent.createObject(firstItem,
-            { target: firstItem, signalName: "onPressed" })
-
-        const mouseArea2Press = signalSpyComponent.createObject(secondItem,
-            { target: secondItem, signalName: "onPressed" })
-
-        verify(backgroundMouseAreaPress.valid)
-        verify(mouseArea1Press.valid)
-        verify(mouseArea2Press.valid)
-
-        const firstItemWidthBeforeDrag = firstItem.width
-        const secondItemWidthBeforeDrag = secondItem.width
-        const firstItemHeightBeforeDrag = firstItem.height
-        const secondItemHeightBeforeDrag = secondItem.height
-
-        const dx = data.dx
-        const dy = data.dy
-        const pressX = data.press.x(handle)
-        const pressY = data.press.y(handle)
-
-        mousePress(handle, pressX, pressY, Qt.LeftButton)
-        mouseMove(handle, pressX + dx, pressY + dy, -1, Qt.LeftButton)
-        mouseRelease(handle, pressX + dx, pressY + dy, Qt.LeftButton)
-
-        compare(firstItem.width, firstItemWidthBeforeDrag + dx)
-        compare(secondItem.width, secondItemWidthBeforeDrag - dx)
-        compare(firstItem.height, firstItemHeightBeforeDrag + dy)
-        compare(secondItem.height, secondItemHeightBeforeDrag - dy)
-
-        compare(backgroundMouseAreaPress.count, 0)
-        compare(mouseArea1Press.count, 0)
-        compare(mouseArea2Press.count, 0)
-    }
-
-    function test_handleContainmentMaskHovered_data() {
-        const data = [
-            {
-                tag: "firstItemHorizontalHover",
-                orientation: Qt.Horizontal,
-                press: {
-                    "x": (item) => item.width / 2,
-                    "y": (item) => item.height / 2
-                },
-                hoverItem: "firstItem",
-                expectedHover: {
-                    "firstItem": true,
-                    "handle": false,
-                    "secondItem": false
-                }
-            },
-            {
-                tag: "handleHorizontalHoverOnTheLeft",
-                orientation: Qt.Horizontal,
-                press: {
-                    "x": (item) => item.containmentMask.x,
-                    "y": (item) => item.height / 2
-                },
-                hoverItem: "handle",
-                expectedHover: {
-                    "firstItem": true,
-                    "handle": true,
-                    "secondItem": false
-                }
-            },
-            {
-                tag: "handleHorizontalHoverOnTheCenter",
-                orientation: Qt.Horizontal,
-                press: {
-                    "x": (item) => item.width / 2,
-                    "y": (item) => item.height / 2
-                },
-                hoverItem: "handle",
-                expectedHover: {
-                    "firstItem": false,
-                    "handle": true,
-                    "secondItem": false
-                }
-            },
-            {
-                tag: "handleHorizontalHoverOnTheRight",
-                orientation: Qt.Horizontal,
-                press: {
-                    "x": (item) => item.containmentMask.x + item.containmentMask.width - 1,
-                    "y": (item) => item.height / 2
-                },
-                hoverItem: "handle",
-                expectedHover: {
-                    "firstItem": false,
-                    "handle": true,
-                    "secondItem": true
-                }
-            },
-            {
-                tag: "secondItemHorizontalHover",
-                orientation: Qt.Horizontal,
-                press: {
-                    "x": (item) => item.width / 2,
-                    "y": (item) => item.height / 2
-                },
-                hoverItem: "secondItem",
-                expectedHover: {
-                    "firstItem": false,
-                    "handle": false,
-                    "secondItem": true
-                }
-            },
-            {
-                tag: "firstItemVerticalHover",
-                orientation: Qt.Vertical,
-                press: {
-                    "x": (item) => item.width / 2,
-                    "y": (item) => item.height / 2
-                },
-                hoverItem: "firstItem",
-                expectedHover: {
-                    "firstItem": true,
-                    "handle": false,
-                    "secondItem": false
-                }
-            },
-            {
-                tag: "handleVerticalHoverOnTheTop",
-                orientation: Qt.Vertical,
-                press: {
-                    "x": (item) => item.width / 2,
-                    "y": (item) => item.containmentMask.y
-                },
-                hoverItem: "handle",
-                expectedHover: {
-                    "firstItem": true,
-                    "handle": true,
-                    "secondItem": false
-                }
-            },
-            {
-                tag: "handleVerticalHoverOnTheCenter",
-                orientation: Qt.Vertical,
-                press: {
-                    "x": (item) => item.width / 2,
-                    "y": (item) => item.height / 2
-                },
-                hoverItem: "handle",
-                expectedHover: {
-                    "firstItem": false,
-                    "handle": true,
-                    "secondItem": false
-                }
-            },
-            {
-                tag: "handleVerticalHoverOnTheBottom",
-                orientation: Qt.Vertical,
-                press: {
-                    "x": (item) => item.width / 2,
-                    "y": (item) => item.containmentMask.y + item.containmentMask.height - 1
-                },
-                hoverItem: "handle",
-                expectedHover: {
-                    "firstItem": false,
-                    "handle": true,
-                    "secondItem": true
-                }
-            },
-            {
-                tag: "secondItemVerticalHover",
-                orientation: Qt.Vertical,
-                press: {
-                    "x": (item) => item.width / 2,
-                    "y": (item) => item.height / 2
-                },
-                hoverItem: "secondItem",
-                expectedHover: {
-                    "firstItem": false,
-                    "handle": false,
-                    "secondItem": true
-                }
-            }
-        ]
-
-        return data
-    }
-
-    function test_handleContainmentMaskHovered(data) {
-        if ((Qt.platform.pluginName === "offscreen") || (Qt.platform.pluginName === "minimal"))
-            skip("Mouse hovering not functional on offscreen/minimal platforms")
-
-        const control = createTemporaryObject(splitViewHandleContainmentMaskComponent, testCase)
-        verify(control)
-        const splitView = control.splitView
-        splitView.orientation = data.orientation
-
-        const handle = findHandles(splitView)[0]
-        if (splitView.orientation === Qt.Vertical)
-            handle.height = handle.defaultHeight
-
-        verify(isPolishScheduled(splitView))
-        verify(waitForItemPolished(splitView))
-
-        const firstItem = control.mouseArea1
-        const secondItem = control.mouseArea2
-
-        verify(!firstItem.containsMouse)
-        verify(!secondItem.containsMouse)
-        verify(!handle.containsMouse)
-
-        const actualItem = {
-            "firstItem": firstItem,
-            "secondItem": secondItem,
-            "handle": handle
-        }[data.hoverItem]
-
-        const pressX = data.press.x(actualItem)
-        const pressY = data.press.y(actualItem)
-
-        // Test fails if we don't do two moves for some reason...
-        mouseMove(actualItem, pressX, pressY)
-        mouseMove(actualItem, pressX, pressY)
-
-        compare(firstItem.containsMouse, data.expectedHover.firstItem)
-        compare(secondItem.containsMouse, data.expectedHover.secondItem)
-        compare(handle.containsMouse, data.expectedHover.handle)
-
-        // Hide SplitView, then all children shouldn't be hovered
-        control.visible = false
-
-        verify(isPolishScheduled(splitView))
-        verify(waitForItemPolished(splitView))
-
-        verify(!control.containsMouse)
-        verify(!firstItem.containsMouse)
-        verify(!secondItem.containsMouse)
-        verify(!handle.containsMouse)
-    }
-
-    function test_hoveredPressed() {
-        if ((Qt.platform.pluginName === "offscreen") || (Qt.platform.pluginName === "minimal"))
-            skip("Mouse hovering not functional on offscreen/minimal platforms")
-
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
-        verify(control)
-        control.anchors.margins = 50
-
-        var handles = findHandles(control)
-        var firstHandle = handles[0]
-
-        var handleCenter = control.mapFromItem(firstHandle, firstHandle.width / 2, firstHandle.height / 2)
-        // Test fails if we don't do two moves for some reason...
-        mouseMove(control, handleCenter.x, handleCenter.y)
-        mouseMove(control, handleCenter.x, handleCenter.y)
-        verify(firstHandle.SplitHandle.hovered)
-        verify(!firstHandle.SplitHandle.pressed)
-
-        mousePress(control, handleCenter.x, handleCenter.y)
-        verify(firstHandle.SplitHandle.hovered)
-        verify(firstHandle.SplitHandle.pressed)
-
-        mouseRelease(control, handleCenter.x, handleCenter.y)
-        verify(firstHandle.SplitHandle.hovered)
-        verify(!firstHandle.SplitHandle.pressed)
-
-        mouseMove(control, 0, 0)
-        verify(!firstHandle.SplitHandle.hovered)
-        verify(!firstHandle.SplitHandle.pressed)
-    }
-
-    // Tests removing/adding/moving an item while it's pressed.
-    function test_modifyWhileHoveredPressed() {
-        if ((Qt.platform.pluginName === "offscreen") || (Qt.platform.pluginName === "minimal"))
-            skip("Mouse hovering not functional on offscreen/minimal platforms")
-
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
-        verify(control)
-        control.anchors.margins = 50
-
-        var handles = findHandles(control)
-        var firstHandle = handles[0]
-
-        // First, ensure that the handle is hovered + pressed.
-        var handleCenter = control.mapFromItem(firstHandle, firstHandle.width / 2, firstHandle.height / 2)
-        // Test fails if we don't do two moves for some reason...
-        mouseMove(control, handleCenter.x, handleCenter.y)
-        mouseMove(control, handleCenter.x, handleCenter.y)
-        verify(firstHandle.SplitHandle.hovered)
-        verify(!firstHandle.SplitHandle.pressed)
-
-        mousePress(control, handleCenter.x, handleCenter.y)
-        verify(firstHandle.SplitHandle.hovered)
-        verify(firstHandle.SplitHandle.pressed)
-
-        // Then, remove it by removing the first item.
-        control.removeItem(control.itemAt(0))
-        handles = findHandles(control)
-        firstHandle = null
-        compare(handles.length, 1)
-
-        // No handles should be hovered/pressed.
-        for (var i = 0; i < handles.length; ++i) {
-            var handle = handles[i]
-            verify(!handle.SplitHandle.hovered, "handle at index " + i + " should not be hovered")
-            verify(!handle.SplitHandle.pressed, "handle at index " + i + " should not be hovered")
-        }
-
-        mouseRelease(control, handleCenter.x, handleCenter.y)
-    }
-
-    Component {
-        id: settingsComponent
-        Settings {
-            id: settings
-        }
-    }
-
-    function test_saveAndRestoreState_data() {
-        return [
-            { tag: "Horizontal", orientation: Qt.Horizontal, propertyName: "preferredWidth", propertyValue: 123 },
-            { tag: "Vertical", orientation: Qt.Vertical, propertyName: "preferredHeight", propertyValue: 234 }
-        ]
-    }
-
-    function test_saveAndRestoreState(data) {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase, { orientation: data.orientation })
-        verify(control)
-        compare(control.orientation, data.orientation)
-
-        var lastItem = control.itemAt(2)
-        verify(lastItem)
-        lastItem.SplitView[data.propertyName] = data.propertyValue
-
-        // Save the state.
-        var settings = createTemporaryObject(settingsComponent, testCase)
-        verify(settings)
-        settings.setValue("splitView", control.saveState())
-
-        // Recreate the item to restore it to its "default" values.
-        control = createTemporaryObject(threeSizedItemsComponent, testCase)
-        lastItem = control.itemAt(2)
-        verify(lastItem)
-        compare(lastItem.SplitView[data.propertyName], -1)
-
-        settings = createTemporaryObject(settingsComponent, testCase)
-        verify(settings)
-
-        // Restore the state.
-        control.restoreState(settings.value("splitView"))
-        compare(lastItem.SplitView[data.propertyName], data.propertyValue)
-    }
-
-    function test_changePreferredSizeDuringLayout() {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
-        verify(control)
-
-        var firstItem = control.itemAt(0)
-        var secondItem = control.itemAt(1)
-        secondItem.widthChanged.connect(function() {
-            if (secondItem.width < 10)
-                firstItem.SplitView.preferredWidth = 50
-        })
-
-        // Change the size of the item so that a layout happens, but
-        // make the size small enough that the item's onWidthChanged handler gets triggered.
-        // The onWidthChanged handler will set the preferredWidth of another item during the
-        // layout, so we need to make sure the assignment isn't lost since we return early in that case.
-        secondItem.implicitWidth = 5
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compare(secondItem.width, 5)
-        compare(firstItem.width, 50)
-
-        // Now do the same for height.
-        control.orientation = Qt.Vertical
-        secondItem.heightChanged.connect(function() {
-            if (secondItem.height < 10)
-                firstItem.SplitView.preferredHeight = 50
-        })
-        // Get the polishes for the orientation out of the way so that they
-        // don't intefere with our results.
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-
-        secondItem.implicitHeight = 5
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-        compare(secondItem.height, 5)
-        compare(firstItem.height, 50)
-    }
-
-    // When the user drags a handle, we internally set preferredWidth/Height
-    // to reflect the new value. However, we also have to make sure that when
-    // we do so, it doesn't trigger a delayed layout. This is why we have
-    // m_ignoreNextDelayedLayoutRequest. This test checks that
-    // m_ignoreNextDelayedLayoutRequest doesn't interfere with any action from
-    // the user that results in a delayed layout.
-    function test_changePreferredSizeDuringLayoutWhileDraggingHandle() {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
-        verify(control)
-
-        var firstItem = control.itemAt(0)
-        var secondItem = control.itemAt(1)
-        firstItem.widthChanged.connect(function() {
-            if (firstItem.width === 0)
-                secondItem.SplitView.preferredWidth = 50
-        })
-
-        // Start dragging the handle.
-        var handles = findHandles(control)
-        var targetHandle = handles[0]
-        mousePress(targetHandle)
-        verify(control.resizing)
-        var localPos = testCase.mapToItem(targetHandle, 15, testCase.height / 2)
-
-        // Move the handle to the very left, so that the item's width becomes zero.
-        mouseMove(targetHandle, -100, targetHandle.height / 2)
-        verify(control.resizing)
-        compare(firstItem.width, 0)
-        compare(secondItem.SplitView.preferredWidth, 50)
-        compare(secondItem.width, 50)
-        mouseRelease(targetHandle, -100, targetHandle.height / 2, Qt.LeftButton)
-        verify(!control.resizing)
-    }
-
-    Component {
-        id: oneItemComponent
-
-        SplitView {
-            Item {}
-        }
-    }
-
-    // QTBUG-79270
-    function test_hideSplitViewWithOneItem() {
-        var control = createTemporaryObject(oneItemComponent, testCase)
-        verify(control)
-        // Shouldn't be an assertion failure.
-        control.visible = false
-    }
-
-    // QTBUG-79302: ensure that the Repeater's items are actually generated.
-    // test_dragHandle:repeater tests dragging behavior with a Repeater.
-    function test_repeater(data) {
-        var control = createTemporaryObject(repeaterSplitViewComponent, testCase)
-        verify(control)
-        compare(control.repeater.count, 3)
-        compare(control.contentChildren.length, 3)
-    }
-
-    Component {
-        id: hoverableChildrenSplitViewComponent
-
-        SplitView {
-            handle: handleComponent
-            anchors.fill: parent
-
-            MouseArea {
-                objectName: "mouseArea1"
-                hoverEnabled: true
-
-                SplitView.preferredWidth: 200
-            }
-            MouseArea {
-                objectName: "mouseArea2"
-                hoverEnabled: true
-            }
-        }
-    }
-
-    function test_hoverableChilden() {
-        if (Qt.platform.pluginName === "offscreen" || Qt.platform.pluginName === "minimal")
-            skip("Mouse hovering not functional on offscreen/minimal platforms")
-
-        var control = createTemporaryObject(hoverableChildrenSplitViewComponent, testCase)
-        verify(control)
-
-        verify(isPolishScheduled(control))
-        verify(waitForItemPolished(control))
-
-        // Move the mouse over the handle.
-        var handles = findHandles(control)
-        var targetHandle = handles[0]
-        // Test fails if we don't do two moves for some reason... QTBUG-94968
-        mouseMove(targetHandle, targetHandle.width / 2, targetHandle.height / 2)
-        mouseMove(targetHandle, targetHandle.width / 2, targetHandle.height / 2)
-        verify(targetHandle.SplitHandle.hovered)
-
-        // Move the mouse to the MouseArea on the left. The handle should no longer be hovered.
-        mouseMove(control, 100, control.height / 2)
-        verify(!targetHandle.SplitHandle.hovered)
-
-        // Move the mouse back over the handle.
-        mouseMove(targetHandle, targetHandle.width / 2, targetHandle.height / 2)
-        mouseMove(targetHandle, targetHandle.width / 2, targetHandle.height / 2)
-        verify(targetHandle.SplitHandle.hovered)
-
-        // Move the mouse to the MouseArea on the right. The handle should no longer be hovered.
-        mouseMove(control, control.width - 100, control.height / 2)
-        verify(!targetHandle.SplitHandle.hovered)
-    }
-
-    Component {
-        id: cppHandleSplitViewComponent
-
-        SplitView {
-            anchors.fill: parent
-            handle: ComponentCreator.createComponent(`
-                import QtQuick
-
-                Rectangle {
-                    objectName: "handle"
-                    implicitWidth: 10
-                    implicitHeight: 10
-                    color: "tomato"
-                }`)
-
-            Rectangle {
-                objectName: "navajowhite"
-                color: objectName
-                implicitWidth: 100
-                implicitHeight: 100
-            }
-            Rectangle {
-                objectName: "steelblue"
-                color: objectName
-                implicitWidth: 200
-                implicitHeight: 200
-            }
-        }
-    }
-
-    function test_handleComponentCreatedInCpp() {
-        let control = createTemporaryObject(cppHandleSplitViewComponent, testCase)
-        verify(control)
-
-        let handles = findHandles(control)
-        compare(handles.length, 1)
-        compare(handles[0].color, Qt.color("tomato"))
-    }
-}
diff --git a/tests/auto/quickcontrols2/cursor/CMakeLists.txt b/tests/auto/quickcontrols2/cursor/CMakeLists.txt
deleted file mode 100644
index 84af3e6cdb..0000000000
--- a/tests/auto/quickcontrols2/cursor/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from cursor.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_cursor LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_cursor Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_cursor
-    SOURCES
-        tst_cursor.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:cursor.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_cursor CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/customization/CMakeLists.txt b/tests/auto/quickcontrols2/customization/CMakeLists.txt
deleted file mode 100644
index cd7359f305..0000000000
--- a/tests/auto/quickcontrols2/customization/CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from customization.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_customization LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_customization Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_customization
-    SOURCES
-        tst_customization.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_customization CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_customization CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/focus/CMakeLists.txt b/tests/auto/quickcontrols2/focus/CMakeLists.txt
deleted file mode 100644
index 351bfce2c7..0000000000
--- a/tests/auto/quickcontrols2/focus/CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from focus.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_focus LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_focus Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_focus
-    SOURCES
-        tst_focus.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_focus CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_focus CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/font/CMakeLists.txt b/tests/auto/quickcontrols2/font/CMakeLists.txt
deleted file mode 100644
index a9e691287f..0000000000
--- a/tests/auto/quickcontrols2/font/CMakeLists.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from font.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_font LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_font Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_font
-    SOURCES
-        tst_font.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:font.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_font CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_font CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/palette/CMakeLists.txt b/tests/auto/quickcontrols2/palette/CMakeLists.txt
deleted file mode 100644
index 0c98cc28a6..0000000000
--- a/tests/auto/quickcontrols2/palette/CMakeLists.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from palette.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_palette LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_palette Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_palette
-    SOURCES
-        tst_palette.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(qmake_immediate_resource_files
-    "qtquickcontrols2.conf"
-)
-
-qt_internal_add_resource(tst_palette "qmake_immediate"
-    PREFIX
-        "/"
-    FILES
-        ${qmake_immediate_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:palette.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_palette CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_palette CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt b/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt
deleted file mode 100644
index 0d506eb67c..0000000000
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickapplicationwindow.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickapplicationwindow LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickapplicationwindow Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickapplicationwindow
-    SOURCES
-        tst_qquickapplicationwindow.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:qquickapplicationwindow.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt b/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt
deleted file mode 100644
index a6726cb858..0000000000
--- a/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickcontrol.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickcontrol LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickcontrol Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickcontrol
-    SOURCES
-        tst_qquickcontrol.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:qquickcontrol.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickcontrol CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickcontrol CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt b/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt
deleted file mode 100644
index b4690489e6..0000000000
--- a/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickdrawer.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickdrawer LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickdrawer Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickdrawer
-    SOURCES
-        tst_qquickdrawer.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:qquickdrawer.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickdrawer CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt b/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt
deleted file mode 100644
index 404f49e0f8..0000000000
--- a/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickheaderview.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickheaderview LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickheaderview Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickheaderview
-    SOURCES
-        tst_qquickheaderview.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:qquickheaderview.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickheaderview CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickheaderview CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt b/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt
deleted file mode 100644
index 0570cc9b39..0000000000
--- a/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickiconimage.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickiconimage LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickiconimage Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
-list(APPEND test_data ${test_data_glob})
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickiconimage
-    SOURCES
-        tst_qquickiconimage.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::QuickControls2ImplPrivate
-        Qt::QuickPrivate
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::Qml
-        Qt::QmlPrivate
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(resources_resource_files
-    "icons/testtheme/16x16/actions/appointment-new.png"
-    "icons/testtheme/22x22/actions/+testselector/appointment-new.png"
-    "icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png"
-    "icons/testtheme/22x22/actions/appointment-new.png"
-    "icons/testtheme/22x22/actions/appointment-new@2x.png"
-    "icons/testtheme/22x22/actions/color-test-original.png"
-    "icons/testtheme/22x22/actions/color-test-original@2x.png"
-    "icons/testtheme/22x22/actions/color-test-tinted.png"
-    "icons/testtheme/22x22/actions/color-test-tinted@2x.png"
-    "icons/testtheme/22x22@2/actions/+testselector/appointment-new.png"
-    "icons/testtheme/22x22@2/actions/appointment-new.png"
-    "icons/testtheme/appointment-new.svg"
-    "icons/testtheme/index.theme"
-)
-
-qt_internal_add_resource(tst_qquickiconimage "resources"
-    PREFIX
-        "/"
-    FILES
-        ${resources_resource_files}
-)
-
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg
-    LIBRARIES
-        Qt::Svg
-)
-
-qt_internal_extend_target(tst_qquickiconimage CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt b/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt
deleted file mode 100644
index 6f8a72ab3a..0000000000
--- a/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickiconlabel.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickiconlabel LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickiconlabel Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickiconlabel
-    SOURCES
-        tst_qquickiconlabel.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::QuickControls2ImplPrivate
-        Qt::QuickPrivate
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::Qml
-        Qt::QmlPrivate
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickiconlabel CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt
deleted file mode 100644
index 66b999193d..0000000000
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickmaterialstyleconf.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickmaterialstyleconf LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickmaterialstyleconf Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickmaterialstyleconf
-    SOURCES
-        tst_qquickmaterialstyleconf.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(qquickmaterialstyleconf_resource_files
-    "qtquickcontrols2.conf"
-    "variant-dense.conf"
-    "variant-normal.conf"
-)
-
-qt_internal_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf"
-    PREFIX
-        "/"
-    FILES
-        ${qquickmaterialstyleconf_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:qquickmaterialstyleconf.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt b/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt
deleted file mode 100644
index aa5518b31b..0000000000
--- a/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickmenu.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickmenu LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickmenu Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickmenu
-    SOURCES
-        tst_qquickmenu.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:qquickmenu.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickmenu CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt b/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt
deleted file mode 100644
index 34333550b9..0000000000
--- a/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickmenubar.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickmenubar LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickmenubar Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickmenubar
-    SOURCES
-        tst_qquickmenubar.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:qquickmenubar.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickmenubar CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt b/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt
deleted file mode 100644
index 682d947cdc..0000000000
--- a/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickninepatchimage.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickninepatchimage LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickninepatchimage Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
-list(APPEND test_data ${test_data_glob})
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/*.png)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickninepatchimage
-    SOURCES
-        tst_qquickninepatchimage.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::Qml
-        Qt::QmlPrivate
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt b/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt
deleted file mode 100644
index 1eed1db600..0000000000
--- a/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickpopup.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickpopup LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickpopup Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickpopup
-    SOURCES
-        tst_qquickpopup.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:qquickpopup.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickpopup CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt b/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt
deleted file mode 100644
index 92cf7991e2..0000000000
--- a/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickstyle.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickstyle LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickstyle Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickstyle
-    SOURCES
-        tst_qquickstyle.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(qmake_custom_resource_files
-    "data/Custom/Label.qml"
-    "data/Custom/qmldir"
-)
-
-qt_internal_add_resource(tst_qquickstyle "qmake_custom"
-    PREFIX
-        "/"
-    FILES
-        ${qmake_custom_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:qquickstyle.pro:<TRUE>:
-# OTHER_FILES = "data/CmdLineArgStyle/Control.qml" "data/CmdLineArgStyle/qmldir" "data/EnvVarStyle/Control.qml" "data/EnvVarStyle/qmldir" "data/EnvVarFallbackStyle/Control.qml" "data/EnvVarFallbackStyle/qmldir"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickstyle CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquicktextarea/CMakeLists.txt b/tests/auto/quickcontrols2/qquicktextarea/CMakeLists.txt
deleted file mode 100644
index 85c5677f72..0000000000
--- a/tests/auto/quickcontrols2/qquicktextarea/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquicktextarea LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquicktextarea Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquicktextarea
-    SOURCES
-        tst_qquicktextarea.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquicktextarea CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquicktextarea CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquicktextfield/CMakeLists.txt b/tests/auto/quickcontrols2/qquicktextfield/CMakeLists.txt
deleted file mode 100644
index d2576f28aa..0000000000
--- a/tests/auto/quickcontrols2/qquicktextfield/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquicktextfield LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquicktextfield Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquicktextfield
-    SOURCES
-        tst_qquicktextfield.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquicktextfield CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquicktextfield CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt
deleted file mode 100644
index 44a3c5d704..0000000000
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from qquickuniversalstyleconf.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_qquickuniversalstyleconf LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_qquickuniversalstyleconf Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickuniversalstyleconf
-    SOURCES
-        tst_qquickuniversalstyleconf.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(qquickuniversalstyleconf_resource_files
-    "qtquickcontrols2.conf"
-)
-
-qt_internal_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf"
-    PREFIX
-        "/"
-    FILES
-        ${qquickuniversalstyleconf_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:qquickuniversalstyleconf.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/sanity/CMakeLists.txt b/tests/auto/quickcontrols2/sanity/CMakeLists.txt
deleted file mode 100644
index 4cac9d5f30..0000000000
--- a/tests/auto/quickcontrols2/sanity/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from sanity.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_sanity LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_sanity Test:
-#####################################################################
-
-qt_internal_add_test(tst_sanity
-    SOURCES
-        tst_sanity.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::Qml
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-        Qt::QmlCompilerPrivate
-)
-
-#### Keys ignored in scope 1:.:.:sanity.pro:<TRUE>:
-# OTHER_FILES = "$$PWD/BLACKLIST"
-# TEMPLATE = "app"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_sanity CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
-
-qt_internal_extend_target(tst_sanity CONDITION WEBOS
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"/usr/lib/qml/QtQuick/Controls\\\"
-)
diff --git a/tests/auto/quickcontrols2/snippets/CMakeLists.txt b/tests/auto/quickcontrols2/snippets/CMakeLists.txt
deleted file mode 100644
index 95047f8141..0000000000
--- a/tests/auto/quickcontrols2/snippets/CMakeLists.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from snippets.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_snippets LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_snippets Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
-list(APPEND test_data ${test_data_glob})
-
-set(SNIPPETS_PATH \\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2/doc/snippets\\\")
-
-if(WEBOS)
-    # Collect snippets for webOS
-    file(GLOB_RECURSE test_snippets_glob
-        RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2/doc/snippets/*)
-    list(APPEND test_snippets ${test_snippets_glob})
-
-    # Copy snippets to a location which is included in the webOS emulator image
-    file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/snippets)
-    file(COPY ${test_snippets} DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/data/snippets)
-
-    set(SNIPPETS_PATH \\\"./data/snippets\\\")
-endif()
-
-qt_internal_add_test(tst_snippets
-    SOURCES
-        tst_snippets.cpp
-    DEFINES
-        QQC2_SNIPPETS_PATH=${SNIPPETS_PATH}
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(qmake_immediate_resource_files
-    "qtquickcontrols2.conf"
-)
-
-qt_internal_add_resource(tst_snippets "qmake_immediate"
-    PREFIX
-        "/"
-    FILES
-        ${qmake_immediate_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:snippets.pro:<TRUE>:
-# OTHER_FILES = "$$PWD/data/*.qml"
-# TEMPLATE = "app"
-
-## Scopes:
-#####################################################################
diff --git a/tests/auto/quickcontrols2/styleimports/CMakeLists.txt b/tests/auto/quickcontrols2/styleimports/CMakeLists.txt
deleted file mode 100644
index 95bf59e78d..0000000000
--- a/tests/auto/quickcontrols2/styleimports/CMakeLists.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from styleimports.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_styleimports LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_styleimports Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_styleimports
-    SOURCES
-        tst_styleimports.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2ImplPrivate
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(qmake_resourcestyle_resource_files
-    "resources/ResourceStyle/Button.qml"
-    "resources/ResourceStyle/qmldir"
-)
-
-qt_internal_add_resource(tst_styleimports "qmake_resourcestyle"
-    PREFIX
-        "/"
-    BASE
-        "resources"
-    FILES
-        ${qmake_resourcestyle_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:styleimports.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml" "data/qmldir" "data/FileSystemStyle/*.qml" "data/FileSystemStyle/qmldir" "data/PlatformStyle/*.qml" "data/PlatformStyle/+linux/*.qml" "data/PlatformStyle/+macos/*.qml" "data/PlatformStyle/+windows/*.qml" "data/PlatformStyle/qmldir"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_styleimports CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt b/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt
deleted file mode 100644
index e53b4fef92..0000000000
--- a/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from styleimportscompiletimematerial.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_styleimportscompiletimematerial LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_styleimportscompiletimematerial Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_styleimportscompiletimematerial
-    SOURCES
-        tst_styleimportscompiletimematerial.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:styleimportscompiletimematerial.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_styleimportscompiletimematerial CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_styleimportscompiletimematerial CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt
deleted file mode 100644
index 157921d259..0000000000
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from styleimportscompiletimeqmlonly.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_styleimportscompiletimeqmlonly LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_styleimportscompiletimeqmlonly Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_styleimportscompiletimeqmlonly
-    SOURCES
-        tst_styleimportscompiletimeqmlonly.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:styleimportscompiletimeqmlonly.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml" "data/QmlOnly/*.qml" "data/QmlOnly/qmldir"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_styleimportscompiletimeqmlonly CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_styleimportscompiletimeqmlonly CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/translation/CMakeLists.txt b/tests/auto/quickcontrols2/translation/CMakeLists.txt
deleted file mode 100644
index 245ac65087..0000000000
--- a/tests/auto/quickcontrols2/translation/CMakeLists.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from translation.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_translation LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_translation Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_translation
-    SOURCES
-        tst_translation.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(qmake_immediate_resource_files
-    "qml_jp.qm"
-    "qtbase_fr.qm"
-)
-
-qt_internal_add_resource(tst_translation "qmake_immediate"
-    PREFIX
-        "/"
-    FILES
-        ${qmake_immediate_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:translation.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_translation CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_translation CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickdialogs/qquickcolordialogimpl/CMakeLists.txt b/tests/auto/quickdialogs/qquickcolordialogimpl/CMakeLists.txt
index 09a8d46990..8f52753386 100644
--- a/tests/auto/quickdialogs/qquickcolordialogimpl/CMakeLists.txt
+++ b/tests/auto/quickdialogs/qquickcolordialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickcolordialogimpl
     SOURCES
         tst_qquickcolordialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickdialogs/qquickfiledialogimpl/CMakeLists.txt b/tests/auto/quickdialogs/qquickfiledialogimpl/CMakeLists.txt
index 179d58ddde..7c4ef0c350 100644
--- a/tests/auto/quickdialogs/qquickfiledialogimpl/CMakeLists.txt
+++ b/tests/auto/quickdialogs/qquickfiledialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickfiledialogimpl
     SOURCES
         tst_qquickfiledialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickdialogs/qquickfolderdialogimpl/CMakeLists.txt b/tests/auto/quickdialogs/qquickfolderdialogimpl/CMakeLists.txt
index ea43ac7e6b..2ceb13b2c7 100644
--- a/tests/auto/quickdialogs/qquickfolderdialogimpl/CMakeLists.txt
+++ b/tests/auto/quickdialogs/qquickfolderdialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickfolderdialogimpl
     SOURCES
         tst_qquickfolderdialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickdialogs/qquickfontdialogimpl/CMakeLists.txt b/tests/auto/quickdialogs/qquickfontdialogimpl/CMakeLists.txt
index 378496905c..eca77db7db 100644
--- a/tests/auto/quickdialogs/qquickfontdialogimpl/CMakeLists.txt
+++ b/tests/auto/quickdialogs/qquickfontdialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickfontdialogimpl
     SOURCES
         tst_qquickfontdialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickdialogs/qquickmessagedialogimpl/CMakeLists.txt b/tests/auto/quickdialogs/qquickmessagedialogimpl/CMakeLists.txt
index 976ad1fbb6..f1f75500c7 100644
--- a/tests/auto/quickdialogs/qquickmessagedialogimpl/CMakeLists.txt
+++ b/tests/auto/quickdialogs/qquickmessagedialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickmessagedialogimpl
     SOURCES
         tst_qquickmessagedialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt
index faf7222b7e..c3055d1ceb 100644
--- a/tests/benchmarks/CMakeLists.txt
+++ b/tests/benchmarks/CMakeLists.txt
@@ -8,4 +8,4 @@ add_subdirectory(quick)
 if(QT_FEATURE_private_tests)
     add_subdirectory(particles)
 endif()
-add_subdirectory(quickcontrols2)
+add_subdirectory(quickcontrols)
diff --git a/tests/benchmarks/quickcontrols2/CMakeLists.txt b/tests/benchmarks/quickcontrols/CMakeLists.txt
index 3b109b1660..3b109b1660 100644
--- a/tests/benchmarks/quickcontrols2/CMakeLists.txt
+++ b/tests/benchmarks/quickcontrols/CMakeLists.txt
diff --git a/tests/benchmarks/quickcontrols2/benchmarks.pro b/tests/benchmarks/quickcontrols/benchmarks.pro
index 7c4ca2243b..7c4ca2243b 100644
--- a/tests/benchmarks/quickcontrols2/benchmarks.pro
+++ b/tests/benchmarks/quickcontrols/benchmarks.pro
diff --git a/tests/benchmarks/quickcontrols/creationtime/CMakeLists.txt b/tests/benchmarks/quickcontrols/creationtime/CMakeLists.txt
new file mode 100644
index 0000000000..e7cfc7131c
--- /dev/null
+++ b/tests/benchmarks/quickcontrols/creationtime/CMakeLists.txt
@@ -0,0 +1,51 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from creationtime.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_creationtime LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_creationtime Test:
+#####################################################################
+
+qt_internal_add_test(tst_creationtime
+    SOURCES
+        tst_creationtime.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Qml
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+)
+
+#### Keys ignored in scope 1:.:.:creationtime.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_creationtime CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/benchmarks/quickcontrols2/creationtime/creationtime.pro b/tests/benchmarks/quickcontrols/creationtime/creationtime.pro
index 7d15ebd445..7d15ebd445 100644
--- a/tests/benchmarks/quickcontrols2/creationtime/creationtime.pro
+++ b/tests/benchmarks/quickcontrols/creationtime/creationtime.pro
diff --git a/tests/benchmarks/quickcontrols2/creationtime/data/dependencies.qml b/tests/benchmarks/quickcontrols/creationtime/data/dependencies.qml
index 3b8476177f..3b8476177f 100644
--- a/tests/benchmarks/quickcontrols2/creationtime/data/dependencies.qml
+++ b/tests/benchmarks/quickcontrols/creationtime/data/dependencies.qml
diff --git a/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp b/tests/benchmarks/quickcontrols/creationtime/tst_creationtime.cpp
index 82259269d9..82259269d9 100644
--- a/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp
+++ b/tests/benchmarks/quickcontrols/creationtime/tst_creationtime.cpp
diff --git a/tests/benchmarks/quickcontrols/objectcount/CMakeLists.txt b/tests/benchmarks/quickcontrols/objectcount/CMakeLists.txt
new file mode 100644
index 0000000000..3f9fa84e30
--- /dev/null
+++ b/tests/benchmarks/quickcontrols/objectcount/CMakeLists.txt
@@ -0,0 +1,58 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from objectcount.pro.
+
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_objectcount LANGUAGES C CXX ASM)
+    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
+#####################################################################
+## tst_objectcount Test:
+#####################################################################
+
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+
+qt_internal_add_test(tst_objectcount
+    SOURCES
+        tst_objectcount.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::Quick
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickControlsTestUtilsPrivate
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::QuickTest
+        Qt::QuickTestUtilsPrivate
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:objectcount.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_objectcount CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/benchmarks/quickcontrols2/objectcount/data/dependencies.qml b/tests/benchmarks/quickcontrols/objectcount/data/dependencies.qml
index 3b8476177f..3b8476177f 100644
--- a/tests/benchmarks/quickcontrols2/objectcount/data/dependencies.qml
+++ b/tests/benchmarks/quickcontrols/objectcount/data/dependencies.qml
diff --git a/tests/benchmarks/quickcontrols2/objectcount/objectcount.pro b/tests/benchmarks/quickcontrols/objectcount/objectcount.pro
index f2f2879a94..f2f2879a94 100644
--- a/tests/benchmarks/quickcontrols2/objectcount/objectcount.pro
+++ b/tests/benchmarks/quickcontrols/objectcount/objectcount.pro
diff --git a/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp b/tests/benchmarks/quickcontrols/objectcount/tst_objectcount.cpp
index e1d37eec8f..e1d37eec8f 100644
--- a/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp
+++ b/tests/benchmarks/quickcontrols/objectcount/tst_objectcount.cpp
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_abstractbutton.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_abstractbutton.qml
index 87b137fb22..87b137fb22 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_abstractbutton.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_abstractbutton.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_busyindicator.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_busyindicator.qml
index bc0be40243..bc0be40243 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_busyindicator.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_busyindicator.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_button.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_button.qml
index 9505ebf082..9505ebf082 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_button.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_button.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkbox.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_checkbox.qml
index 67d9e38236..67d9e38236 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkbox.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_checkbox.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkdelegate.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_checkdelegate.qml
index bd7b64cc23..bd7b64cc23 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkdelegate.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_checkdelegate.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_combobox.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_combobox.qml
index f8552b7415..f8552b7415 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_combobox.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_combobox.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_container.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_container.qml
index 238e95e3df..238e95e3df 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_container.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_container.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_control.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_control.qml
index 20f09477ce..20f09477ce 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_control.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_control.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_delaybutton.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_delaybutton.qml
index 05ec87483e..05ec87483e 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_delaybutton.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_delaybutton.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dial.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_dial.qml
index de742c7b7e..de742c7b7e 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dial.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_dial.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialog.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_dialog.qml
index 686149f7b0..686149f7b0 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialog.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_dialog.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialogbuttonbox.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_dialogbuttonbox.qml
index f13d65c507..f13d65c507 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialogbuttonbox.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_dialogbuttonbox.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_drawer.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_drawer.qml
index 3f7290a41f..3f7290a41f 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_drawer.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_drawer.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_frame.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_frame.qml
index 2d3c9a6624..2d3c9a6624 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_frame.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_frame.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_groupbox.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_groupbox.qml
index 3696f8476a..3696f8476a 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_groupbox.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_groupbox.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_itemdelegate.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_itemdelegate.qml
index 07128da1d2..07128da1d2 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_itemdelegate.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_itemdelegate.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_label.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_label.qml
index 788006a48d..788006a48d 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_label.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_label.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menu.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_menu.qml
index fd8e53b4f9..fd8e53b4f9 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menu.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_menu.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuitem.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_menuitem.qml
index 6732bc184c..6732bc184c 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuitem.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_menuitem.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuseparator.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_menuseparator.qml
index 8effa17305..8effa17305 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuseparator.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_menuseparator.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_page.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_page.qml
index f9d06b38af..f9d06b38af 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_page.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_page.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pageindicator.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_pageindicator.qml
index 9b5a691821..9b5a691821 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pageindicator.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_pageindicator.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pane.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_pane.qml
index a391f69557..a391f69557 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pane.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_pane.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_popup.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_popup.qml
index c2cdaab573..c2cdaab573 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_popup.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_popup.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_progressbar.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_progressbar.qml
index d50d9d2681..d50d9d2681 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_progressbar.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_progressbar.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiobutton.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_radiobutton.qml
index f596e852c1..f596e852c1 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiobutton.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_radiobutton.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiodelegate.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_radiodelegate.qml
index 7f5734664a..7f5734664a 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiodelegate.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_radiodelegate.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_rangeslider.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_rangeslider.qml
index 725cab29d8..725cab29d8 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_rangeslider.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_rangeslider.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_roundbutton.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_roundbutton.qml
index 0337a66db8..0337a66db8 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_roundbutton.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_roundbutton.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollbar.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_scrollbar.qml
index 2635240f89..2635240f89 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollbar.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_scrollbar.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollindicator.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_scrollindicator.qml
index 4e2b90a3b3..4e2b90a3b3 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollindicator.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_scrollindicator.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollview.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_scrollview.qml
index b5f155cb1d..b5f155cb1d 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollview.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_scrollview.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_slider.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_slider.qml
index 0ef3b3faf4..0ef3b3faf4 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_slider.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_slider.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_spinbox.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_spinbox.qml
index 9120a92162..9120a92162 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_spinbox.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_spinbox.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_stackview.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_stackview.qml
index cb6cee10fc..cb6cee10fc 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_stackview.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_stackview.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipedelegate.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_swipedelegate.qml
index 5147bbb6d2..5147bbb6d2 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipedelegate.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_swipedelegate.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipeview.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_swipeview.qml
index b263e620a9..b263e620a9 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipeview.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_swipeview.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switch.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_switch.qml
index 79cc48e3d0..79cc48e3d0 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switch.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_switch.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switchdelegate.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_switchdelegate.qml
index f6f8a7df52..f6f8a7df52 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switchdelegate.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_switchdelegate.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbar.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_tabbar.qml
index 37f6a46371..37f6a46371 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbar.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_tabbar.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbutton.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_tabbutton.qml
index 27442a7d2c..27442a7d2c 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbutton.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_tabbutton.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textarea.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_textarea.qml
index 88454c0bf1..88454c0bf1 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textarea.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_textarea.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textfield.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_textfield.qml
index eb279724e3..eb279724e3 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textfield.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_textfield.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolbutton.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_toolbutton.qml
index 7dcd85a3fb..7dcd85a3fb 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolbutton.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_toolbutton.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolseparator.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_toolseparator.qml
index 48cdd352cc..48cdd352cc 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolseparator.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_toolseparator.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tooltip.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_tooltip.qml
index 85e864943c..85e864943c 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tooltip.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_tooltip.qml
diff --git a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tumbler.qml b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_tumbler.qml
index da747e2300..da747e2300 100644
--- a/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tumbler.qml
+++ b/tests/benchmarks/quickcontrols/qmlbench/creation/delegates_tumbler.qml
diff --git a/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt b/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt
deleted file mode 100644
index a7002c86de..0000000000
--- a/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from creationtime.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_creationtime LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_creationtime Test:
-#####################################################################
-
-qt_internal_add_test(tst_creationtime
-    SOURCES
-        tst_creationtime.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::Qml
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-)
-
-#### Keys ignored in scope 1:.:.:creationtime.pro:<TRUE>:
-# TEMPLATE = "app"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_creationtime CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt b/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt
deleted file mode 100644
index 531185d1e8..0000000000
--- a/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from objectcount.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
-    cmake_minimum_required(VERSION 3.16)
-    project(tst_objectcount LANGUAGES C CXX ASM)
-    find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## tst_objectcount Test:
-#####################################################################
-
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-
-qt_internal_add_test(tst_objectcount
-    SOURCES
-        tst_objectcount.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickControlsTestUtilsPrivate
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::QuickTestUtilsPrivate
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:objectcount.pro:<TRUE>:
-# TEMPLATE = "app"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_objectcount CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index c16cc499ca..b41a2b3182 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -14,6 +14,6 @@ add_subdirectory(tableview)
 add_subdirectory(text)
 add_subdirectory(touch)
 # add_subdirectory(v4) # TODO: port if needed
-add_subdirectory(quickcontrols2)
+add_subdirectory(quickcontrols)
 add_subdirectory(quickdialogs)
 add_subdirectory(frameanimation)
diff --git a/tests/manual/quickcontrols2/CMakeLists.txt b/tests/manual/quickcontrols/CMakeLists.txt
index 524352d824..524352d824 100644
--- a/tests/manual/quickcontrols2/CMakeLists.txt
+++ b/tests/manual/quickcontrols/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/buttons/ButtonLoader.qml b/tests/manual/quickcontrols/buttons/ButtonLoader.qml
index 24931d4078..24931d4078 100644
--- a/tests/manual/quickcontrols2/buttons/ButtonLoader.qml
+++ b/tests/manual/quickcontrols/buttons/ButtonLoader.qml
diff --git a/tests/manual/quickcontrols2/buttons/CMakeLists.txt b/tests/manual/quickcontrols/buttons/CMakeLists.txt
index 048645b43f..048645b43f 100644
--- a/tests/manual/quickcontrols2/buttons/CMakeLists.txt
+++ b/tests/manual/quickcontrols/buttons/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/buttons/buttons.cpp b/tests/manual/quickcontrols/buttons/buttons.cpp
index 44e5971f4f..44e5971f4f 100644
--- a/tests/manual/quickcontrols2/buttons/buttons.cpp
+++ b/tests/manual/quickcontrols/buttons/buttons.cpp
diff --git a/tests/manual/quickcontrols2/buttons/buttons.pro b/tests/manual/quickcontrols/buttons/buttons.pro
index 2cb1c14c54..2cb1c14c54 100644
--- a/tests/manual/quickcontrols2/buttons/buttons.pro
+++ b/tests/manual/quickcontrols/buttons/buttons.pro
diff --git a/tests/manual/quickcontrols2/buttons/buttons.qml b/tests/manual/quickcontrols/buttons/buttons.qml
index 6c51c809e6..6c51c809e6 100644
--- a/tests/manual/quickcontrols2/buttons/buttons.qml
+++ b/tests/manual/quickcontrols/buttons/buttons.qml
diff --git a/tests/manual/quickcontrols2/fonts/CMakeLists.txt b/tests/manual/quickcontrols/fonts/CMakeLists.txt
index 476b7f1a7a..476b7f1a7a 100644
--- a/tests/manual/quickcontrols2/fonts/CMakeLists.txt
+++ b/tests/manual/quickcontrols/fonts/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/fonts/deployment.pri b/tests/manual/quickcontrols/fonts/deployment.pri
index c89af25a85..c89af25a85 100644
--- a/tests/manual/quickcontrols2/fonts/deployment.pri
+++ b/tests/manual/quickcontrols/fonts/deployment.pri
diff --git a/tests/manual/quickcontrols2/fonts/fonts.pro b/tests/manual/quickcontrols/fonts/fonts.pro
index 36e70f7e18..36e70f7e18 100644
--- a/tests/manual/quickcontrols2/fonts/fonts.pro
+++ b/tests/manual/quickcontrols/fonts/fonts.pro
diff --git a/tests/manual/quickcontrols2/fonts/main.cpp b/tests/manual/quickcontrols/fonts/main.cpp
index eeee73e053..eeee73e053 100644
--- a/tests/manual/quickcontrols2/fonts/main.cpp
+++ b/tests/manual/quickcontrols/fonts/main.cpp
diff --git a/tests/manual/quickcontrols2/fonts/main.qml b/tests/manual/quickcontrols/fonts/main.qml
index 3f1b5a91ed..3f1b5a91ed 100644
--- a/tests/manual/quickcontrols2/fonts/main.qml
+++ b/tests/manual/quickcontrols/fonts/main.qml
diff --git a/tests/manual/quickcontrols2/fonts/qml.qrc b/tests/manual/quickcontrols/fonts/qml.qrc
index 0ff3892d9c..0ff3892d9c 100644
--- a/tests/manual/quickcontrols2/fonts/qml.qrc
+++ b/tests/manual/quickcontrols/fonts/qml.qrc
diff --git a/tests/manual/quickcontrols2/gifs/CMakeLists.txt b/tests/manual/quickcontrols/gifs/CMakeLists.txt
index 148aefe80f..148aefe80f 100644
--- a/tests/manual/quickcontrols2/gifs/CMakeLists.txt
+++ b/tests/manual/quickcontrols/gifs/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/gifs/capturedevent.cpp b/tests/manual/quickcontrols/gifs/capturedevent.cpp
index b693161814..b693161814 100644
--- a/tests/manual/quickcontrols2/gifs/capturedevent.cpp
+++ b/tests/manual/quickcontrols/gifs/capturedevent.cpp
diff --git a/tests/manual/quickcontrols2/gifs/capturedevent.h b/tests/manual/quickcontrols/gifs/capturedevent.h
index 4ffa8ff72d..4ffa8ff72d 100644
--- a/tests/manual/quickcontrols2/gifs/capturedevent.h
+++ b/tests/manual/quickcontrols/gifs/capturedevent.h
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-busyindicator.qml
index 1463a48e42..1463a48e42 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-busyindicator.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-busyindicator.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-flat.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-flat.qml
index c08885ccf7..c08885ccf7 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-flat.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-flat.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-highlighted.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-highlighted.qml
index 7d6baef42a..7d6baef42a 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-highlighted.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-highlighted.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button.qml
index 895a143762..895a143762 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox-tristate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox-tristate.qml
index 55d9bc28e3..55d9bc28e3 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox-tristate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox-tristate.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox.qml
index 867bb6142e..867bb6142e 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
index 3dfec43cf5..3dfec43cf5 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate.qml
index 274f7580e9..274f7580e9 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-combobox.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-combobox.qml
index 0982ff0bf0..0982ff0bf0 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-combobox.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-combobox.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-delaybutton.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-delaybutton.qml
index e044dc7744..e044dc7744 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-delaybutton.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-delaybutton.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-no-wrap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-no-wrap.qml
index 13641e17f4..13641e17f4 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-no-wrap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-no-wrap.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-wrap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-wrap.qml
index 3a47350a4f..3a47350a4f 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-wrap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-wrap.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-drawer.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-drawer.qml
index 2cf05730af..2cf05730af 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-drawer.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-drawer.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-itemdelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-itemdelegate.qml
index b4c7f29ec8..b4c7f29ec8 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-itemdelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-itemdelegate.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-menu.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-menu.qml
index f39cc8f7c5..f39cc8f7c5 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-menu.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-menu.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
index 818c1a28ec..818c1a28ec 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar.qml
index 2faca20388..2faca20388 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiobutton.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiobutton.qml
index 7e4c391673..7e4c391673 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiobutton.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiobutton.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiodelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiodelegate.qml
index 7569c8d7b2..7569c8d7b2 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiodelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiodelegate.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-rangeslider.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-rangeslider.qml
index 6c7f548f48..6c7f548f48 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-rangeslider.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-rangeslider.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar-snap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar-snap.qml
index 06c8bd96d5..06c8bd96d5 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar-snap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar-snap.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar.qml
index 63afabbefe..63afabbefe 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollindicator.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollindicator.qml
index f2f12bbe91..f2f12bbe91 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollindicator.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollindicator.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider-snap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider-snap.qml
index ae5d8cf6cb..ae5d8cf6cb 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider-snap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider-snap.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider.qml
index 134341ccfa..134341ccfa 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-pop.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-pop.qml
index 64c44063a6..64c44063a6 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-pop.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-pop.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-push.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-push.qml
index 523c482de8..523c482de8 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-push.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-push.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-replace.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-replace.qml
index f1ba010b93..f1ba010b93 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-replace.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-replace.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-unwind.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-unwind.qml
index 4631dce66a..4631dce66a 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-unwind.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-unwind.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-behind.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
index 9a059e8c3d..9a059e8c3d 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
index 7e09e7bcc6..7e09e7bcc6 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate.qml
index a203f6fe83..a203f6fe83 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipeview.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipeview.qml
index dcdc8832c9..dcdc8832c9 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipeview.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipeview.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switch.qml
index 7099def2fc..7099def2fc 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switch.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switch.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switchdelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switchdelegate.qml
index 123c4aec00..123c4aec00 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switchdelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switchdelegate.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tabbar.qml
index 2a2da93f87..2a2da93f87 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tabbar.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tabbar.qml
diff --git a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tumbler-wrap.qml
index 1d6832bbc2..1d6832bbc2 100644
--- a/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tumbler-wrap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tumbler-wrap.qml
diff --git a/tests/manual/quickcontrols2/gifs/eventcapturer.cpp b/tests/manual/quickcontrols/gifs/eventcapturer.cpp
index 787e62a868..787e62a868 100644
--- a/tests/manual/quickcontrols2/gifs/eventcapturer.cpp
+++ b/tests/manual/quickcontrols/gifs/eventcapturer.cpp
diff --git a/tests/manual/quickcontrols2/gifs/eventcapturer.h b/tests/manual/quickcontrols/gifs/eventcapturer.h
index 5833298c24..5833298c24 100644
--- a/tests/manual/quickcontrols2/gifs/eventcapturer.h
+++ b/tests/manual/quickcontrols/gifs/eventcapturer.h
diff --git a/tests/manual/quickcontrols2/gifs/gifrecorder.cpp b/tests/manual/quickcontrols/gifs/gifrecorder.cpp
index 77f965c2da..77f965c2da 100644
--- a/tests/manual/quickcontrols2/gifs/gifrecorder.cpp
+++ b/tests/manual/quickcontrols/gifs/gifrecorder.cpp
diff --git a/tests/manual/quickcontrols2/gifs/gifrecorder.h b/tests/manual/quickcontrols/gifs/gifrecorder.h
index c01a6da5e3..c01a6da5e3 100644
--- a/tests/manual/quickcontrols2/gifs/gifrecorder.h
+++ b/tests/manual/quickcontrols/gifs/gifrecorder.h
diff --git a/tests/manual/quickcontrols2/gifs/gifs.pro b/tests/manual/quickcontrols/gifs/gifs.pro
index a5bb72c792..a5bb72c792 100644
--- a/tests/manual/quickcontrols2/gifs/gifs.pro
+++ b/tests/manual/quickcontrols/gifs/gifs.pro
diff --git a/tests/manual/quickcontrols2/gifs/tst_gifs.cpp b/tests/manual/quickcontrols/gifs/tst_gifs.cpp
index 2c8dd2e596..2c8dd2e596 100644
--- a/tests/manual/quickcontrols2/gifs/tst_gifs.cpp
+++ b/tests/manual/quickcontrols/gifs/tst_gifs.cpp
diff --git a/tests/manual/quickcontrols2/headerview/CMakeLists.txt b/tests/manual/quickcontrols/headerview/CMakeLists.txt
index fd00f693c8..fd00f693c8 100644
--- a/tests/manual/quickcontrols2/headerview/CMakeLists.txt
+++ b/tests/manual/quickcontrols/headerview/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/headerview/headerview.pro b/tests/manual/quickcontrols/headerview/headerview.pro
index 474cc9214a..474cc9214a 100644
--- a/tests/manual/quickcontrols2/headerview/headerview.pro
+++ b/tests/manual/quickcontrols/headerview/headerview.pro
diff --git a/tests/manual/quickcontrols2/headerview/main.cpp b/tests/manual/quickcontrols/headerview/main.cpp
index fb4e191a88..fb4e191a88 100644
--- a/tests/manual/quickcontrols2/headerview/main.cpp
+++ b/tests/manual/quickcontrols/headerview/main.cpp
diff --git a/tests/manual/quickcontrols2/headerview/main.qml b/tests/manual/quickcontrols/headerview/main.qml
index f8504b9f7f..f8504b9f7f 100644
--- a/tests/manual/quickcontrols2/headerview/main.qml
+++ b/tests/manual/quickcontrols/headerview/main.qml
diff --git a/tests/manual/quickcontrols2/manual.pro b/tests/manual/quickcontrols/manual.pro
index 7010d902f1..7010d902f1 100644
--- a/tests/manual/quickcontrols2/manual.pro
+++ b/tests/manual/quickcontrols/manual.pro
diff --git a/tests/manual/quickcontrols2/nativestyle/.gitignore b/tests/manual/quickcontrols/nativestyle/.gitignore
index fab7372d79..fab7372d79 100644
--- a/tests/manual/quickcontrols2/nativestyle/.gitignore
+++ b/tests/manual/quickcontrols/nativestyle/.gitignore
diff --git a/tests/manual/quickcontrols2/nativestyle/Buttons.qml b/tests/manual/quickcontrols/nativestyle/Buttons.qml
index d2fd1e2893..d2fd1e2893 100644
--- a/tests/manual/quickcontrols2/nativestyle/Buttons.qml
+++ b/tests/manual/quickcontrols/nativestyle/Buttons.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CMakeLists.txt b/tests/manual/quickcontrols/nativestyle/CMakeLists.txt
index 0f4e30bd53..0f4e30bd53 100644
--- a/tests/manual/quickcontrols2/nativestyle/CMakeLists.txt
+++ b/tests/manual/quickcontrols/nativestyle/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/nativestyle/CheckBoxes.qml b/tests/manual/quickcontrols/nativestyle/CheckBoxes.qml
index 86d083c355..86d083c355 100644
--- a/tests/manual/quickcontrols2/nativestyle/CheckBoxes.qml
+++ b/tests/manual/quickcontrols/nativestyle/CheckBoxes.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/ComboBoxes.qml b/tests/manual/quickcontrols/nativestyle/ComboBoxes.qml
index b32fa35038..b32fa35038 100644
--- a/tests/manual/quickcontrols2/nativestyle/ComboBoxes.qml
+++ b/tests/manual/quickcontrols/nativestyle/ComboBoxes.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/ControlContainer.qml b/tests/manual/quickcontrols/nativestyle/ControlContainer.qml
index 11727aef09..11727aef09 100644
--- a/tests/manual/quickcontrols2/nativestyle/ControlContainer.qml
+++ b/tests/manual/quickcontrols/nativestyle/ControlContainer.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomButtons.qml b/tests/manual/quickcontrols/nativestyle/CustomButtons.qml
index 9a3ecb4928..9a3ecb4928 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomButtons.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomButtons.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomCheckBoxes.qml b/tests/manual/quickcontrols/nativestyle/CustomCheckBoxes.qml
index 945669a3e5..945669a3e5 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomCheckBoxes.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomCheckBoxes.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomComboBoxes.qml b/tests/manual/quickcontrols/nativestyle/CustomComboBoxes.qml
index d9da3d4de8..d9da3d4de8 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomComboBoxes.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomComboBoxes.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomDials.qml b/tests/manual/quickcontrols/nativestyle/CustomDials.qml
index 5a96741a7b..5a96741a7b 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomDials.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomDials.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomFrames.qml b/tests/manual/quickcontrols/nativestyle/CustomFrames.qml
index 09194f48c3..09194f48c3 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomFrames.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomFrames.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomProgressBars.qml b/tests/manual/quickcontrols/nativestyle/CustomProgressBars.qml
index 5ae4ce5bb0..5ae4ce5bb0 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomProgressBars.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomProgressBars.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomRadioButtons.qml b/tests/manual/quickcontrols/nativestyle/CustomRadioButtons.qml
index 7da347f891..7da347f891 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomRadioButtons.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomRadioButtons.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomScrollBars.qml b/tests/manual/quickcontrols/nativestyle/CustomScrollBars.qml
index b10e7b7933..b10e7b7933 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomScrollBars.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomScrollBars.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomSliders.qml b/tests/manual/quickcontrols/nativestyle/CustomSliders.qml
index dcc0c29d1e..dcc0c29d1e 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomSliders.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomSliders.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomSpinBoxes.qml b/tests/manual/quickcontrols/nativestyle/CustomSpinBoxes.qml
index eeaee25ea5..eeaee25ea5 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomSpinBoxes.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomSpinBoxes.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomTextAreas.qml b/tests/manual/quickcontrols/nativestyle/CustomTextAreas.qml
index ae8254f197..ae8254f197 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomTextAreas.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomTextAreas.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/CustomTextFields.qml b/tests/manual/quickcontrols/nativestyle/CustomTextFields.qml
index 2a2c659e0e..2a2c659e0e 100644
--- a/tests/manual/quickcontrols2/nativestyle/CustomTextFields.qml
+++ b/tests/manual/quickcontrols/nativestyle/CustomTextFields.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/Dials.qml b/tests/manual/quickcontrols/nativestyle/Dials.qml
index b83e6aac66..b83e6aac66 100644
--- a/tests/manual/quickcontrols2/nativestyle/Dials.qml
+++ b/tests/manual/quickcontrols/nativestyle/Dials.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/Frames.qml b/tests/manual/quickcontrols/nativestyle/Frames.qml
index a7a8684c99..a7a8684c99 100644
--- a/tests/manual/quickcontrols2/nativestyle/Frames.qml
+++ b/tests/manual/quickcontrols/nativestyle/Frames.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/ProgressBars.qml b/tests/manual/quickcontrols/nativestyle/ProgressBars.qml
index b22a4fef3f..b22a4fef3f 100644
--- a/tests/manual/quickcontrols2/nativestyle/ProgressBars.qml
+++ b/tests/manual/quickcontrols/nativestyle/ProgressBars.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/RadioButtons.qml b/tests/manual/quickcontrols/nativestyle/RadioButtons.qml
index b67e53c8e7..b67e53c8e7 100644
--- a/tests/manual/quickcontrols2/nativestyle/RadioButtons.qml
+++ b/tests/manual/quickcontrols/nativestyle/RadioButtons.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/ScrollBars.qml b/tests/manual/quickcontrols/nativestyle/ScrollBars.qml
index 1517907a06..1517907a06 100644
--- a/tests/manual/quickcontrols2/nativestyle/ScrollBars.qml
+++ b/tests/manual/quickcontrols/nativestyle/ScrollBars.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/Sliders.qml b/tests/manual/quickcontrols/nativestyle/Sliders.qml
index 856df57162..856df57162 100644
--- a/tests/manual/quickcontrols2/nativestyle/Sliders.qml
+++ b/tests/manual/quickcontrols/nativestyle/Sliders.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/SlidersMini.qml b/tests/manual/quickcontrols/nativestyle/SlidersMini.qml
index 2f36845cee..2f36845cee 100644
--- a/tests/manual/quickcontrols2/nativestyle/SlidersMini.qml
+++ b/tests/manual/quickcontrols/nativestyle/SlidersMini.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/SlidersSmall.qml b/tests/manual/quickcontrols/nativestyle/SlidersSmall.qml
index 1339b42a9e..1339b42a9e 100644
--- a/tests/manual/quickcontrols2/nativestyle/SlidersSmall.qml
+++ b/tests/manual/quickcontrols/nativestyle/SlidersSmall.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/SpinBoxes.qml b/tests/manual/quickcontrols/nativestyle/SpinBoxes.qml
index 8dd4f8762b..8dd4f8762b 100644
--- a/tests/manual/quickcontrols2/nativestyle/SpinBoxes.qml
+++ b/tests/manual/quickcontrols/nativestyle/SpinBoxes.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/TextAreas.qml b/tests/manual/quickcontrols/nativestyle/TextAreas.qml
index 9eb2fb6a6b..9eb2fb6a6b 100644
--- a/tests/manual/quickcontrols2/nativestyle/TextAreas.qml
+++ b/tests/manual/quickcontrols/nativestyle/TextAreas.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/TextFields.qml b/tests/manual/quickcontrols/nativestyle/TextFields.qml
index 4448edbfff..4448edbfff 100644
--- a/tests/manual/quickcontrols2/nativestyle/TextFields.qml
+++ b/tests/manual/quickcontrols/nativestyle/TextFields.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/checkbox-icon.png b/tests/manual/quickcontrols/nativestyle/checkbox-icon.png
index ee669b3a88..ee669b3a88 100644
--- a/tests/manual/quickcontrols2/nativestyle/checkbox-icon.png
+++ b/tests/manual/quickcontrols/nativestyle/checkbox-icon.png
diff --git a/tests/manual/quickcontrols2/nativestyle/checkbox-icon16.png b/tests/manual/quickcontrols/nativestyle/checkbox-icon16.png
index 8d89eab841..8d89eab841 100644
--- a/tests/manual/quickcontrols2/nativestyle/checkbox-icon16.png
+++ b/tests/manual/quickcontrols/nativestyle/checkbox-icon16.png
diff --git a/tests/manual/quickcontrols2/nativestyle/checkbox-icon@2x.png b/tests/manual/quickcontrols/nativestyle/checkbox-icon@2x.png
index 51c5601de0..51c5601de0 100644
--- a/tests/manual/quickcontrols2/nativestyle/checkbox-icon@2x.png
+++ b/tests/manual/quickcontrols/nativestyle/checkbox-icon@2x.png
diff --git a/tests/manual/quickcontrols2/nativestyle/main.cpp b/tests/manual/quickcontrols/nativestyle/main.cpp
index 6ecd80f5e2..6ecd80f5e2 100644
--- a/tests/manual/quickcontrols2/nativestyle/main.cpp
+++ b/tests/manual/quickcontrols/nativestyle/main.cpp
diff --git a/tests/manual/quickcontrols2/nativestyle/main.qml b/tests/manual/quickcontrols/nativestyle/main.qml
index 85a476e280..85a476e280 100644
--- a/tests/manual/quickcontrols2/nativestyle/main.qml
+++ b/tests/manual/quickcontrols/nativestyle/main.qml
diff --git a/tests/manual/quickcontrols2/nativestyle/nativestyle.pro b/tests/manual/quickcontrols/nativestyle/nativestyle.pro
index 9c700430fe..9c700430fe 100644
--- a/tests/manual/quickcontrols2/nativestyle/nativestyle.pro
+++ b/tests/manual/quickcontrols/nativestyle/nativestyle.pro
diff --git a/tests/manual/quickcontrols2/nativestyle/qml.qrc b/tests/manual/quickcontrols/nativestyle/qml.qrc
index fba642e53f..fba642e53f 100644
--- a/tests/manual/quickcontrols2/nativestyle/qml.qrc
+++ b/tests/manual/quickcontrols/nativestyle/qml.qrc
diff --git a/tests/manual/quickcontrols2/qquickdialog/CMakeLists.txt b/tests/manual/quickcontrols/qquickdialog/CMakeLists.txt
index 232dae7ffa..232dae7ffa 100644
--- a/tests/manual/quickcontrols2/qquickdialog/CMakeLists.txt
+++ b/tests/manual/quickcontrols/qquickdialog/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/qquickdialog/CustomDialog.qml b/tests/manual/quickcontrols/qquickdialog/CustomDialog.qml
index c54b58603b..c54b58603b 100644
--- a/tests/manual/quickcontrols2/qquickdialog/CustomDialog.qml
+++ b/tests/manual/quickcontrols/qquickdialog/CustomDialog.qml
diff --git a/tests/manual/quickcontrols2/qquickdialog/DialogLabel.qml b/tests/manual/quickcontrols/qquickdialog/DialogLabel.qml
index 273eaf162d..273eaf162d 100644
--- a/tests/manual/quickcontrols2/qquickdialog/DialogLabel.qml
+++ b/tests/manual/quickcontrols/qquickdialog/DialogLabel.qml
diff --git a/tests/manual/quickcontrols2/qquickdialog/Marker.qml b/tests/manual/quickcontrols/qquickdialog/Marker.qml
index 42f9c2d93b..42f9c2d93b 100644
--- a/tests/manual/quickcontrols2/qquickdialog/Marker.qml
+++ b/tests/manual/quickcontrols/qquickdialog/Marker.qml
diff --git a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.cpp b/tests/manual/quickcontrols/qquickdialog/qquickdialog.cpp
index 92c060e6c4..92c060e6c4 100644
--- a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.cpp
+++ b/tests/manual/quickcontrols/qquickdialog/qquickdialog.cpp
diff --git a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.pro b/tests/manual/quickcontrols/qquickdialog/qquickdialog.pro
index aee7655b65..aee7655b65 100644
--- a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.pro
+++ b/tests/manual/quickcontrols/qquickdialog/qquickdialog.pro
diff --git a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.qml b/tests/manual/quickcontrols/qquickdialog/qquickdialog.qml
index 2afa0898e8..2afa0898e8 100644
--- a/tests/manual/quickcontrols2/qquickdialog/qquickdialog.qml
+++ b/tests/manual/quickcontrols/qquickdialog/qquickdialog.qml
diff --git a/tests/manual/quickcontrols2/qquickdialog/qtquickcontrols2.conf b/tests/manual/quickcontrols/qquickdialog/qtquickcontrols2.conf
index 53f380bfc9..53f380bfc9 100644
--- a/tests/manual/quickcontrols2/qquickdialog/qtquickcontrols2.conf
+++ b/tests/manual/quickcontrols/qquickdialog/qtquickcontrols2.conf
diff --git a/tests/manual/quickcontrols2/screenshots/CMakeLists.txt b/tests/manual/quickcontrols/screenshots/CMakeLists.txt
index 25ba8152a1..25ba8152a1 100644
--- a/tests/manual/quickcontrols2/screenshots/CMakeLists.txt
+++ b/tests/manual/quickcontrols/screenshots/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/screenshots/qtquickcontrols2.conf b/tests/manual/quickcontrols/screenshots/qtquickcontrols2.conf
index d2081db1d0..d2081db1d0 100644
--- a/tests/manual/quickcontrols2/screenshots/qtquickcontrols2.conf
+++ b/tests/manual/quickcontrols/screenshots/qtquickcontrols2.conf
diff --git a/tests/manual/quickcontrols2/screenshots/screenshots.cpp b/tests/manual/quickcontrols/screenshots/screenshots.cpp
index f85ee9d258..f85ee9d258 100644
--- a/tests/manual/quickcontrols2/screenshots/screenshots.cpp
+++ b/tests/manual/quickcontrols/screenshots/screenshots.cpp
diff --git a/tests/manual/quickcontrols2/screenshots/screenshots.pro b/tests/manual/quickcontrols/screenshots/screenshots.pro
index 5894888f13..5894888f13 100644
--- a/tests/manual/quickcontrols2/screenshots/screenshots.pro
+++ b/tests/manual/quickcontrols/screenshots/screenshots.pro
diff --git a/tests/manual/quickcontrols2/screenshots/screenshots.qml b/tests/manual/quickcontrols/screenshots/screenshots.qml
index cd8d52d658..cd8d52d658 100644
--- a/tests/manual/quickcontrols2/screenshots/screenshots.qml
+++ b/tests/manual/quickcontrols/screenshots/screenshots.qml
diff --git a/tests/manual/quickcontrols2/shared/FontAwesome.otf b/tests/manual/quickcontrols/shared/FontAwesome.otf
index 681bdd4d4c..681bdd4d4c 100644
--- a/tests/manual/quickcontrols2/shared/FontAwesome.otf
+++ b/tests/manual/quickcontrols/shared/FontAwesome.otf
diff --git a/tests/manual/quickcontrols2/shared/FontAwesome.qml b/tests/manual/quickcontrols/shared/FontAwesome.qml
index d86620d149..d86620d149 100644
--- a/tests/manual/quickcontrols2/shared/FontAwesome.qml
+++ b/tests/manual/quickcontrols/shared/FontAwesome.qml
diff --git a/tests/manual/quickcontrols2/shared/FontAwesomeIcon.qml b/tests/manual/quickcontrols/shared/FontAwesomeIcon.qml
index da98f26c73..da98f26c73 100644
--- a/tests/manual/quickcontrols2/shared/FontAwesomeIcon.qml
+++ b/tests/manual/quickcontrols/shared/FontAwesomeIcon.qml
diff --git a/tests/manual/quickcontrols2/shared/qmldir b/tests/manual/quickcontrols/shared/qmldir
index 3cb55667c7..3cb55667c7 100644
--- a/tests/manual/quickcontrols2/shared/qmldir
+++ b/tests/manual/quickcontrols/shared/qmldir
diff --git a/tests/manual/quickcontrols2/shared/shared.qrc b/tests/manual/quickcontrols/shared/shared.qrc
index 8dbb342156..8dbb342156 100644
--- a/tests/manual/quickcontrols2/shared/shared.qrc
+++ b/tests/manual/quickcontrols/shared/shared.qrc
diff --git a/tests/manual/quickcontrols2/styles-cover-flow/CMakeLists.txt b/tests/manual/quickcontrols/styles-cover-flow/CMakeLists.txt
index 1922f657f5..1922f657f5 100644
--- a/tests/manual/quickcontrols2/styles-cover-flow/CMakeLists.txt
+++ b/tests/manual/quickcontrols/styles-cover-flow/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowDelegate.qml b/tests/manual/quickcontrols/styles-cover-flow/CoverFlowDelegate.qml
index 7383b7fae8..7383b7fae8 100644
--- a/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowDelegate.qml
+++ b/tests/manual/quickcontrols/styles-cover-flow/CoverFlowDelegate.qml
diff --git a/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowPath.qml b/tests/manual/quickcontrols/styles-cover-flow/CoverFlowPath.qml
index 408a3693f7..408a3693f7 100644
--- a/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowPath.qml
+++ b/tests/manual/quickcontrols/styles-cover-flow/CoverFlowPath.qml
diff --git a/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.cpp b/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.cpp
index 80d5ff7235..80d5ff7235 100644
--- a/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.cpp
+++ b/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.cpp
diff --git a/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.pro b/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.pro
index 2faa9fbabb..2faa9fbabb 100644
--- a/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.pro
+++ b/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.pro
diff --git a/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.qml b/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.qml
index 04a483f6a7..04a483f6a7 100644
--- a/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.qml
+++ b/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.qml
diff --git a/tests/manual/quickcontrols2/styles/CMakeLists.txt b/tests/manual/quickcontrols/styles/CMakeLists.txt
index 479fcfdc22..479fcfdc22 100644
--- a/tests/manual/quickcontrols2/styles/CMakeLists.txt
+++ b/tests/manual/quickcontrols/styles/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/styles/styles.cpp b/tests/manual/quickcontrols/styles/styles.cpp
index c1355c43cf..c1355c43cf 100644
--- a/tests/manual/quickcontrols2/styles/styles.cpp
+++ b/tests/manual/quickcontrols/styles/styles.cpp
diff --git a/tests/manual/quickcontrols2/styles/styles.pro b/tests/manual/quickcontrols/styles/styles.pro
index 060ab4f7e8..060ab4f7e8 100644
--- a/tests/manual/quickcontrols2/styles/styles.pro
+++ b/tests/manual/quickcontrols/styles/styles.pro
diff --git a/tests/manual/quickcontrols2/styles/styles.qml b/tests/manual/quickcontrols/styles/styles.qml
index 62a39e4071..62a39e4071 100644
--- a/tests/manual/quickcontrols2/styles/styles.qml
+++ b/tests/manual/quickcontrols/styles/styles.qml
diff --git a/tests/manual/quickcontrols2/swipedelegate/CloseOnCompletedWorks.qml b/tests/manual/quickcontrols/swipedelegate/CloseOnCompletedWorks.qml
index fc29a94699..fc29a94699 100644
--- a/tests/manual/quickcontrols2/swipedelegate/CloseOnCompletedWorks.qml
+++ b/tests/manual/quickcontrols/swipedelegate/CloseOnCompletedWorks.qml
diff --git a/tests/manual/quickcontrols2/systemtrayicon/CMakeLists.txt b/tests/manual/quickcontrols/systemtrayicon/CMakeLists.txt
index b8913ec986..b8913ec986 100644
--- a/tests/manual/quickcontrols2/systemtrayicon/CMakeLists.txt
+++ b/tests/manual/quickcontrols/systemtrayicon/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/systemtrayicon/images/qt_logo_green_256.png b/tests/manual/quickcontrols/systemtrayicon/images/qt_logo_green_256.png
index a7b16ba4f9..a7b16ba4f9 100644
--- a/tests/manual/quickcontrols2/systemtrayicon/images/qt_logo_green_256.png
+++ b/tests/manual/quickcontrols/systemtrayicon/images/qt_logo_green_256.png
diff --git a/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.cpp b/tests/manual/quickcontrols/systemtrayicon/systemtrayicon.cpp
index 32b1b4c1ce..32b1b4c1ce 100644
--- a/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.cpp
+++ b/tests/manual/quickcontrols/systemtrayicon/systemtrayicon.cpp
diff --git a/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.pro b/tests/manual/quickcontrols/systemtrayicon/systemtrayicon.pro
index 24b9caa0cf..24b9caa0cf 100644
--- a/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.pro
+++ b/tests/manual/quickcontrols/systemtrayicon/systemtrayicon.pro
diff --git a/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qml b/tests/manual/quickcontrols/systemtrayicon/systemtrayicon.qml
index d3a9454074..d3a9454074 100644
--- a/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qml
+++ b/tests/manual/quickcontrols/systemtrayicon/systemtrayicon.qml
diff --git a/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qrc b/tests/manual/quickcontrols/systemtrayicon/systemtrayicon.qrc
index 656476d940..656476d940 100644
--- a/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qrc
+++ b/tests/manual/quickcontrols/systemtrayicon/systemtrayicon.qrc
diff --git a/tests/manual/quickcontrols2/testbench/+Imagine/ApplicationWindow.qml b/tests/manual/quickcontrols/testbench/+Imagine/ApplicationWindow.qml
index 8621f52da3..8621f52da3 100644
--- a/tests/manual/quickcontrols2/testbench/+Imagine/ApplicationWindow.qml
+++ b/tests/manual/quickcontrols/testbench/+Imagine/ApplicationWindow.qml
diff --git a/tests/manual/quickcontrols2/testbench/+Imagine/ContentPane.qml b/tests/manual/quickcontrols/testbench/+Imagine/ContentPane.qml
index e0c66c7c1d..e0c66c7c1d 100644
--- a/tests/manual/quickcontrols2/testbench/+Imagine/ContentPane.qml
+++ b/tests/manual/quickcontrols/testbench/+Imagine/ContentPane.qml
diff --git a/tests/manual/quickcontrols2/testbench/+Imagine/Dialog.qml b/tests/manual/quickcontrols/testbench/+Imagine/Dialog.qml
index 3cb16399cf..3cb16399cf 100644
--- a/tests/manual/quickcontrols2/testbench/+Imagine/Dialog.qml
+++ b/tests/manual/quickcontrols/testbench/+Imagine/Dialog.qml
diff --git a/tests/manual/quickcontrols2/testbench/+Imagine/Menu.qml b/tests/manual/quickcontrols/testbench/+Imagine/Menu.qml
index 548f4a9c47..548f4a9c47 100644
--- a/tests/manual/quickcontrols2/testbench/+Imagine/Menu.qml
+++ b/tests/manual/quickcontrols/testbench/+Imagine/Menu.qml
diff --git a/tests/manual/quickcontrols2/testbench/+Imagine/ToolBar.qml b/tests/manual/quickcontrols/testbench/+Imagine/ToolBar.qml
index 0b2653835f..0b2653835f 100644
--- a/tests/manual/quickcontrols2/testbench/+Imagine/ToolBar.qml
+++ b/tests/manual/quickcontrols/testbench/+Imagine/ToolBar.qml
diff --git a/tests/manual/quickcontrols2/testbench/.gitignore b/tests/manual/quickcontrols/testbench/.gitignore
index 75fae8bc39..75fae8bc39 100644
--- a/tests/manual/quickcontrols2/testbench/.gitignore
+++ b/tests/manual/quickcontrols/testbench/.gitignore
diff --git a/tests/manual/quickcontrols2/testbench/ApplicationWindow.qml b/tests/manual/quickcontrols/testbench/ApplicationWindow.qml
index dca67c4750..dca67c4750 100644
--- a/tests/manual/quickcontrols2/testbench/ApplicationWindow.qml
+++ b/tests/manual/quickcontrols/testbench/ApplicationWindow.qml
diff --git a/tests/manual/quickcontrols2/testbench/CMakeLists.txt b/tests/manual/quickcontrols/testbench/CMakeLists.txt
index f4feb1a454..f4feb1a454 100644
--- a/tests/manual/quickcontrols2/testbench/CMakeLists.txt
+++ b/tests/manual/quickcontrols/testbench/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/testbench/ColorEditor.qml b/tests/manual/quickcontrols/testbench/ColorEditor.qml
index dd5d7f3aaa..dd5d7f3aaa 100644
--- a/tests/manual/quickcontrols2/testbench/ColorEditor.qml
+++ b/tests/manual/quickcontrols/testbench/ColorEditor.qml
diff --git a/tests/manual/quickcontrols2/testbench/ContentPane.qml b/tests/manual/quickcontrols/testbench/ContentPane.qml
index 5bff3f5d23..5bff3f5d23 100644
--- a/tests/manual/quickcontrols2/testbench/ContentPane.qml
+++ b/tests/manual/quickcontrols/testbench/ContentPane.qml
diff --git a/tests/manual/quickcontrols2/testbench/ControlContainer.qml b/tests/manual/quickcontrols/testbench/ControlContainer.qml
index 34688fb7dd..34688fb7dd 100644
--- a/tests/manual/quickcontrols2/testbench/ControlContainer.qml
+++ b/tests/manual/quickcontrols/testbench/ControlContainer.qml
diff --git a/tests/manual/quickcontrols2/testbench/Dialog.qml b/tests/manual/quickcontrols/testbench/Dialog.qml
index a1a4e5d624..a1a4e5d624 100644
--- a/tests/manual/quickcontrols2/testbench/Dialog.qml
+++ b/tests/manual/quickcontrols/testbench/Dialog.qml
diff --git a/tests/manual/quickcontrols2/testbench/ExampleContainer.qml b/tests/manual/quickcontrols/testbench/ExampleContainer.qml
index 19dbb9a41c..19dbb9a41c 100644
--- a/tests/manual/quickcontrols2/testbench/ExampleContainer.qml
+++ b/tests/manual/quickcontrols/testbench/ExampleContainer.qml
diff --git a/tests/manual/quickcontrols2/testbench/Menu.qml b/tests/manual/quickcontrols/testbench/Menu.qml
index 15786af830..15786af830 100644
--- a/tests/manual/quickcontrols2/testbench/Menu.qml
+++ b/tests/manual/quickcontrols/testbench/Menu.qml
diff --git a/tests/manual/quickcontrols2/testbench/README.md b/tests/manual/quickcontrols/testbench/README.md
index bd434de6a2..bd434de6a2 100644
--- a/tests/manual/quickcontrols2/testbench/README.md
+++ b/tests/manual/quickcontrols/testbench/README.md
diff --git a/tests/manual/quickcontrols2/testbench/SettingsDialog.qml b/tests/manual/quickcontrols/testbench/SettingsDialog.qml
index f879e5074f..f879e5074f 100644
--- a/tests/manual/quickcontrols2/testbench/SettingsDialog.qml
+++ b/tests/manual/quickcontrols/testbench/SettingsDialog.qml
diff --git a/tests/manual/quickcontrols2/testbench/ToolBar.qml b/tests/manual/quickcontrols/testbench/ToolBar.qml
index ffbf422a76..ffbf422a76 100644
--- a/tests/manual/quickcontrols2/testbench/ToolBar.qml
+++ b/tests/manual/quickcontrols/testbench/ToolBar.qml
diff --git a/tests/manual/quickcontrols2/testbench/assetfixer.cpp b/tests/manual/quickcontrols/testbench/assetfixer.cpp
index 57936b737b..57936b737b 100644
--- a/tests/manual/quickcontrols2/testbench/assetfixer.cpp
+++ b/tests/manual/quickcontrols/testbench/assetfixer.cpp
diff --git a/tests/manual/quickcontrols2/testbench/assetfixer.h b/tests/manual/quickcontrols/testbench/assetfixer.h
index 88594a87d0..88594a87d0 100644
--- a/tests/manual/quickcontrols2/testbench/assetfixer.h
+++ b/tests/manual/quickcontrols/testbench/assetfixer.h
diff --git a/tests/manual/quickcontrols2/testbench/clipboard.cpp b/tests/manual/quickcontrols/testbench/clipboard.cpp
index e8017e0e23..e8017e0e23 100644
--- a/tests/manual/quickcontrols2/testbench/clipboard.cpp
+++ b/tests/manual/quickcontrols/testbench/clipboard.cpp
diff --git a/tests/manual/quickcontrols2/testbench/clipboard.h b/tests/manual/quickcontrols/testbench/clipboard.h
index f262638391..f262638391 100644
--- a/tests/manual/quickcontrols2/testbench/clipboard.h
+++ b/tests/manual/quickcontrols/testbench/clipboard.h
diff --git a/tests/manual/quickcontrols2/testbench/controls/BusyIndicator.qml b/tests/manual/quickcontrols/testbench/controls/BusyIndicator.qml
index c61c100668..c61c100668 100644
--- a/tests/manual/quickcontrols2/testbench/controls/BusyIndicator.qml
+++ b/tests/manual/quickcontrols/testbench/controls/BusyIndicator.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Button.qml b/tests/manual/quickcontrols/testbench/controls/Button.qml
index 1dcf05da36..1dcf05da36 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Button.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Button.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/CheckBox.qml b/tests/manual/quickcontrols/testbench/controls/CheckBox.qml
index 4973033a4d..4973033a4d 100644
--- a/tests/manual/quickcontrols2/testbench/controls/CheckBox.qml
+++ b/tests/manual/quickcontrols/testbench/controls/CheckBox.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/CheckDelegate.qml b/tests/manual/quickcontrols/testbench/controls/CheckDelegate.qml
index d64339501f..d64339501f 100644
--- a/tests/manual/quickcontrols2/testbench/controls/CheckDelegate.qml
+++ b/tests/manual/quickcontrols/testbench/controls/CheckDelegate.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/ComboBox.qml b/tests/manual/quickcontrols/testbench/controls/ComboBox.qml
index 39b8579630..39b8579630 100644
--- a/tests/manual/quickcontrols2/testbench/controls/ComboBox.qml
+++ b/tests/manual/quickcontrols/testbench/controls/ComboBox.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/DelayButton.qml b/tests/manual/quickcontrols/testbench/controls/DelayButton.qml
index 1c36a4f7ca..1c36a4f7ca 100644
--- a/tests/manual/quickcontrols2/testbench/controls/DelayButton.qml
+++ b/tests/manual/quickcontrols/testbench/controls/DelayButton.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Dial.qml b/tests/manual/quickcontrols/testbench/controls/Dial.qml
index c4847ac886..c4847ac886 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Dial.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Dial.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Dialog.qml b/tests/manual/quickcontrols/testbench/controls/Dialog.qml
index 1a25fbdfb9..1a25fbdfb9 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Dialog.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Dialog.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Frame.qml b/tests/manual/quickcontrols/testbench/controls/Frame.qml
index a57cb76f18..a57cb76f18 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Frame.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Frame.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/GroupBox.qml b/tests/manual/quickcontrols/testbench/controls/GroupBox.qml
index 23c938ff21..23c938ff21 100644
--- a/tests/manual/quickcontrols2/testbench/controls/GroupBox.qml
+++ b/tests/manual/quickcontrols/testbench/controls/GroupBox.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/ItemDelegate.qml b/tests/manual/quickcontrols/testbench/controls/ItemDelegate.qml
index e8171c36bc..e8171c36bc 100644
--- a/tests/manual/quickcontrols2/testbench/controls/ItemDelegate.qml
+++ b/tests/manual/quickcontrols/testbench/controls/ItemDelegate.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Label.qml b/tests/manual/quickcontrols/testbench/controls/Label.qml
index a5074e8faf..a5074e8faf 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Label.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Label.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Menu.qml b/tests/manual/quickcontrols/testbench/controls/Menu.qml
index aeadee4f86..aeadee4f86 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Menu.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Menu.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/MenuBar.qml b/tests/manual/quickcontrols/testbench/controls/MenuBar.qml
index bed6fbd909..bed6fbd909 100644
--- a/tests/manual/quickcontrols2/testbench/controls/MenuBar.qml
+++ b/tests/manual/quickcontrols/testbench/controls/MenuBar.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Page.qml b/tests/manual/quickcontrols/testbench/controls/Page.qml
index d8c29a7fe4..d8c29a7fe4 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Page.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Page.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/PageIndicator.qml b/tests/manual/quickcontrols/testbench/controls/PageIndicator.qml
index 34a242a6af..34a242a6af 100644
--- a/tests/manual/quickcontrols2/testbench/controls/PageIndicator.qml
+++ b/tests/manual/quickcontrols/testbench/controls/PageIndicator.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Pane.qml b/tests/manual/quickcontrols/testbench/controls/Pane.qml
index 9f60bec588..9f60bec588 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Pane.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Pane.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/ProgressBar.qml b/tests/manual/quickcontrols/testbench/controls/ProgressBar.qml
index bd4ab8e379..bd4ab8e379 100644
--- a/tests/manual/quickcontrols2/testbench/controls/ProgressBar.qml
+++ b/tests/manual/quickcontrols/testbench/controls/ProgressBar.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/RadioButton.qml b/tests/manual/quickcontrols/testbench/controls/RadioButton.qml
index 00beb1bac9..00beb1bac9 100644
--- a/tests/manual/quickcontrols2/testbench/controls/RadioButton.qml
+++ b/tests/manual/quickcontrols/testbench/controls/RadioButton.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/RadioDelegate.qml b/tests/manual/quickcontrols/testbench/controls/RadioDelegate.qml
index 4dab387fcf..4dab387fcf 100644
--- a/tests/manual/quickcontrols2/testbench/controls/RadioDelegate.qml
+++ b/tests/manual/quickcontrols/testbench/controls/RadioDelegate.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/RangeSlider.qml b/tests/manual/quickcontrols/testbench/controls/RangeSlider.qml
index 18a2418451..18a2418451 100644
--- a/tests/manual/quickcontrols2/testbench/controls/RangeSlider.qml
+++ b/tests/manual/quickcontrols/testbench/controls/RangeSlider.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/RoundButton.qml b/tests/manual/quickcontrols/testbench/controls/RoundButton.qml
index 530aaee338..530aaee338 100644
--- a/tests/manual/quickcontrols2/testbench/controls/RoundButton.qml
+++ b/tests/manual/quickcontrols/testbench/controls/RoundButton.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/ScrollBar.qml b/tests/manual/quickcontrols/testbench/controls/ScrollBar.qml
index 5fa00fec0f..5fa00fec0f 100644
--- a/tests/manual/quickcontrols2/testbench/controls/ScrollBar.qml
+++ b/tests/manual/quickcontrols/testbench/controls/ScrollBar.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/ScrollIndicator.qml b/tests/manual/quickcontrols/testbench/controls/ScrollIndicator.qml
index 5c0c0d4edc..5c0c0d4edc 100644
--- a/tests/manual/quickcontrols2/testbench/controls/ScrollIndicator.qml
+++ b/tests/manual/quickcontrols/testbench/controls/ScrollIndicator.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Slider.qml b/tests/manual/quickcontrols/testbench/controls/Slider.qml
index d35e8fe0fa..d35e8fe0fa 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Slider.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Slider.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/SpinBox.qml b/tests/manual/quickcontrols/testbench/controls/SpinBox.qml
index 06c6ca43ef..06c6ca43ef 100644
--- a/tests/manual/quickcontrols2/testbench/controls/SpinBox.qml
+++ b/tests/manual/quickcontrols/testbench/controls/SpinBox.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/SplitView.qml b/tests/manual/quickcontrols/testbench/controls/SplitView.qml
index c51ac846f2..c51ac846f2 100644
--- a/tests/manual/quickcontrols2/testbench/controls/SplitView.qml
+++ b/tests/manual/quickcontrols/testbench/controls/SplitView.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/SwipeDelegate.qml b/tests/manual/quickcontrols/testbench/controls/SwipeDelegate.qml
index e04f0bb630..e04f0bb630 100644
--- a/tests/manual/quickcontrols2/testbench/controls/SwipeDelegate.qml
+++ b/tests/manual/quickcontrols/testbench/controls/SwipeDelegate.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Switch.qml b/tests/manual/quickcontrols/testbench/controls/Switch.qml
index c7e5103183..c7e5103183 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Switch.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Switch.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/SwitchDelegate.qml b/tests/manual/quickcontrols/testbench/controls/SwitchDelegate.qml
index 9508b2ce80..9508b2ce80 100644
--- a/tests/manual/quickcontrols2/testbench/controls/SwitchDelegate.qml
+++ b/tests/manual/quickcontrols/testbench/controls/SwitchDelegate.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/TabBar.qml b/tests/manual/quickcontrols/testbench/controls/TabBar.qml
index e0286146f9..e0286146f9 100644
--- a/tests/manual/quickcontrols2/testbench/controls/TabBar.qml
+++ b/tests/manual/quickcontrols/testbench/controls/TabBar.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/TextArea.qml b/tests/manual/quickcontrols/testbench/controls/TextArea.qml
index 3b76ef2b0a..3b76ef2b0a 100644
--- a/tests/manual/quickcontrols2/testbench/controls/TextArea.qml
+++ b/tests/manual/quickcontrols/testbench/controls/TextArea.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/TextField.qml b/tests/manual/quickcontrols/testbench/controls/TextField.qml
index 205418f08c..205418f08c 100644
--- a/tests/manual/quickcontrols2/testbench/controls/TextField.qml
+++ b/tests/manual/quickcontrols/testbench/controls/TextField.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/ToolBar.qml b/tests/manual/quickcontrols/testbench/controls/ToolBar.qml
index 1fccb74e65..1fccb74e65 100644
--- a/tests/manual/quickcontrols2/testbench/controls/ToolBar.qml
+++ b/tests/manual/quickcontrols/testbench/controls/ToolBar.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/ToolTip.qml b/tests/manual/quickcontrols/testbench/controls/ToolTip.qml
index de8f117429..de8f117429 100644
--- a/tests/manual/quickcontrols2/testbench/controls/ToolTip.qml
+++ b/tests/manual/quickcontrols/testbench/controls/ToolTip.qml
diff --git a/tests/manual/quickcontrols2/testbench/controls/Tumbler.qml b/tests/manual/quickcontrols/testbench/controls/Tumbler.qml
index 1c571d22b1..1c571d22b1 100644
--- a/tests/manual/quickcontrols2/testbench/controls/Tumbler.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Tumbler.qml
diff --git a/tests/manual/quickcontrols2/testbench/deployment.pri b/tests/manual/quickcontrols/testbench/deployment.pri
index c89af25a85..c89af25a85 100644
--- a/tests/manual/quickcontrols2/testbench/deployment.pri
+++ b/tests/manual/quickcontrols/testbench/deployment.pri
diff --git a/tests/manual/quickcontrols2/testbench/directoryvalidator.cpp b/tests/manual/quickcontrols/testbench/directoryvalidator.cpp
index c1c083a246..c1c083a246 100644
--- a/tests/manual/quickcontrols2/testbench/directoryvalidator.cpp
+++ b/tests/manual/quickcontrols/testbench/directoryvalidator.cpp
diff --git a/tests/manual/quickcontrols2/testbench/directoryvalidator.h b/tests/manual/quickcontrols/testbench/directoryvalidator.h
index 89bb03bd29..89bb03bd29 100644
--- a/tests/manual/quickcontrols2/testbench/directoryvalidator.h
+++ b/tests/manual/quickcontrols/testbench/directoryvalidator.h
diff --git a/tests/manual/quickcontrols2/testbench/fonts.qrc b/tests/manual/quickcontrols/testbench/fonts.qrc
index fc86e03183..fc86e03183 100644
--- a/tests/manual/quickcontrols2/testbench/fonts.qrc
+++ b/tests/manual/quickcontrols/testbench/fonts.qrc
diff --git a/tests/manual/quickcontrols2/testbench/fonts/LICENSE.txt b/tests/manual/quickcontrols/testbench/fonts/LICENSE.txt
index 8fa3da363e..8fa3da363e 100644
--- a/tests/manual/quickcontrols2/testbench/fonts/LICENSE.txt
+++ b/tests/manual/quickcontrols/testbench/fonts/LICENSE.txt
diff --git a/tests/manual/quickcontrols2/testbench/fonts/fontawesome.ttf b/tests/manual/quickcontrols/testbench/fonts/fontawesome.ttf
index 49b6c5da65..49b6c5da65 100644
--- a/tests/manual/quickcontrols2/testbench/fonts/fontawesome.ttf
+++ b/tests/manual/quickcontrols/testbench/fonts/fontawesome.ttf
diff --git a/tests/manual/quickcontrols2/testbench/main.cpp b/tests/manual/quickcontrols/testbench/main.cpp
index 7fad3c9390..7fad3c9390 100644
--- a/tests/manual/quickcontrols2/testbench/main.cpp
+++ b/tests/manual/quickcontrols/testbench/main.cpp
diff --git a/tests/manual/quickcontrols2/testbench/qml.qrc b/tests/manual/quickcontrols/testbench/qml.qrc
index 82e69be6f3..82e69be6f3 100644
--- a/tests/manual/quickcontrols2/testbench/qml.qrc
+++ b/tests/manual/quickcontrols/testbench/qml.qrc
diff --git a/tests/manual/quickcontrols2/testbench/testbench.pro b/tests/manual/quickcontrols/testbench/testbench.pro
index 4509f4967d..4509f4967d 100644
--- a/tests/manual/quickcontrols2/testbench/testbench.pro
+++ b/tests/manual/quickcontrols/testbench/testbench.pro
diff --git a/tests/manual/quickcontrols2/testbench/testbench.qml b/tests/manual/quickcontrols/testbench/testbench.qml
index c9185e35d0..c9185e35d0 100644
--- a/tests/manual/quickcontrols2/testbench/testbench.qml
+++ b/tests/manual/quickcontrols/testbench/testbench.qml
diff --git a/tests/manual/quickcontrols2/viewinqwidget/CMakeLists.txt b/tests/manual/quickcontrols/viewinqwidget/CMakeLists.txt
index 37e343784b..37e343784b 100644
--- a/tests/manual/quickcontrols2/viewinqwidget/CMakeLists.txt
+++ b/tests/manual/quickcontrols/viewinqwidget/CMakeLists.txt
diff --git a/tests/manual/quickcontrols/viewinqwidget/main.cpp b/tests/manual/quickcontrols/viewinqwidget/main.cpp
new file mode 100644
index 0000000000..7ce08aaa78
--- /dev/null
+++ b/tests/manual/quickcontrols/viewinqwidget/main.cpp
@@ -0,0 +1,58 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QDebug>
+#include <QDir>
+#include <QGroupBox>
+#include <QScreen>
+#include <QQmlApplicationEngine>
+#include <QQmlError>
+#include <QQuickView>
+#include <QQuickWidget>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QWidget widget;
+    widget.setWindowTitle(QT_VERSION_STR);
+
+    QHBoxLayout *hLayout = new QHBoxLayout(&widget);
+    QGroupBox *groupBox = new QGroupBox("QuickWidget", &widget);
+    QVBoxLayout *vLayout = new QVBoxLayout(groupBox);
+    QQuickWidget *quickWidget = new QQuickWidget(groupBox);
+    quickWidget->setMinimumSize(360, 520);
+    vLayout->addWidget(quickWidget);
+    quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
+    quickWidget->setSource(QUrl(QLatin1String("qrc:/main.qml")));
+    if (quickWidget->status() == QQuickWidget::Error) {
+        qWarning() << quickWidget->errors();
+        return 1;
+    }
+    hLayout->addWidget(groupBox);
+
+    const QString gallerySource =
+        QDir::cleanPath(QLatin1String(SRCDIR"../../../examples/quickcontrols/gallery/gallery.qml"));
+    QQmlApplicationEngine engine(QUrl::fromLocalFile(gallerySource));
+    QObject *root = engine.rootObjects().value(0, nullptr);
+    if (!root || !root->isWindowType()) {
+        qWarning() << "Load error" << gallerySource;
+        return 1;
+    }
+    groupBox = new QGroupBox("QQuickView/createWindowContainer", &widget);
+    vLayout = new QVBoxLayout(groupBox);
+    QWidget *container = QWidget::createWindowContainer(qobject_cast<QWindow *>(root), groupBox);
+    container->setMinimumSize(360, 520);
+    vLayout->addWidget(container);
+    hLayout->addWidget(groupBox);
+
+    const QRect availableGeometry = widget.screen()->availableGeometry();
+    widget.move(availableGeometry.center() - QPoint(widget.sizeHint().width() / 2, widget.sizeHint().height() / 2));
+
+    widget.show();
+
+    return app.exec();
+}
diff --git a/tests/manual/quickcontrols2/viewinqwidget/main.qml b/tests/manual/quickcontrols/viewinqwidget/main.qml
index 8e347bdb81..8e347bdb81 100644
--- a/tests/manual/quickcontrols2/viewinqwidget/main.qml
+++ b/tests/manual/quickcontrols/viewinqwidget/main.qml
diff --git a/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.pro b/tests/manual/quickcontrols/viewinqwidget/viewinqwidget.pro
index 649829d449..649829d449 100644
--- a/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.pro
+++ b/tests/manual/quickcontrols/viewinqwidget/viewinqwidget.pro
diff --git a/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc b/tests/manual/quickcontrols/viewinqwidget/viewinqwidget.qrc
index 5f6483ac33..5f6483ac33 100644
--- a/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc
+++ b/tests/manual/quickcontrols/viewinqwidget/viewinqwidget.qrc
diff --git a/tests/manual/quickcontrols2/viewinqwidget/main.cpp b/tests/manual/quickcontrols2/viewinqwidget/main.cpp
deleted file mode 100644
index 0acd112880..0000000000
--- a/tests/manual/quickcontrols2/viewinqwidget/main.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include <QApplication>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QDebug>
-#include <QDir>
-#include <QGroupBox>
-#include <QScreen>
-#include <QQmlApplicationEngine>
-#include <QQmlError>
-#include <QQuickView>
-#include <QQuickWidget>
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QWidget widget;
-    widget.setWindowTitle(QT_VERSION_STR);
-
-    QHBoxLayout *hLayout = new QHBoxLayout(&widget);
-    QGroupBox *groupBox = new QGroupBox("QuickWidget", &widget);
-    QVBoxLayout *vLayout = new QVBoxLayout(groupBox);
-    QQuickWidget *quickWidget = new QQuickWidget(groupBox);
-    quickWidget->setMinimumSize(360, 520);
-    vLayout->addWidget(quickWidget);
-    quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
-    quickWidget->setSource(QUrl(QLatin1String("qrc:/main.qml")));
-    if (quickWidget->status() == QQuickWidget::Error) {
-        qWarning() << quickWidget->errors();
-        return 1;
-    }
-    hLayout->addWidget(groupBox);
-
-    const QString gallerySource =
-        QDir::cleanPath(QLatin1String(SRCDIR"../../../examples/quickcontrols2/gallery/gallery.qml"));
-    QQmlApplicationEngine engine(QUrl::fromLocalFile(gallerySource));
-    QObject *root = engine.rootObjects().value(0, nullptr);
-    if (!root || !root->isWindowType()) {
-        qWarning() << "Load error" << gallerySource;
-        return 1;
-    }
-    groupBox = new QGroupBox("QQuickView/createWindowContainer", &widget);
-    vLayout = new QVBoxLayout(groupBox);
-    QWidget *container = QWidget::createWindowContainer(qobject_cast<QWindow *>(root), groupBox);
-    container->setMinimumSize(360, 520);
-    vLayout->addWidget(container);
-    hLayout->addWidget(groupBox);
-
-    const QRect availableGeometry = widget.screen()->availableGeometry();
-    widget.move(availableGeometry.center() - QPoint(widget.sizeHint().width() / 2, widget.sizeHint().height() / 2));
-
-    widget.show();
-
-    return app.exec();
-}