207 files changed, 2 insertions, 2 deletions

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/quickcontrols2/viewinqwidget/main.cpp b/tests/manual/quickcontrols/viewinqwidget/main.cpp
index 0acd112880..7ce08aaa78 100644
--- a/tests/manual/quickcontrols2/viewinqwidget/main.cpp
+++ b/tests/manual/quickcontrols/viewinqwidget/main.cpp
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
     hLayout->addWidget(groupBox);
 
     const QString gallerySource =
-        QDir::cleanPath(QLatin1String(SRCDIR"../../../examples/quickcontrols2/gallery/gallery.qml"));
+        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()) {
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