Doc: remove "2" from Qt Quick Controls files

Work on this was already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.

The CMake target (docs_QuickControls2) probably can't be renamed
until we rename the library, which won't happen until Qt 7.

Task-number: QTBUG-95413
Change-Id: Ied20805a91286436606577c3de39671a447f27dd
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

558 files changed, 614 insertions, 614 deletions

diff --git a/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt
index 229129f5c6..8915937222 100644
--- a/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt
+++ b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt
@@ -7,7 +7,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/attachedstyleproperties")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/attachedstyleproperties")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml QuickControls2)
 qt_standard_project_setup()
diff --git a/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt
index 81b15f128f..2ac65d3f57 100644
--- a/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt
@@ -2,7 +2,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     message(FATAL_ERROR "MyStyle should be built as part of the 'attachedstyleproperties' project, and not in isolation.")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/attachedstyleproperties")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/attachedstyleproperties")
 
 qt_add_qml_module(MyStyle
     URI MyStyle
diff --git a/examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols2-attachedstyleproperties.png b/examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols-attachedstyleproperties.png
index 2cd5f214f7..2cd5f214f7 100644
--- a/examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols2-attachedstyleproperties.png
+++ b/examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols-attachedstyleproperties.png
diff --git a/examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols2-attachedstyleproperties.qdoc b/examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols-attachedstyleproperties.qdoc
index de43fc80bd..4e273ffd38 100644
--- a/examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols2-attachedstyleproperties.qdoc
+++ b/examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols-attachedstyleproperties.qdoc
@@ -5,10 +5,10 @@
     \example attachedstyleproperties
     \keyword Qt Quick Controls - Attached Style Properties Example
     \title Qt Quick Controls - Attached Style Properties Example
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief Demonstrates use of QQuickAttachedPropertyPropagator.
 
-    \image qtquickcontrols2-attachedstyleproperties.png
+    \image qtquickcontrols-attachedstyleproperties.png
 
     The Attached Style Properties example is a simple application that shows
     how to use \l QQuickAttachedPropertyPropagator to propagate attached
diff --git a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
index 3320012cb4..e75da2d2ef 100644
--- a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter1")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter1")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
 
diff --git a/examples/quickcontrols/chattutorial/chapter1/chapter1.pro b/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
index 6b50809f20..c44cd50659 100644
--- a/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
+++ b/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
@@ -10,5 +10,5 @@ resources.prefix = chapter1/
 RESOURCES += resources \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter1
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter1
 INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
index c011336802..4bf3e834cd 100644
--- a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter2")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter2")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
 
diff --git a/examples/quickcontrols/chattutorial/chapter2/chapter2.pro b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
index 15429b7c89..00cf68b57c 100644
--- a/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
+++ b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
@@ -23,5 +23,5 @@ resources.prefix = chapter2/
 RESOURCES += resources \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter2
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter2
 INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
index 92545ec1d0..d46fd3455d 100644
--- a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter3")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter3")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
 
diff --git a/examples/quickcontrols/chattutorial/chapter3/chapter3.pro b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
index 42adc69fe9..9a4c5b5703 100644
--- a/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
+++ b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
@@ -25,5 +25,5 @@ resources.prefix = chapter3/
 RESOURCES += resources \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter3
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter3
 INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
index 024430a495..cf6985cfe8 100644
--- a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter4")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter4")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Sql)
 
diff --git a/examples/quickcontrols/chattutorial/chapter4/chapter4.pro b/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
index ae8141f7f1..baf2d319d5 100644
--- a/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
+++ b/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
@@ -30,5 +30,5 @@ resources.prefix = chapter4/
 RESOURCES += resources \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter4
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter4
 INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
index 657684fc34..0e72bc31f1 100644
--- a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter5")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter5")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Sql)
 
diff --git a/examples/quickcontrols/chattutorial/chapter5/chapter5.pro b/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
index 625642d7b5..3ba8d97ddc 100644
--- a/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
+++ b/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
@@ -32,5 +32,5 @@ resources.prefix = chapter5/
 RESOURCES += resources \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter5
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter5
 INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter1.png
index aa3c4bb5be..aa3c4bb5be 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter1.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2-listview-header.gif
index 17096519b0..17096519b0 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2-listview-header.gif
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2.png
index af25cff94e..af25cff94e 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-listview-header.gif
index 07eb93b191..07eb93b191 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-listview-header.gif
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-view-margins.png
index 1c8ffbf46e..1c8ffbf46e 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-view-margins.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3.gif
index 1763b1f3a5..1763b1f3a5 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3.gif
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-long-message.png
index b2f4c2adf8..b2f4c2adf8 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-long-message.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-message-timestamp.png
index ea75b1dce5..ea75b1dce5 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-message-timestamp.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4.gif
index dd47c4cbf8..dd47c4cbf8 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4.gif
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png
index 8b8f05faa1..8b8f05faa1 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-test.png
index 29e149df9f..29e149df9f 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-test.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material.png
index 23d744e7be..23d744e7be 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png
index 2aef535c39..2aef535c39 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal.png
index c18a341b42..c18a341b42 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png
index f15c7d7d76..f15c7d7d76 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-test.png
index b33fc74ea6..b33fc74ea6 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-test.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material.png
index 31833164d8..31833164d8 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png
index b4bd7e9f4f..b4bd7e9f4f 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal.png
index 09ed5ceb94..09ed5ceb94 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal.png
diff --git a/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols-chattutorial.qdoc
index 52228b900d..c34c20d508 100644
--- a/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols-chattutorial.qdoc
@@ -7,7 +7,7 @@
 \title Qt Quick Controls - Chat Tutorial
 \keyword Qt Quick Controls 2 - Chat Tutorial
 \brief Tutorial about writing a basic chat client using Qt Quick Controls.
-\ingroup qtquickcontrols2-examples
+\ingroup qtquickcontrols-examples
 
 This tutorial shows how to write a basic chat application using Qt Quick
 Controls. It will also explain how to integrate an SQL database into a Qt
@@ -193,7 +193,7 @@ It determines where the example is copied, on running "\c{make install}".
 
 Now we can build and run the application:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter1.png
+\borderedimage qtquickcontrols-chattutorial-chapter1.png
 
 \noautolist
 \generatelist examplefiles .*chapter1.*
@@ -270,7 +270,7 @@ The image will be \c 40 pixels wide and \c 40 pixels high. We'll base the
 height of the delegate on the image's height, so that we don't have any empty
 vertical space.
 
-\borderedimage qtquickcontrols2-chattutorial-chapter2.png
+\borderedimage qtquickcontrols-chattutorial-chapter2.png
 
 \generatelist examplefiles .*(chapter2|shared).*
 \generatelist exampleimages .*shared.*(Einstein|Hemingway|Gude)\.png
@@ -324,7 +324,7 @@ In chapter 2, we added a ListView below the header. If you run the application
 for that chapter, you'll see that the contents of the view can be scrolled over
 the top of the header:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter2-listview-header.gif
+\borderedimage qtquickcontrols-chattutorial-chapter2-listview-header.gif
 
 This is not that nice, especially if the text in the
 delegates is long enough that it reaches the text in the header. What we
@@ -344,7 +344,7 @@ usual, comes from the application style. Here it is in action:
 \printuntil }
 \printuntil }
 
-\borderedimage qtquickcontrols2-chattutorial-chapter3-listview-header.gif
+\borderedimage qtquickcontrols-chattutorial-chapter3-listview-header.gif
 
 It has no layout of its own, so we center the label within it ourselves.
 
@@ -445,7 +445,7 @@ After filling the width and height of its parent, we also set some margins on
 the view. This gives us a nice alignment with the placeholder text in the
 "compose message" field:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter3-view-margins.png
+\borderedimage qtquickcontrols-chattutorial-chapter3-view-margins.png
 
 Next, we set \l {ListView::}{displayMarginBeginning} and \l
 {ListView::}{displayMarginEnd}. These properties ensure that the delegates
@@ -497,7 +497,7 @@ does not go outside of the screen.
 
 Finally, the button is only enabled when there is actually a message to send.
 
-\borderedimage qtquickcontrols2-chattutorial-chapter3.gif
+\borderedimage qtquickcontrols-chattutorial-chapter3.gif
 
 \generatelist examplefiles .*(chapter3|shared).*
 \generatelist exampleimages .*shared.*(Einstein|Hemingway|Gude)\.png
@@ -678,7 +678,7 @@ timestamp that we want to display below every message:
 \printuntil }
 \printuntil }
 
-\borderedimage qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
+\borderedimage qtquickcontrols-chattutorial-chapter4-message-timestamp.png
 
 Now that we have a proper model, we can use its \c recipient role in the
 expression for the \c sentByMe property.
@@ -700,7 +700,7 @@ smaller value. However, in the image below, the message text is quite long, so
 the smaller value (the width of the view) is chosen, ensuring that the text
 stops at the opposite edge of the screen:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter4-long-message.png
+\borderedimage qtquickcontrols-chattutorial-chapter4-long-message.png
 
 In order to display the timestamp for each message that we discussed earlier,
 we use a Label. The date and time are formatted with
@@ -716,7 +716,7 @@ First, we call the invokable \c sendMessage() function of the model, which
 inserts a new row into the Conversations database table. Then, we clear the
 text field to make way for future input.
 
-\borderedimage qtquickcontrols2-chattutorial-chapter4.gif
+\borderedimage qtquickcontrols-chattutorial-chapter4.gif
 
 \generatelist examplefiles .*(chapter4|shared).*
 \generatelist exampleimages
@@ -732,12 +732,12 @@ So far, we've just been testing the application with the Basic style. If we
 run it with the \l {Material Style}, for example, we'll immediately see some issues.
 Here is the Contacts page:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-material-test.png
 
 The header text is black on a dark blue background, which is very difficult to
 read. The same thing occurs with the Conversations page:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-material-test.png
 
 The solution is to tell the toolbar that it should use the \e "Dark" theme, so
 that this information is propagated to its children, allowing them to switch
@@ -808,13 +808,13 @@ We'll make the same changes to \c ConversationPage.qml:
 
 Now both pages look correct:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-material.png
-\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-material.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-material.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-material.png
 
 Let's try out the Universal style:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
-\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-universal.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-universal.png
 
 No issues there. For a relatively simple application such as this one, there
 should be very few adjustments necessary when switching styles.
@@ -833,8 +833,8 @@ Theme=Dark
 
 Once this is done, build and run the application. This is what you should see:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
-\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png
 
 Both pages look fine. Now add an entry for the Universal style:
 
@@ -845,8 +845,8 @@ Theme=Dark
 
 After building and running the application, you should see these results:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
-\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png
 
 \generatelist examplefiles .*(chapter5|shared).*
 \generatelist exampleimages
diff --git a/examples/quickcontrols/contactlist/CMakeLists.txt b/examples/quickcontrols/contactlist/CMakeLists.txt
index ac7eccd9a7..b9ca81a90d 100644
--- a/examples/quickcontrols/contactlist/CMakeLists.txt
+++ b/examples/quickcontrols/contactlist/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/contactlist")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/contactlist")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick)
 
diff --git a/examples/quickcontrols/contactlist/contactlist.pro b/examples/quickcontrols/contactlist/contactlist.pro
index 101db15a3d..ceb99cbc47 100644
--- a/examples/quickcontrols/contactlist/contactlist.pro
+++ b/examples/quickcontrols/contactlist/contactlist.pro
@@ -24,5 +24,5 @@ QML_DESIGNER_IMPORT_PATH = $$PWD/designer
 OTHER_FILES += \
     designer/Backend/*.qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/contactlist
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/contactlist
 INSTALLS += target
diff --git a/examples/quickcontrols/contactlist/doc/images/qtquickcontrols2-contactlist.png b/examples/quickcontrols/contactlist/doc/images/qtquickcontrols-contactlist.png
index 9f1c306544..9f1c306544 100644
--- a/examples/quickcontrols/contactlist/doc/images/qtquickcontrols2-contactlist.png
+++ b/examples/quickcontrols/contactlist/doc/images/qtquickcontrols-contactlist.png
diff --git a/examples/quickcontrols/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc b/examples/quickcontrols/contactlist/doc/src/qtquickcontrols-contactlist.qdoc
index 3f88d9dc74..7decce2e05 100644
--- a/examples/quickcontrols/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
+++ b/examples/quickcontrols/contactlist/doc/src/qtquickcontrols-contactlist.qdoc
@@ -5,7 +5,7 @@
     \keyword Qt Quick Controls - Contact List
     \title Qt Quick Controls - Contact List
     \keyword Qt Quick Controls 2 - Contact List
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief A QML app using Qt Quick Controls and a C++ class that implements
     a simple contact list.
 
@@ -14,7 +14,7 @@
     For the declarative parts of the UI, .ui.qml files are used that can be edited
     visually in the Qt Quick Designer.
 
-    \image qtquickcontrols2-contactlist.png
+    \image qtquickcontrols-contactlist.png
 
     \section1 C++ Backend
 
diff --git a/examples/quickcontrols/eventcalendar/CMakeLists.txt b/examples/quickcontrols/eventcalendar/CMakeLists.txt
index 6c44eb82ec..dc2657eea8 100644
--- a/examples/quickcontrols/eventcalendar/CMakeLists.txt
+++ b/examples/quickcontrols/eventcalendar/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/eventcalendar")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/eventcalendar")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Sql)
 
diff --git a/examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols2-eventcalendar.qdoc b/examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols-eventcalendar.qdoc
index cc0b031b51..567ad12fa1 100644
--- a/examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols2-eventcalendar.qdoc
+++ b/examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols-eventcalendar.qdoc
@@ -5,7 +5,7 @@
     \example eventcalendar
     \keyword Qt Quick Controls - Event Calendar
     \title Qt Quick Controls - Event Calendar
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief A simple event calendar.
 
     \image qtquickcalendar-eventcalendar.png
diff --git a/examples/quickcontrols/flatstyle/CMakeLists.txt b/examples/quickcontrols/flatstyle/CMakeLists.txt
index 7ddb17c99b..b8de1b7adb 100644
--- a/examples/quickcontrols/flatstyle/CMakeLists.txt
+++ b/examples/quickcontrols/flatstyle/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/flatstyle")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/flatstyle")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2 Widgets)
 
diff --git a/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle-creator.png b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle-creator.png
index d77a7ffc4b..d77a7ffc4b 100644
--- a/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle-creator.png
+++ b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle-creator.png
diff --git a/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle.png b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle.png
index a43b4c39fa..a43b4c39fa 100644
--- a/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle.png
+++ b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle.png
diff --git a/examples/quickcontrols/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols/flatstyle/doc/src/qtquickcontrols-flatstyle.qdoc
index b077ef71c6..3f5a982b7d 100644
--- a/examples/quickcontrols/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
+++ b/examples/quickcontrols/flatstyle/doc/src/qtquickcontrols-flatstyle.qdoc
@@ -6,7 +6,7 @@
     \keyword Qt Quick Controls - Flat Style
     \title Qt Quick Controls - Flat Style
     \keyword Qt Quick Controls 2 - Flat Style
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief A QML app using Qt Quick Controls and a QML plugin
     with customized controls.
 
@@ -15,7 +15,7 @@
     declarative parts of the UI, \c .ui.qml files are used. These can be edited
     visually in Qt Quick Designer.
 
-    \borderedimage qtquickcontrols2-flatstyle.png
+    \borderedimage qtquickcontrols-flatstyle.png
 
     \section1 QML Plugin
 
@@ -58,7 +58,7 @@
     To edit the indicator of a switch in Qt Quick Designer we can open Switch.qml and then enter the implementation
     of the indicator called \c switchHandle using the combo box on the top next to the combo box for the open documents.
 
-    \borderedimage qtquickcontrols2-flatstyle-creator.png
+    \borderedimage qtquickcontrols-flatstyle-creator.png
 
     The application itself is just a simple form that allows the user to adjust a couple of parameters of the custom controls.
     The user can choose another main color, set the font to bold or underline, and increase the size of the controls by
diff --git a/examples/quickcontrols/flatstyle/flatstyle.pro b/examples/quickcontrols/flatstyle/flatstyle.pro
index c430a30af4..a111d5f2f1 100644
--- a/examples/quickcontrols/flatstyle/flatstyle.pro
+++ b/examples/quickcontrols/flatstyle/flatstyle.pro
@@ -19,5 +19,5 @@ RESOURCES += \
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH = $$PWD/imports
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/flatstyle
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/flatstyle
 INSTALLS += target
diff --git a/examples/quickcontrols/gallery/CMakeLists.txt b/examples/quickcontrols/gallery/CMakeLists.txt
index d2858c8c59..85d8189f9c 100644
--- a/examples/quickcontrols/gallery/CMakeLists.txt
+++ b/examples/quickcontrols/gallery/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/gallery")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/gallery")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2)
 
diff --git a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-drawer.png b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-drawer.png
index 0df43fbc4b..0df43fbc4b 100644
--- a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
+++ b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-drawer.png
diff --git a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-menu.png b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-menu.png
index 3bdaae942a..3bdaae942a 100644
--- a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-menu.png
+++ b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-menu.png
diff --git a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-welcome.png b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-welcome.png
index ded30381d2..ded30381d2 100644
--- a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
+++ b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-welcome.png
diff --git a/examples/quickcontrols/gallery/doc/src/qtquickcontrols2-gallery.qdoc b/examples/quickcontrols/gallery/doc/src/qtquickcontrols-gallery.qdoc
index 814768fe61..2fc1ed8f46 100644
--- a/examples/quickcontrols/gallery/doc/src/qtquickcontrols2-gallery.qdoc
+++ b/examples/quickcontrols/gallery/doc/src/qtquickcontrols-gallery.qdoc
@@ -6,24 +6,24 @@
     \keyword Qt Quick Controls - Gallery
     \title Qt Quick Controls - Gallery
     \keyword Qt Quick Controls 2 - Gallery
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief A gallery of controls.
 
     \raw HTML
     <div class="table"><table style="background:transparent; border:0px">
     <tr><td style="border:0px">
     \endraw
-    \image qtquickcontrols2-gallery-welcome.png
+    \image qtquickcontrols-gallery-welcome.png
     \caption Welcome Screen
     \raw HTML
     </td><td style="border:0px">
     \endraw
-    \image qtquickcontrols2-gallery-drawer.png
+    \image qtquickcontrols-gallery-drawer.png
     \caption Side Drawer
     \raw HTML
     </td><td style="border:0px">
     \endraw
-    \image qtquickcontrols2-gallery-menu.png
+    \image qtquickcontrols-gallery-menu.png
     \caption Options Menu
     \raw HTML
     </td></tr>
diff --git a/examples/quickcontrols/gallery/gallery.pro b/examples/quickcontrols/gallery/gallery.pro
index e1ac462a7c..42dc098425 100644
--- a/examples/quickcontrols/gallery/gallery.pro
+++ b/examples/quickcontrols/gallery/gallery.pro
@@ -64,5 +64,5 @@ RESOURCES += \
     ToolBar.qml \
     +Material/ToolBar.qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/gallery
 INSTALLS += target
diff --git a/examples/quickcontrols/imagine/automotive/CMakeLists.txt b/examples/quickcontrols/imagine/automotive/CMakeLists.txt
index 2f213f8e79..6769057db7 100644
--- a/examples/quickcontrols/imagine/automotive/CMakeLists.txt
+++ b/examples/quickcontrols/imagine/automotive/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/imagine/automotive")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/imagine/automotive")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2)
 
diff --git a/examples/quickcontrols/imagine/automotive/automotive.pro b/examples/quickcontrols/imagine/automotive/automotive.pro
index 890e63d84b..25a78e9d43 100644
--- a/examples/quickcontrols/imagine/automotive/automotive.pro
+++ b/examples/quickcontrols/imagine/automotive/automotive.pro
@@ -11,5 +11,5 @@ RESOURCES += \
     qml/qml.qrc \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/imagine/automotive
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/imagine/automotive
 INSTALLS += target
diff --git a/examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols2-automotive.png b/examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols-automotive.png
index 93ea28545b..93ea28545b 100644
--- a/examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols2-automotive.png
+++ b/examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols-automotive.png
diff --git a/examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc b/examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols-automotive.qdoc
index 6e228efd8e..81503200f3 100644
--- a/examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc
+++ b/examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols-automotive.qdoc
@@ -6,13 +6,13 @@
     \keyword Qt Quick Controls - Imagine Style Example: Automotive
     \title Qt Quick Controls - Imagine Style Example: Automotive
     \keyword Qt Quick Controls 2 - Imagine Style Example: Automotive
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief An automotive user interface using custom Imagine style assets.
 
     This example demonstrates how custom Imagine style assets can be used to
     style an automotive user interface.
 
-    \image qtquickcontrols2-automotive.png
+    \image qtquickcontrols-automotive.png
 
     \include examples-run.qdocinc
 */
diff --git a/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt b/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt
index a3f0bf5683..422319c1f5 100644
--- a/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt
+++ b/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/imagine/musicplayer")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/imagine/musicplayer")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2)
 
diff --git a/examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png b/examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols-musicplayer.png
index 25b6344f3e..25b6344f3e 100644
--- a/examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png
+++ b/examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols-musicplayer.png
diff --git a/examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc b/examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols-musicplayer.qdoc
index 742b412c96..fa36097225 100644
--- a/examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc
+++ b/examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols-musicplayer.qdoc
@@ -6,13 +6,13 @@
     \keyword Qt Quick Controls - Imagine Style Example: Music Player
     \title Qt Quick Controls - Imagine Style Example: Music Player
     \keyword Qt Quick Controls 2 - Imagine Style Example: Music Player
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief An audio player user interface using custom Imagine style assets.
 
     This example demonstrates how custom Imagine style assets
     can be used to style a user interface for an audio player application.
 
-    \image qtquickcontrols2-musicplayer.png
+    \image qtquickcontrols-musicplayer.png
 
     \omit
     The assets are generated from a Photoshop file: \e musicplayer.psd.
diff --git a/examples/quickcontrols/imagine/musicplayer/musicplayer.pro b/examples/quickcontrols/imagine/musicplayer/musicplayer.pro
index b1970ee905..67c716406e 100644
--- a/examples/quickcontrols/imagine/musicplayer/musicplayer.pro
+++ b/examples/quickcontrols/imagine/musicplayer/musicplayer.pro
@@ -12,5 +12,5 @@ RESOURCES += \
     qtquickcontrols2.conf \
     musicplayer.qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/imagine/musicplayer
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/imagine/musicplayer
 INSTALLS += target
diff --git a/examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols2-todolist.png b/examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols-todolist.png
index 5be7190a43..5be7190a43 100644
--- a/examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols2-todolist.png
+++ b/examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols-todolist.png
diff --git a/examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols2-todolist.qdoc b/examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols-todolist.qdoc
index 12e2d4fca5..43e1e9310e 100644
--- a/examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols2-todolist.qdoc
+++ b/examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols-todolist.qdoc
@@ -6,13 +6,13 @@
     \keyword Qt Quick Controls - To Do List
     \title Qt Quick Controls - To Do List
     \keyword Qt Quick Controls 2 - To Do List
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief To do list application for iOS.
 
     This example demonstrates how to create a simple to do list application for
     iOS using the \l {iOS Style}.
 
-    \image qtquickcontrols2-todolist.png
+    \image qtquickcontrols-todolist.png
 
     The example also shows how an in-memory SQL database can be created and
     used purely through QML, without needing C++, through the use of
diff --git a/examples/quickcontrols/ios/todolist/todolist.pro b/examples/quickcontrols/ios/todolist/todolist.pro
index d77d718a62..e144770728 100644
--- a/examples/quickcontrols/ios/todolist/todolist.pro
+++ b/examples/quickcontrols/ios/todolist/todolist.pro
@@ -38,5 +38,5 @@ RESOURCES += \
         ToggleCompletedTasksPage.qml \
         qmldir
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/ios/todolist
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/ios/todolist
 INSTALLS += target
diff --git a/examples/quickcontrols/sidepanel/CMakeLists.txt b/examples/quickcontrols/sidepanel/CMakeLists.txt
index 7a832eda13..e8f01ad6dd 100644
--- a/examples/quickcontrols/sidepanel/CMakeLists.txt
+++ b/examples/quickcontrols/sidepanel/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/sidepanel")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/sidepanel")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick)
 
@@ -30,8 +30,8 @@ qt_add_qml_module(sidepanelexample
         "images/qt-logo@3x.png"
         "images/qt-logo@4x.png"
         "qtquickcontrols2.conf"
-        "doc/images/qtquickcontrols2-sidepanel-landscape.png"
-        "doc/images/qtquickcontrols2-sidepanel-portrait.png"
+        "doc/images/qtquickcontrols-sidepanel-landscape.png"
+        "doc/images/qtquickcontrols-sidepanel-portrait.png"
 )
 
 target_link_libraries(sidepanelexample PUBLIC
diff --git a/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-landscape.png b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-landscape.png
index 86907591b2..86907591b2 100644
--- a/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-landscape.png
+++ b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-landscape.png
diff --git a/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-portrait.png b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-portrait.png
index cf1ed2efd0..cf1ed2efd0 100644
--- a/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-portrait.png
+++ b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-portrait.png
diff --git a/examples/quickcontrols/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc b/examples/quickcontrols/sidepanel/doc/src/qtquickcontrols-sidepanel.qdoc
index d5baa46eef..7029099d0f 100644
--- a/examples/quickcontrols/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc
+++ b/examples/quickcontrols/sidepanel/doc/src/qtquickcontrols-sidepanel.qdoc
@@ -6,7 +6,7 @@
     \keyword Qt Quick Controls - Side Panel
     \title Qt Quick Controls - Side Panel
     \keyword Qt Quick Controls 2 - Side Panel
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief A persistent side panel with Drawer.
 
     This example demonstrates how \l Drawer can be used as a persistent side
@@ -16,12 +16,12 @@
     <div class="table"><table style="background:transparent; border:0px">
     <tr><td style="border:0px">
     \endraw
-    \image qtquickcontrols2-sidepanel-portrait.png
+    \image qtquickcontrols-sidepanel-portrait.png
     \caption An interactive Drawer in portrait mode
     \raw HTML
     </td><td style="border:0px">
     \endraw
-    \image qtquickcontrols2-sidepanel-landscape.png
+    \image qtquickcontrols-sidepanel-landscape.png
     \caption A non-interactive Drawer in landscape mode
     \raw HTML
     </td></tr>
diff --git a/examples/quickcontrols/sidepanel/sidepanel.pro b/examples/quickcontrols/sidepanel/sidepanel.pro
index 3ae9cd8d6b..bbf118b361 100644
--- a/examples/quickcontrols/sidepanel/sidepanel.pro
+++ b/examples/quickcontrols/sidepanel/sidepanel.pro
@@ -6,8 +6,8 @@ SOURCES += \
     sidepanel.cpp
 
 RESOURCES += \
-    doc/images/qtquickcontrols2-sidepanel-landscape.png \
-    doc/images/qtquickcontrols2-sidepanel-portrait.png \
+    doc/images/qtquickcontrols-sidepanel-landscape.png \
+    doc/images/qtquickcontrols-sidepanel-portrait.png \
     images/qt-logo@2x.png \
     images/qt-logo@3x.png \
     images/qt-logo@4x.png \
@@ -15,5 +15,5 @@ RESOURCES += \
     qtquickcontrols2.conf \
     sidepanel.qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/sidepanel
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/sidepanel
 INSTALLS += target
diff --git a/examples/quickcontrols/swipetoremove/CMakeLists.txt b/examples/quickcontrols/swipetoremove/CMakeLists.txt
index 813f9f1e1f..ae445cbb7c 100644
--- a/examples/quickcontrols/swipetoremove/CMakeLists.txt
+++ b/examples/quickcontrols/swipetoremove/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
   set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/swipetoremove")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/swipetoremove")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml)
 
diff --git a/examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols2-swipetoremove.png b/examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols-swipetoremove.png
index 07a200fe92..07a200fe92 100644
--- a/examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols2-swipetoremove.png
+++ b/examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols-swipetoremove.png
diff --git a/examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc b/examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols-swipetoremove.qdoc
index a8f36912b2..32cb78f14a 100644
--- a/examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc
+++ b/examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols-swipetoremove.qdoc
@@ -6,14 +6,14 @@
     \keyword Qt Quick Controls - Swipe to Remove
     \title Qt Quick Controls - Swipe to Remove
     \keyword Qt Quick Controls 2 - Swipe to Remove
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief Demonstrates removal of list items by swipe gesture.
 
     This example demonstrates how \l SwipeDelegate can be used to implement
     removal of list items by swiping. This UI pattern is often used in touch
     user interfaces.
 
-    \image qtquickcontrols2-swipetoremove.png
+    \image qtquickcontrols-swipetoremove.png
 
     Each list item can be swiped to the left, which reveals a label on the
     \l {SwipeDelegate::swipe}{right} side indicating that the item will be
diff --git a/examples/quickcontrols/swipetoremove/swipetoremove.pro b/examples/quickcontrols/swipetoremove/swipetoremove.pro
index bcdb45cd45..e16ff8145f 100644
--- a/examples/quickcontrols/swipetoremove/swipetoremove.pro
+++ b/examples/quickcontrols/swipetoremove/swipetoremove.pro
@@ -6,5 +6,5 @@ SOURCES += swipetoremove.cpp
 
 RESOURCES += swipetoremove.qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/swipetoremove
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/swipetoremove
 INSTALLS += target
diff --git a/examples/quickcontrols/texteditor/CMakeLists.txt b/examples/quickcontrols/texteditor/CMakeLists.txt
index d978d82fce..3c2a461b02 100644
--- a/examples/quickcontrols/texteditor/CMakeLists.txt
+++ b/examples/quickcontrols/texteditor/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/texteditor")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/texteditor")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2 OPTIONAL_COMPONENTS Widgets)
 
diff --git a/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-desktop.jpg
index 259e0e8b07..259e0e8b07 100644
--- a/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg
+++ b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-desktop.jpg
diff --git a/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-touch.jpg
index 6a924cdf52..6a924cdf52 100644
--- a/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg
+++ b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-touch.jpg
diff --git a/examples/quickcontrols/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc b/examples/quickcontrols/texteditor/doc/src/qtquickcontrols-texteditor.qdoc
index d626a6a04e..b1d7e842cf 100644
--- a/examples/quickcontrols/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
+++ b/examples/quickcontrols/texteditor/doc/src/qtquickcontrols-texteditor.qdoc
@@ -5,7 +5,7 @@
     \keyword Qt Quick Controls - Text Editor
     \title Qt Quick Controls - Text Editor
     \keyword Qt Quick Controls 2 - Text Editor
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief A QML app using Qt Quick Controls and a C++ class to
     provide a fully-functional rich-text editor application.
 
@@ -16,7 +16,7 @@
 
     \section1 Desktop User Interface
 
-    \image qtquickcontrols2-texteditor-desktop.jpg
+    \image qtquickcontrols-texteditor-desktop.jpg
 
     The desktop version is a complete text editor with capabilities for formatting
     text, and opening and saving HTML and plain text files. It demonstrates the
@@ -49,7 +49,7 @@
 
     \section1 Touch User Interface
 
-    \image qtquickcontrols2-texteditor-touch.jpg
+    \image qtquickcontrols-texteditor-touch.jpg
 
     The touch user interface is a simplified version of the text editor. It is
     suitable for touch devices with limited screen size. The example uses
diff --git a/examples/quickcontrols/texteditor/texteditor.pro b/examples/quickcontrols/texteditor/texteditor.pro
index deb2457615..5f021865d3 100644
--- a/examples/quickcontrols/texteditor/texteditor.pro
+++ b/examples/quickcontrols/texteditor/texteditor.pro
@@ -18,5 +18,5 @@ OTHER_FILES += \
 RESOURCES += \
     texteditor.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/texteditor
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/texteditor
 INSTALLS += target
diff --git a/examples/quickcontrols/wearable/CMakeLists.txt b/examples/quickcontrols/wearable/CMakeLists.txt
index b61064d5d9..2963040b79 100644
--- a/examples/quickcontrols/wearable/CMakeLists.txt
+++ b/examples/quickcontrols/wearable/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/wearable")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/wearable")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2)
 
diff --git a/examples/quickcontrols/wearable/doc/images/qtquickcontrols2-wearable.png b/examples/quickcontrols/wearable/doc/images/qtquickcontrols-wearable.png
index c61055340c..c61055340c 100644
--- a/examples/quickcontrols/wearable/doc/images/qtquickcontrols2-wearable.png
+++ b/examples/quickcontrols/wearable/doc/images/qtquickcontrols-wearable.png
diff --git a/examples/quickcontrols/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc
index 8a1e021663..b6665003fd 100644
--- a/examples/quickcontrols/wearable/doc/src/qtquickcontrols2-wearable.qdoc
+++ b/examples/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc
@@ -6,10 +6,10 @@
     \keyword Qt Quick Controls - Wearable Demo
     \title Qt Quick Controls - Wearable Demo
     \keyword Qt Quick Controls 2 - Wearable Demo
-    \ingroup qtquickcontrols2-examples
+    \ingroup qtquickcontrols-examples
     \brief Demonstrates an application launcher designed for wearable devices.
 
-    \image qtquickcontrols2-wearable.png
+    \image qtquickcontrols-wearable.png
 
     The \e {Wearable Demo} consists of an application launcher and a collection
     of small and simple example applications aimed at wearable devices.
diff --git a/examples/quickcontrols/wearable/wearable.pro b/examples/quickcontrols/wearable/wearable.pro
index 8d55e44eaa..9ca5e53dfe 100644
--- a/examples/quickcontrols/wearable/wearable.pro
+++ b/examples/quickcontrols/wearable/wearable.pro
@@ -8,5 +8,5 @@ SOURCES += \
 RESOURCES += \
     wearable.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/wearable
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/wearable
 INSTALLS += target
diff --git a/src/labs/platform/doc/qtlabsplatform.qdocconf b/src/labs/platform/doc/qtlabsplatform.qdocconf
index 57fed9a08e..c6d70ad83b 100644
--- a/src/labs/platform/doc/qtlabsplatform.qdocconf
+++ b/src/labs/platform/doc/qtlabsplatform.qdocconf
@@ -1,5 +1,5 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols.qdocconf)
 
 project                 = QtLabsPlatform
 description             = Qt Labs Platform Reference Documentation
diff --git a/src/plugins/qmllint/quick/quicklintplugin.cpp b/src/plugins/qmllint/quick/quicklintplugin.cpp
index 29703c50db..2f06d98f20 100644
--- a/src/plugins/qmllint/quick/quicklintplugin.cpp
+++ b/src/plugins/qmllint/quick/quicklintplugin.cpp
@@ -236,7 +236,7 @@ void ControlsNativeValidatorPass::run(const QQmlSA::Element &element)
                     emitWarning(QStringLiteral("Not allowed to override \"%1\" because native "
                                                "styles cannot be customized: See "
                                                "https://doc-snapshots.qt.io/qt6-dev/"
-                                               "qtquickcontrols2-customize.html#customization-"
+                                               "qtquickcontrols-customize.html#customization-"
                                                "reference for more information.")
                                         .arg(propertyName),
                                 quickControlsNativeCustomize, element->sourceLocation());
diff --git a/src/quick/doc/images/qtquickcontrols2-gallery-welcome.png b/src/quick/doc/images/qtquickcontrols-gallery-welcome.png
index e69e7e46a7..e69e7e46a7 100644
--- a/src/quick/doc/images/qtquickcontrols2-gallery-welcome.png
+++ b/src/quick/doc/images/qtquickcontrols-gallery-welcome.png
diff --git a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
index e3c64a85a1..2e2fc05aac 100644
--- a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
+++ b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
@@ -308,7 +308,7 @@ developers to follow these tips:
 With this in place, your application's UI should scale depending
 on the display resolution on offer.
 
-\image qtquickcontrols2-gallery-welcome.png
+\image qtquickcontrols-gallery-welcome.png
 
 \section2 Related Information
 
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-applicationwindow-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-applicationwindow-wireframe.png
index f31378004a..f31378004a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-applicationwindow-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-applicationwindow-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-basic-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-basic-thumbnail.png
index e971a7aaec..e971a7aaec 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-basic-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-basic-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-basic.png b/src/quickcontrols/doc/images/qtquickcontrols-basic.png
index 099db17038..099db17038 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-basic.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-basic.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator-custom.png
index fefae223ef..fefae223ef 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.gif b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator.gif
index 653d200f3c..653d200f3c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.png b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator.png
index 4be09579bb..4be09579bb 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-button-custom.png
index 46d3e3eb5e..46d3e3eb5e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-flat.gif b/src/quickcontrols/doc/images/qtquickcontrols-button-flat.gif
index e2bd8b6fcf..e2bd8b6fcf 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-flat.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-flat.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-highlighted.gif b/src/quickcontrols/doc/images/qtquickcontrols-button-highlighted.gif
index 7de076d3d0..7de076d3d0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-highlighted.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-highlighted.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-icononly.png b/src/quickcontrols/doc/images/qtquickcontrols-button-icononly.png
index 9c8dd0f43f..9c8dd0f43f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-icononly.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-icononly.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-textbesideicon.png b/src/quickcontrols/doc/images/qtquickcontrols-button-textbesideicon.png
index 3dc64fb92b..3dc64fb92b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-textbesideicon.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-textbesideicon.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-textonly.png b/src/quickcontrols/doc/images/qtquickcontrols-button-textonly.png
index 737beb165f..737beb165f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-textonly.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-textonly.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-textundericon.png b/src/quickcontrols/doc/images/qtquickcontrols-button-textundericon.png
index 37c40c7c66..37c40c7c66 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-textundericon.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-textundericon.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button.gif b/src/quickcontrols/doc/images/qtquickcontrols-button.gif
index 10d626a331..10d626a331 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-calendarmodel.png b/src/quickcontrols/doc/images/qtquickcontrols-calendarmodel.png
index a017682326..a017682326 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-calendarmodel.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-calendarmodel.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-custom.png
index c6c3d1bcbd..c6c3d1bcbd 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-group.png b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-group.png
index d5a0d51be6..d5a0d51be6 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-group.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-group.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-tristate.gif b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-tristate.gif
index 56a1586795..56a1586795 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-tristate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-tristate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox.gif b/src/quickcontrols/doc/images/qtquickcontrols-checkbox.gif
index d70c0ee4b9..d70c0ee4b9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkbox.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate-custom.png
index c0dd06892c..c0dd06892c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-tristate.gif b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate-tristate.gif
index 8d058d6c54..8d058d6c54 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-tristate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate-tristate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate.gif
index da3fab98a4..da3fab98a4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-combobox-custom.png
index 4f7206dc78..4f7206dc78 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-combobox-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-delegate.png b/src/quickcontrols/doc/images/qtquickcontrols-combobox-delegate.png
index cf31064895..cf31064895 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-delegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-combobox-delegate.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-popup.png b/src/quickcontrols/doc/images/qtquickcontrols-combobox-popup.png
index cf31064895..cf31064895 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-popup.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-combobox-popup.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-combobox.gif b/src/quickcontrols/doc/images/qtquickcontrols-combobox.gif
index 966a2d4ae5..966a2d4ae5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-combobox.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-combobox.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-control.png b/src/quickcontrols/doc/images/qtquickcontrols-control.png
index 0f004a89dd..0f004a89dd 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-control.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-control.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-control.svg b/src/quickcontrols/doc/images/qtquickcontrols-control.svg
index 4b2057d197..62745cc35e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-control.svg
+++ b/src/quickcontrols/doc/images/qtquickcontrols-control.svg
@@ -15,8 +15,8 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="qtquickcontrols2-control.svg"
-   inkscape:export-filename="/home/jpnurmi/Projects/qt-dev/qtquickcontrols2/src/imports/controls/doc/images/qtquickcontrols2-control.png"
+   sodipodi:docname="qtquickcontrols-control.svg"
+   inkscape:export-filename="/home/jpnurmi/Projects/qt-dev/qtquickcontrols2/src/imports/controls/doc/images/qtquickcontrols-control.png"
    inkscape:export-xdpi="192"
    inkscape:export-ydpi="192">
   <defs
@@ -602,7 +602,7 @@
          id="flowPara4144"
          style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a">Background</flowPara><flowPara
          id="flowPara4146"
-         style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a"> </flowPara></flowRoot>    <rect
+         style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a"> </flowPara></flowRoot>    <rect
        style="fill:#d7e3f4;fill-opacity:1;stroke:none;stroke-width:22.32431984;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58381503"
        id="rect4148"
        width="360"
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-customize-buttons.png b/src/quickcontrols/doc/images/qtquickcontrols-customize-buttons.png
index 551e8a0cf7..551e8a0cf7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-customize-buttons.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-customize-buttons.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow-layout.png b/src/quickcontrols/doc/images/qtquickcontrols-dayofweekrow-layout.png
index 3a816e85a9..3a816e85a9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow-layout.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dayofweekrow-layout.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow.png b/src/quickcontrols/doc/images/qtquickcontrols-dayofweekrow.png
index 7548e22147..7548e22147 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dayofweekrow.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-delaybutton-custom.png
index a7bd7c19d8..a7bd7c19d8 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-delaybutton-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton.gif b/src/quickcontrols/doc/images/qtquickcontrols-delaybutton.gif
index 16a198f9cb..16a198f9cb 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-delaybutton.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-dial-custom.png
index 6312c99933..6312c99933 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-handle.png b/src/quickcontrols/doc/images/qtquickcontrols-dial-handle.png
index 9e22b2e709..9e22b2e709 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-handle.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-handle.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputMode.svgz b/src/quickcontrols/doc/images/qtquickcontrols-dial-inputMode.svgz
index 005ab7b331..005ab7b331 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputMode.svgz
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-inputMode.svgz
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputmode.png b/src/quickcontrols/doc/images/qtquickcontrols-dial-inputmode.png
index 5bbc41a49c..5bbc41a49c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputmode.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-inputmode.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-no-wrap.gif b/src/quickcontrols/doc/images/qtquickcontrols-dial-no-wrap.gif
index 24f6790b6d..24f6790b6d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-no-wrap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-no-wrap.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-wrap.gif b/src/quickcontrols/doc/images/qtquickcontrols-dial-wrap.gif
index cfb1fb5b10..cfb1fb5b10 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-wrap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-wrap.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial.png b/src/quickcontrols/doc/images/qtquickcontrols-dial.png
index 71c54113b7..71c54113b7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png b/src/quickcontrols/doc/images/qtquickcontrols-dialogbuttonbox-attached.png
index c17f38ac0c..c17f38ac0c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dialogbuttonbox-attached.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox.png b/src/quickcontrols/doc/images/qtquickcontrols-dialogbuttonbox.png
index 33b5f45f4f..33b5f45f4f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dialogbuttonbox.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-drawer-expanded-wireframe.png
index 0c92f86587..0c92f86587 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-drawer-expanded-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-drawer-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-drawer-wireframe.png
index 74806f17b7..74806f17b7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-drawer-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-drawer-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-drawer.gif b/src/quickcontrols/doc/images/qtquickcontrols-drawer.gif
index 736f34f66f..736f34f66f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-drawer.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-drawer.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-frame-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-frame-custom.png
index f628b20c20..f628b20c20 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-frame-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-frame-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-frame.png b/src/quickcontrols/doc/images/qtquickcontrols-frame.png
index e3cb31dc71..e3cb31dc71 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-frame.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-frame.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-palettes.png b/src/quickcontrols/doc/images/qtquickcontrols-fusion-palettes.png
index d806116167..d806116167 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-palettes.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-fusion-palettes.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-fusion-thumbnail.png
index c270c6efba..c270c6efba 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-fusion-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-violet.png b/src/quickcontrols/doc/images/qtquickcontrols-fusion-violet.png
index 99e5b59786..99e5b59786 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-violet.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-fusion-violet.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-fusion.png b/src/quickcontrols/doc/images/qtquickcontrols-fusion.png
index 7119ef225d..7119ef225d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-fusion.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-fusion.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-checkable.png b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-checkable.png
index 820ad79c80..820ad79c80 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-checkable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-checkable.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-custom.png
index 029679ced0..029679ced0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-label.png b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-label.png
index c26795a7a7..c26795a7a7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-label.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-label.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox.png b/src/quickcontrols/doc/images/qtquickcontrols-groupbox.png
index ea2f9ea5c5..ea2f9ea5c5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-groupbox.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-4x.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-4x.png
index bab99a5e55..bab99a5e55 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-4x.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-4x.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-inset-boundaries.png
index c42df81edc..c42df81edc 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-inset-boundaries.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-inset.png
index 0627d08590..0627d08590 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-inset.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-resized-padding.png
index 0a606c9926..0a606c9926 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-resized-padding.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-resized-stretchable.png
index 9598b13a1c..9598b13a1c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-resized-stretchable.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-size.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-size.png
index db6453758f..db6453758f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-size.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-size.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch.svgz b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch.svgz
index 5a1a1094d1..5a1a1094d1 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch.svgz
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch.svgz
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization-dark.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-customization-dark.png
index 144ac97c87..144ac97c87 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-customization-dark.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization.svgz b/src/quickcontrols/doc/images/qtquickcontrols-imagine-customization.svgz
index fb8305638b..fb8305638b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization.svgz
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-customization.svgz
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-thumbnail.png
index ecf2bb163d..ecf2bb163d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine.png
index ffe2c267b2..ffe2c267b2 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-ios-dark.png b/src/quickcontrols/doc/images/qtquickcontrols-ios-dark.png
index fd4609c729..fd4609c729 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-ios-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-ios-dark.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-ios-light.png b/src/quickcontrols/doc/images/qtquickcontrols-ios-light.png
index f990078ddf..f990078ddf 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-ios-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-ios-light.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate-custom.png
index 35f8892f16..35f8892f16 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate.gif
index dccb6efcdb..dccb6efcdb 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.png b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate.png
index 7242f343a0..7242f343a0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-label-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-label-custom.png
index 5730ff23bf..5730ff23bf 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-label-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-label-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-label.png b/src/quickcontrols/doc/images/qtquickcontrols-label.png
index 0bafcf8602..0bafcf8602 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-label.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-label.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-macos-dark.png b/src/quickcontrols/doc/images/qtquickcontrols-macos-dark.png
index 97d8a5a4e7..97d8a5a4e7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-macos-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-macos-dark.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-macos-light.png b/src/quickcontrols/doc/images/qtquickcontrols-macos-light.png
index 4a598ad498..4a598ad498 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-macos-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-macos-light.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-macos-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-macos-thumbnail.png
index 57fd98d63a..57fd98d63a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-macos-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-macos-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-accent.png b/src/quickcontrols/doc/images/qtquickcontrols-material-accent.png
index a85afc68ed..a85afc68ed 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-accent.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-accent.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-attributes.png b/src/quickcontrols/doc/images/qtquickcontrols-material-attributes.png
index bb54071d79..bb54071d79 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-attributes.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-attributes.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-background.png b/src/quickcontrols/doc/images/qtquickcontrols-material-background.png
index 62028f523c..62028f523c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-background.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-background.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-dark.png b/src/quickcontrols/doc/images/qtquickcontrols-material-dark.png
index f6e45b3b1c..f6e45b3b1c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-dark.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-elevation.png b/src/quickcontrols/doc/images/qtquickcontrols-material-elevation.png
index d152f14529..d152f14529 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-elevation.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-elevation.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-foreground.png b/src/quickcontrols/doc/images/qtquickcontrols-material-foreground.png
index 0d0e1b651a..0d0e1b651a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-foreground.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-foreground.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-light.png b/src/quickcontrols/doc/images/qtquickcontrols-material-light.png
index c9abe2cb8b..c9abe2cb8b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-light.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-purple.png b/src/quickcontrols/doc/images/qtquickcontrols-material-purple.png
index b955736b0b..b955736b0b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-purple.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-purple.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-theme.png b/src/quickcontrols/doc/images/qtquickcontrols-material-theme.png
index 1d09a82580..1d09a82580 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-theme.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-theme.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-material-thumbnail.png
index d758ff1803..d758ff1803 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-dense.png b/src/quickcontrols/doc/images/qtquickcontrols-material-variant-dense.png
index 02f39b7885..02f39b7885 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-dense.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-variant-dense.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-normal.png b/src/quickcontrols/doc/images/qtquickcontrols-material-variant-normal.png
index c1e366c531..c1e366c531 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-normal.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-variant-normal.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menu-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-menu-custom.png
index 922bf591b5..922bf591b5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menu-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menu-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menu.gif b/src/quickcontrols/doc/images/qtquickcontrols-menu.gif
index 93a873a33a..93a873a33a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menu.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menu.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menu.png b/src/quickcontrols/doc/images/qtquickcontrols-menu.png
index 926c33eed2..926c33eed2 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menu.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menu.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menubar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-menubar-custom.png
index b6007e466d..b6007e466d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menubar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menubar-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menubar.png b/src/quickcontrols/doc/images/qtquickcontrols-menubar.png
index 873b7a1960..873b7a1960 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menubar.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menubar.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-menuseparator-custom.png
index 78635b9c88..78635b9c88 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menuseparator-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator.png b/src/quickcontrols/doc/images/qtquickcontrols-menuseparator.png
index 35307817f6..35307817f6 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menuseparator.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid-layout.png b/src/quickcontrols/doc/images/qtquickcontrols-monthgrid-layout.png
index f67501a751..f67501a751 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid-layout.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-monthgrid-layout.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid.png b/src/quickcontrols/doc/images/qtquickcontrols-monthgrid.png
index a2f9a47f70..a2f9a47f70 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-monthgrid.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-page-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-page-wireframe.png
index f612c243c4..f612c243c4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-page-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-page-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator-custom.png
index a767a51aa0..a767a51aa0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-delegate.png b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator-delegate.png
index 95acde70cf..95acde70cf 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-delegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator-delegate.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator.png b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator.png
index e2a0a157f6..e2a0a157f6 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-pane-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-pane-custom.png
index 03a0369f56..03a0369f56 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-pane-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-pane-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-pane.png b/src/quickcontrols/doc/images/qtquickcontrols-pane.png
index 3801cc3efb..3801cc3efb 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-pane.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-pane.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-popup-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-popup-custom.png
index cb7813d387..cb7813d387 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-popup-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-popup-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-popup-settings.png b/src/quickcontrols/doc/images/qtquickcontrols-popup-settings.png
index 5122158ef4..5122158ef4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-popup-settings.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-popup-settings.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-popup-transformorigin.png b/src/quickcontrols/doc/images/qtquickcontrols-popup-transformorigin.png
index 16d2617786..16d2617786 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-popup-transformorigin.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-popup-transformorigin.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-popup.png b/src/quickcontrols/doc/images/qtquickcontrols-popup.png
index 8fc424a854..8fc424a854 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-popup.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-popup.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-popup.svg b/src/quickcontrols/doc/images/qtquickcontrols-popup.svg
index e39f3dce21..8afa57c70c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-popup.svg
+++ b/src/quickcontrols/doc/images/qtquickcontrols-popup.svg
@@ -15,8 +15,8 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="qtquickcontrols2-control.svg"
-   inkscape:export-filename="/home/jpnurmi/Projects/qt-dev/qtquickcontrols2/src/imports/controls/doc/images/qtquickcontrols2-control.png"
+   sodipodi:docname="qtquickcontrols-control.svg"
+   inkscape:export-filename="/home/jpnurmi/Projects/qt-dev/qtquickcontrols2/src/imports/controls/doc/images/qtquickcontrols-control.png"
    inkscape:export-xdpi="192"
    inkscape:export-ydpi="192">
   <defs
@@ -482,7 +482,7 @@
          id="flowPara4144"
          style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a">Background</flowPara><flowPara
          id="flowPara4146"
-         style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a"> </flowPara></flowRoot>    <rect
+         style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a"> </flowPara></flowRoot>    <rect
        style="fill:#d7e3f4;fill-opacity:1;stroke:none;stroke-width:22.32431984;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58381503"
        id="rect4148"
        width="360"
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-progressbar-custom.png
index 9d73df2c25..9d73df2c25 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-progressbar-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-indeterminate.gif b/src/quickcontrols/doc/images/qtquickcontrols-progressbar-indeterminate.gif
index d6756d16fd..d6756d16fd 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-indeterminate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-progressbar-indeterminate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar.gif b/src/quickcontrols/doc/images/qtquickcontrols-progressbar.gif
index 49af5f45a1..49af5f45a1 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-progressbar.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-radiobutton-custom.png
index 5c85179f70..5c85179f70 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-radiobutton-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton.gif b/src/quickcontrols/doc/images/qtquickcontrols-radiobutton.gif
index 4cbf3ed9d6..4cbf3ed9d6 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-radiobutton.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-radiodelegate-custom.png
index 7d32699bf9..7d32699bf9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-radiodelegate-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols-radiodelegate.gif
index b6afd6fe6a..b6afd6fe6a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-radiodelegate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-rangeslider-custom.png
index 47379a300d..47379a300d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-rangeslider-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider.gif b/src/quickcontrols/doc/images/qtquickcontrols-rangeslider.gif
index db565b0a93..db565b0a93 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-rangeslider.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-roundbutton.png b/src/quickcontrols/doc/images/qtquickcontrols-roundbutton.png
index 4dce37f239..4dce37f239 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-roundbutton.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-roundbutton.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-custom.png
index 690bc8beef..690bc8beef 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-non-attached.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-non-attached.png
index eba363dda2..eba363dda2 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-non-attached.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-non-attached.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-nosnap.gif b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-nosnap.gif
index f61ac5b46a..f61ac5b46a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-nosnap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-nosnap.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snapalways.gif b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-snapalways.gif
index 438d4a3318..438d4a3318 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snapalways.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-snapalways.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-snaponrelease.gif
index c2fa67b027..c2fa67b027 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-snaponrelease.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar.gif b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar.gif
index ed3ab607d9..ed3ab607d9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator-custom.png
index b1183bc52a..b1183bc52a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-non-attached.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator-non-attached.png
index a61e048743..a61e048743 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-non-attached.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator-non-attached.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator.gif b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator.gif
index 73007820f8..73007820f8 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollview-custom.png
index 8f4bd92863..8f4bd92863 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollview-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollview-wireframe.png
index 8a39056aa9..8a39056aa9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollview-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollview.png
index 1a4039e1fd..1a4039e1fd 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollview.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-selectionrectangle.png b/src/quickcontrols/doc/images/qtquickcontrols-selectionrectangle.png
index 69e47b2909..69e47b2909 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-selectionrectangle.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-selectionrectangle.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-slider-custom.png
index dbbacb343f..dbbacb343f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider-handle.png b/src/quickcontrols/doc/images/qtquickcontrols-slider-handle.png
index 5450d57480..5450d57480 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider-handle.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider-handle.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider-nosnap.gif b/src/quickcontrols/doc/images/qtquickcontrols-slider-nosnap.gif
index ab233c5b93..ab233c5b93 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider-nosnap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider-nosnap.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider-snapalways.gif b/src/quickcontrols/doc/images/qtquickcontrols-slider-snapalways.gif
index 8eb4011fb5..8eb4011fb5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider-snapalways.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider-snapalways.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider-snaponrelease.gif b/src/quickcontrols/doc/images/qtquickcontrols-slider-snaponrelease.gif
index f3b1d5c7a9..f3b1d5c7a9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider-snaponrelease.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider-snaponrelease.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider.gif b/src/quickcontrols/doc/images/qtquickcontrols-slider.gif
index 2ee56334e0..2ee56334e0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-custom.png
index d1e883fc56..d1e883fc56 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-double.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-double.png
index d3f5876c4a..d3f5876c4a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-double.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-double.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-down.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-down.png
index 1d5dcf7b44..1d5dcf7b44 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-down.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-down.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-textual.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-textual.png
index 5513d6e67d..5513d6e67d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-textual.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-textual.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-up.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-up.png
index 1ee1c4798e..1ee1c4798e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-up.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-up.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox.png
index 835bb1d67d..835bb1d67d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-splitview-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-splitview-custom.png
index da820ccafe..da820ccafe 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-splitview-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-splitview-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-stackview-custom.png
index 5ee6049e74..5ee6049e74 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-pop.gif b/src/quickcontrols/doc/images/qtquickcontrols-stackview-pop.gif
index 1971c2e004..1971c2e004 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-pop.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-pop.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-push.gif b/src/quickcontrols/doc/images/qtquickcontrols-stackview-push.gif
index 0218cc0f2f..0218cc0f2f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-push.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-push.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-replace.gif b/src/quickcontrols/doc/images/qtquickcontrols-stackview-replace.gif
index 63a6b2b4b5..63a6b2b4b5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-replace.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-replace.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-unwind.gif b/src/quickcontrols/doc/images/qtquickcontrols-stackview-unwind.gif
index 28c051d866..28c051d866 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-unwind.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-unwind.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-visible.png b/src/quickcontrols/doc/images/qtquickcontrols-stackview-visible.png
index d937b417e6..d937b417e6 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-visible.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-visible.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-stackview-wireframe.png
index f28b5c67de..f28b5c67de 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-styles.png b/src/quickcontrols/doc/images/qtquickcontrols-styles.png
index 992dd47eba..992dd47eba 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-styles.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-styles.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-behind.gif b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-behind.gif
index 97d6a59277..97d6a59277 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-behind.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-behind.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-custom.png
index 5813b73cf4..5813b73cf4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-leading-trailing.gif
index 0641bd1400..0641bd1400 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-leading-trailing.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate.gif
index 86c380b7b3..86c380b7b3 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-indicator.png b/src/quickcontrols/doc/images/qtquickcontrols-swipeview-indicator.png
index 998ec9f7c9..998ec9f7c9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-indicator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipeview-indicator.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-swipeview-wireframe.png
index 3cc2b83c4b..3cc2b83c4b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipeview-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview.gif b/src/quickcontrols/doc/images/qtquickcontrols-swipeview.gif
index 4af26c1058..4af26c1058 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipeview.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switch-checked.png b/src/quickcontrols/doc/images/qtquickcontrols-switch-checked.png
index 7a0cde1bad..7a0cde1bad 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switch-checked.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switch-checked.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switch-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-switch-custom.png
index 6d535ef96f..6d535ef96f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switch-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switch-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switch.gif b/src/quickcontrols/doc/images/qtquickcontrols-switch.gif
index 5f956304a0..5f956304a0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switch.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switch.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switch.png b/src/quickcontrols/doc/images/qtquickcontrols-switch.png
index 7f613f3343..7f613f3343 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switch.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switch.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-switchdelegate-custom.png
index f5337e2c83..f5337e2c83 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switchdelegate-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols-switchdelegate.gif
index 950b10731f..950b10731f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switchdelegate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-custom.png
index 8c8e4accd8..8c8e4accd8 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-explicit.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-explicit.png
index b1de5f715e..b1de5f715e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-explicit.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-explicit.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-flickable.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-flickable.png
index 0c253f82d5..0c253f82d5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-flickable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-flickable.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-wireframe.png
index 35a64ae285..35a64ae285 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.gif b/src/quickcontrols/doc/images/qtquickcontrols-tabbar.gif
index 31db1f9e7c..31db1f9e7c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbar.png
index 9f113497db..9f113497db 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbutton.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbutton.png
index 3df2f53147..3df2f53147 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbutton.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbutton.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textarea-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-textarea-custom.png
index 6220a13f39..6220a13f39 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textarea-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textarea-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textarea-scrollable.png b/src/quickcontrols/doc/images/qtquickcontrols-textarea-scrollable.png
index ae868a27da..ae868a27da 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textarea-scrollable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textarea-scrollable.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textarea.png b/src/quickcontrols/doc/images/qtquickcontrols-textarea.png
index fc221bd757..fc221bd757 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textarea.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textarea.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-textfield-custom.png
index 9102317065..9102317065 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textfield-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-disabled.png b/src/quickcontrols/doc/images/qtquickcontrols-textfield-disabled.png
index b143d21053..b143d21053 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-disabled.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textfield-disabled.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-focused.png b/src/quickcontrols/doc/images/qtquickcontrols-textfield-focused.png
index de7f9599c9..de7f9599c9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-focused.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textfield-focused.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-normal.png b/src/quickcontrols/doc/images/qtquickcontrols-textfield-normal.png
index 4229c706ad..4229c706ad 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-normal.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textfield-normal.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textfield.png b/src/quickcontrols/doc/images/qtquickcontrols-textfield.png
index a008383a00..a008383a00 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textfield.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textfield.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-toolbar-custom.png
index 425e5f8c64..425e5f8c64 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolbar-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolbar.png b/src/quickcontrols/doc/images/qtquickcontrols-toolbar.png
index e5a33eee9a..e5a33eee9a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolbar.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolbar.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-toolbutton-custom.png
index b78269d087..b78269d087 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolbutton-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton.png b/src/quickcontrols/doc/images/qtquickcontrols-toolbutton.png
index 610c1a7cb4..610c1a7cb4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolbutton.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-toolseparator-custom.png
index 6703eeba53..6703eeba53 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolseparator-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator.png b/src/quickcontrols/doc/images/qtquickcontrols-toolseparator.png
index 88ced12361..88ced12361 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolseparator.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-delay.png b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-delay.png
index 59813835b4..59813835b4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-delay.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-delay.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-hover.png b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-hover.png
index 62a9cf844b..62a9cf844b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-hover.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-hover.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-pressandhold.png b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-pressandhold.png
index 62a9cf844b..62a9cf844b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-pressandhold.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-pressandhold.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-slider.png b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-slider.png
index a15e723a02..a15e723a02 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-slider.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-slider.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip.png b/src/quickcontrols/doc/images/qtquickcontrols-tooltip.png
index 4238d52a77..4238d52a77 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tooltip.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-treeviewdelegate.png b/src/quickcontrols/doc/images/qtquickcontrols-treeviewdelegate.png
index 4d1e74f5dd..4d1e74f5dd 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-treeviewdelegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-treeviewdelegate.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-custom.png
index bbfa9b0cef..bbfa9b0cef 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-delegate.png b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-delegate.png
index a28da93e46..a28da93e46 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-delegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-delegate.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-wrap.gif b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-wrap.gif
index 8f59eedcc7..8f59eedcc7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-wrap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-wrap.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler.png b/src/quickcontrols/doc/images/qtquickcontrols-tumbler.png
index 38339dfa25..38339dfa25 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tumbler.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-accent.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-accent.png
index e1d74f7a91..e1d74f7a91 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-accent.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-accent.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-attributes.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-attributes.png
index 7a7ef347fc..7a7ef347fc 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-attributes.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-attributes.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-background.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-background.png
index 4f1bfbd284..4f1bfbd284 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-background.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-background.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-button.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-button.png
index 6c764ec97e..6c764ec97e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-button.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-button.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-dark.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-dark.png
index 952651dca0..952651dca0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-dark.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-foreground.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-foreground.png
index b0ecf23a9e..b0ecf23a9e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-foreground.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-foreground.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-light.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-light.png
index e65447a4c5..e65447a4c5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-light.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-theme.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-theme.png
index d128134636..d128134636 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-theme.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-theme.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-thumbnail.png
index db7fe5b076..db7fe5b076 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-violet.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-violet.png
index ec459457a8..ec459457a8 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-violet.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-violet.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn-layout.png b/src/quickcontrols/doc/images/qtquickcontrols-weeknumbercolumn-layout.png
index 19fbeefd49..19fbeefd49 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn-layout.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-weeknumbercolumn-layout.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn.png b/src/quickcontrols/doc/images/qtquickcontrols-weeknumbercolumn.png
index a73cccd544..a73cccd544 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-weeknumbercolumn.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-windows-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-windows-thumbnail.png
index 15408d3bba..15408d3bba 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-windows-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-windows-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-windows.png b/src/quickcontrols/doc/images/qtquickcontrols-windows.png
index 324a03412d..324a03412d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-windows.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-windows.png
diff --git a/src/quickcontrols/doc/qtquickcontrols.qdocconf b/src/quickcontrols/doc/qtquickcontrols.qdocconf
index 285141b14b..c7f886ec39 100644
--- a/src/quickcontrols/doc/qtquickcontrols.qdocconf
+++ b/src/quickcontrols/doc/qtquickcontrols.qdocconf
@@ -1,8 +1,8 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols.qdocconf)
 include(manifest-meta.qdocconf)
 
-moduleheader            = QtQuickControls2
+moduleheader            = QtQuickControls
 
 project                 = QtQuickControls
 description             = Qt Quick Controls Reference Documentation
@@ -34,21 +34,21 @@ depends = qtcore qtgui qtdoc qtqml qtqmlmodels qtquick qtsql qtwidgets qtlabspla
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Note: paths passed to \example command must contain the parent directory, e.g.
 # \example controls/tabs
-exampledirs += ../../../examples/quickcontrols2 \
-               ../../quicktemplates2 \
+exampledirs += ../../../examples/quickcontrols \
+               ../../quicktemplates \
                ../ \
                snippets
 
 examples.fileextensions += "*.conf"
 
-examplesinstallpath = quickcontrols2
+examplesinstallpath = quickcontrols
 
-headerdirs += ../../quicktemplates2 \
+headerdirs += ../../quicktemplates \
               ..
 
-sourcedirs += ../../quicktemplates2 \
+sourcedirs += ../../quicktemplates \
               .. \
-              ../../quicktemplates2/doc/src \
+              ../../quicktemplates/doc/src \
               src
 
 # Exclude .qml files from the doc build to prevent conflicts with .qml files
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-action.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-action.qml
index 4f50ba46d7..4f50ba46d7 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-action.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-action.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-busyindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml
index 3eefb11110..3eefb11110 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml
index cf197a18ae..cf197a18ae 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-icononly.qml
index 027ecb4ed8..027ecb4ed8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-icononly.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-icononly.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textbesideicon.qml
index c2dce1d99a..c2dce1d99a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textbesideicon.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textonly.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textonly.qml
index 4b12b8acc2..4b12b8acc2 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textonly.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textonly.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-calendarmodel.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-calendarmodel.qml
index af2777b123..af2777b123 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-calendarmodel.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-calendarmodel.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml
index a7421af39c..a7421af39c 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-group.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-group.qml
index 0d676be397..0d676be397 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-group.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-group.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml
index a4f4b84d18..a4f4b84d18 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-accepted.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-accepted.qml
index 6f5eff6b55..6f5eff6b55 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-accepted.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-accepted.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml
index 2481f6dcf8..2481f6dcf8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-find.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-find.qml
index 2513002264..2513002264 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-find.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-find.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-popup.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-popup.qml
index 8c636a3d5c..8c636a3d5c 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-popup.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-popup.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-textat.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-textat.qml
index 8910ba3237..8910ba3237 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-textat.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-textat.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-valuerole.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-valuerole.qml
index 8d32201799..8d32201799 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-valuerole.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-valuerole.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow-layout.qml
index 2358f252e0..2358f252e0 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow-layout.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow-layout.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow.qml
index 2188b4ccf1..2188b4ccf1 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-delaybutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml
index a8b17ab36a..a8b17ab36a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dial-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml
index f1efc22c4d..f1efc22c4d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dial-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modal.qml
index ba1580a4df..ba1580a4df 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modal.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modal.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modeless.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modeless.qml
index d70c9921e2..d70c9921e2 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modeless.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modeless.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog.qml
index 4d774c4e10..4d774c4e10 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox-attached.qml
index ef85771bfd..ef85771bfd 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox-attached.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox.qml
index 13a927520f..13a927520f 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-frame-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml
index de3e1a2327..de3e1a2327 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-frame-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-frame.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-frame.qml
index fcb128db54..fcb128db54 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-frame.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-frame.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-checkable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-checkable.qml
index 0ab0822aca..0ab0822aca 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-checkable.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml
index 34d9df8a63..34d9df8a63 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox.qml
index 98282ed348..98282ed348 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-headerview-simple.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-headerview-simple.qml
index 6f2e5fac45..6f2e5fac45 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-headerview-simple.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-headerview-simple.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml
index 3212cbc762..3212cbc762 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml
index 49c12b1dff..49c12b1dff 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-label-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml
index 79bc9d3c13..79bc9d3c13 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-label-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-label.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-label.qml
index 7ca63d0251..7ca63d0251 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-label.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-label.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-accent.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-accent.qml
index 71a84fac82..71a84fac82 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-accent.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-accent.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-background.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-background.qml
index f9f1dd0915..f9f1dd0915 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-background.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-background.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-elevation.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-elevation.qml
index 4f8b27e7ef..4f8b27e7ef 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-elevation.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-elevation.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-foreground.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-foreground.qml
index b4a7743c16..b4a7743c16 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-foreground.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-foreground.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-theme.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-theme.qml
index 4e5bf81cd9..4e5bf81cd9 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-theme.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-theme.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-variant.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-variant.qml
index ad824f1e34..ad824f1e34 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-variant.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-variant.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml
index f38d5f370a..f38d5f370a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-instantiator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-instantiator.qml
index cda91182df..cda91182df 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-instantiator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-instantiator.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml
index 2d2d15efdf..2d2d15efdf 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar.qml
index 55064604b4..55064604b4 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml
index 2b66187e10..2b66187e10 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator.qml
index 6be0de85bc..6be0de85bc 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-layout.qml
index 0620ee6d0b..0620ee6d0b 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-layout.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-layout.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-localization.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-localization.qml
index 56a801ab75..56a801ab75 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-localization.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-localization.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid.qml
index c630edbe26..c630edbe26 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modal.qml
index d1537d73bf..d1537d73bf 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modal.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modal.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modeless.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modeless.qml
index 06ebb16fb1..06ebb16fb1 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modeless.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modeless.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-overview.cmake b/src/quickcontrols/doc/snippets/qtquickcontrols-overview.cmake
index 6aa63152db..6aa63152db 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-overview.cmake
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-overview.cmake
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml
index 5372c41f31..5372c41f31 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-interactive.qml
index e3e65beb22..e3e65beb22 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-interactive.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator.qml
index 6929565825..6929565825 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-pane-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml
index 96e3db1f37..96e3db1f37 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-pane-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-pane.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pane.qml
index ed1b80d4e8..ed1b80d4e8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-pane.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pane.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-popup-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml
index 951dfa7d52..951dfa7d52 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-popup-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-popup.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-popup.qml
index 5b9ec29fb2..5b9ec29fb2 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-popup.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-popup.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-progressbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml
index 7158232081..7158232081 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-progressbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-radiobutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml
index 929fe7e8e2..929fe7e8e2 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml
index 5eb856b8b5..5eb856b8b5 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-rangeslider-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml
index 81bcb0d668..81bcb0d668 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-roundbutton.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-roundbutton.qml
index d83e4abc32..d83e4abc32 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-roundbutton.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-roundbutton.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-active.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-active.qml
index 5292bc5499..5292bc5499 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-active.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-active.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml
index 2a4faede61..2a4faede61 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-non-attached.qml
index 6ba505b199..6ba505b199 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-non-attached.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-policy.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy.qml
index 7f08912e7e..7f08912e7e 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-active.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-active.qml
index 0f6afdfc4d..0f6afdfc4d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-active.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml
index f447fd4c94..f447fd4c94 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-non-attached.qml
index 063c771f1b..063c771f1b 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-non-attached.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml
index 2f23b9fd58..2f23b9fd58 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-interactive.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-interactive.qml
index 3f7bc8eb6d..3f7bc8eb6d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-interactive.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-listview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-listview.qml
index 053e8e395a..053e8e395a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-listview.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-listview.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-policy.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-policy.qml
index fa75cd14ed..fa75cd14ed 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-policy.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-policy.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview.qml
index e7f1adf758..e7f1adf758 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-selectionrectangle.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-selectionrectangle.qml
index a53941e824..a53941e824 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-selectionrectangle.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-selectionrectangle.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-slider-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml
index 66e0bd7990..66e0bd7990 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-slider-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml
index b32106a5bd..b32106a5bd 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-double.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-double.qml
index fe2dfbd722..fe2dfbd722 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-double.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-double.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-textual.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-textual.qml
index 271cad0f07..271cad0f07 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-textual.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-textual.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox.qml
index 24fac81ca6..24fac81ca6 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml
index 0d5452c25d..0d5452c25d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-handle-containmentmask.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-handle-containmentmask.qml
index f12bfe1da8..f12bfe1da8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-handle-containmentmask.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-handle-containmentmask.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml
index 381fbe6b95..381fbe6b95 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-visible.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-visible.qml
index d711a02e1a..d711a02e1a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-visible.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-visible.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml
index 973511c418..973511c418 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-transition.qml
index 4215ea9202..4215ea9202 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-transition.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate.qml
index fb2df4f6d3..fb2df4f6d3 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml
index e77bc9a3e8..e77bc9a3e8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-indicator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-indicator.qml
index 1831d92b9f..1831d92b9f 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-indicator.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-switch-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml
index 5ca4b96140..5ca4b96140 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-switch-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-switchdelegate-custom.qml
index 13cc7b4402..13cc7b4402 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-switchdelegate-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml
index cdce972150..cdce972150 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-explicit.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-explicit.qml
index 2293984e30..2293984e30 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-explicit.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-flickable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-flickable.qml
index 3851b226bd..3851b226bd 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-flickable.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar.qml
index 3ce32c1c50..3ce32c1c50 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbutton.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbutton.qml
index c397092a8a..c397092a8a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbutton.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbutton.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml
index 39a94e13cc..39a94e13cc 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-scrollable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-scrollable.qml
index 7f915815e3..7f915815e3 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-scrollable.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml
index c4d0c88c2a..c4d0c88c2a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-disabled.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-disabled.qml
index aa8639190c..aa8639190c 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-disabled.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-disabled.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-focused.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-focused.qml
index 62299eeabc..62299eeabc 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-focused.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-focused.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-normal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-normal.qml
index 72a5626142..72a5626142 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-normal.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-normal.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml
index 2aabcbfbe3..2aabcbfbe3 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar.qml
index cb07df80f6..cb07df80f6 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml
index 6ec46b0adf..6ec46b0adf 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml
index 201e04b0e8..201e04b0e8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator.qml
index eb3543402d..eb3543402d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml
index 089e6d02b9..089e6d02b9 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-hover.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-hover.qml
index 289334d20d..289334d20d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-hover.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-hover.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml
index e209ce9ce9..e209ce9ce9 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-slider.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-slider.qml
index 823e7f1842..823e7f1842 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-slider.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-slider.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip.qml
index d0cf142376..d0cf142376 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml
index 3487e7316d..3487e7316d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-listView.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-listView.qml
index 1b39c2aa16..1b39c2aa16 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-listView.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-listView.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-pathView.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-pathView.qml
index 30e90b2ba5..30e90b2ba5 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-pathView.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-timePicker.qml
index a5d4b3585a..a5d4b3585a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-timePicker.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-accent.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-accent.qml
index 52aca6eea9..52aca6eea9 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-accent.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-accent.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-background.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-background.qml
index 106549f789..106549f789 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-background.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-background.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-foreground.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-foreground.qml
index 491a4f94d4..491a4f94d4 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-foreground.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-foreground.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-theme.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-theme.qml
index 5ade2c7c55..5ade2c7c55 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-theme.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-theme.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn-layout.qml
index 6d1dd1ba79..6d1dd1ba79 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn-layout.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn-layout.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn.qml
index e3c757a0b8..e3c757a0b8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn.qml
diff --git a/src/quickcontrols/doc/src/external-pages.qdoc b/src/quickcontrols/doc/src/external-pages.qdoc
index 0b1c99a7c1..591533c2c7 100644
--- a/src/quickcontrols/doc/src/external-pages.qdoc
+++ b/src/quickcontrols/doc/src/external-pages.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \externalpage https://doc.qt.io/qt-5/qtquickcontrols2-differences.html
+    \externalpage https://doc.qt.io/qt-5/qtquickcontrols-differences.html
     \title Qt 5.15: Qt Quick Controls vs Qt Quick Controls 1
 */
 
diff --git a/src/quickcontrols/doc/src/includes/qquickdial.qdocinc b/src/quickcontrols/doc/src/includes/qquickdial.qdocinc
index 3370b3d8f3..37a2b50f62 100644
--- a/src/quickcontrols/doc/src/includes/qquickdial.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickdial.qdocinc
@@ -9,5 +9,5 @@ the value of the dial.
 The following image illustrates the directions in which the various input modes
 track movement:
 
-\image qtquickcontrols2-dial-inputmode.png
+\image qtquickcontrols-dial-inputmode.png
 //! [inputMode]
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-basic.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-basic.qdoc
index b87fe8b7db..174877a737 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-basic.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-basic.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-basic.html
+    \page qtquickcontrols-basic.html
     \title Basic Style
 
     The Basic style is a basic all-round style.
@@ -11,7 +11,7 @@
     performance for Qt Quick Controls. It is built with a minimal amount of Qt
     Quick primitives, and keeps animations and transitions to the minimum.
 
-    \image qtquickcontrols2-basic.png
+    \image qtquickcontrols-basic.png
 
     The style is selected by default when running Qt Quick Controls applications.
     It is built into the module's resources, so by default it is shipped with
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-buttons.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-buttons.qdoc
index b2256f0e60..fac1e7bad5 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-buttons.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-buttons.qdoc
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-buttons.html
+    \page qtquickcontrols-buttons.html
     \title Button Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for button controls
 
     Qt Quick Controls offers a selection of button-like controls.
 
-    \annotatedlist qtquickcontrols2-buttons
+    \annotatedlist qtquickcontrols-buttons
 
     Each type of button has its own specific use case. The following
     sections offer guidelines for choosing the appropriate type of button,
@@ -25,7 +25,7 @@
     to perform an action. The most common examples are Apply, Cancel,
     Save, Close and Help.
 
-    \image qtquickcontrols2-button.gif
+    \image qtquickcontrols-button.gif
 
     Recommendations:
 
@@ -41,7 +41,7 @@
 
     \section1 CheckBox Control
 
-    \image qtquickcontrols2-checkbox.gif
+    \image qtquickcontrols-checkbox.gif
 
     \l CheckBox is used to build multi-selection option lists. Any number of
     options can be selected, including none, but the options should
@@ -80,7 +80,7 @@
     \l DelayButton is a button that incorporates a delay before triggering an action.
     This delay prevents accidental presses.
 
-    \image qtquickcontrols2-delaybutton.gif
+    \image qtquickcontrols-delaybutton.gif
 
     Recommendations:
     \list
@@ -92,7 +92,7 @@
 
     \section1 RadioButton Control
 
-    \image qtquickcontrols2-radiobutton.gif
+    \image qtquickcontrols-radiobutton.gif
 
     \l RadioButton is used to select only one option from a set of options.
     Selecting one option automatically deselects the one selected before.
@@ -122,7 +122,7 @@
     icon is circular. A circular RoundButton takes less space than a normal
     \l Button, and can also be used as a floating action button.
 
-    \image qtquickcontrols2-roundbutton.png
+    \image qtquickcontrols-roundbutton.png
 
     Recommendations:
 
@@ -135,7 +135,7 @@
 
     \section1 Switch Control
 
-    \image qtquickcontrols2-switch.png
+    \image qtquickcontrols-switch.png
 
     \l Switch represents a physical switch that allows users to choose between an "on"
     or "off" state.
@@ -153,7 +153,7 @@
 
     \section1 ToolButton Control
 
-    \image qtquickcontrols2-toolbutton.png
+    \image qtquickcontrols-toolbutton.png
 
     \l ToolButton is nearly identical to \l Button, but it has a graphical
     appearance that makes it more suitable for insertion into a \l ToolBar.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-configuration.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-configuration.qdoc
index 02adbe5644..26fab0a2ce 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-configuration.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-configuration.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-configuration.html
+    \page qtquickcontrols-configuration.html
     \keyword Qt Quick Controls Configuration File
     \title Qt Quick Controls Configuration File
     \keyword Qt Quick Controls 2 Configuration File
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-containers.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-containers.qdoc
index bd840ebec8..08d91f294f 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-containers.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-containers.qdoc
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-containers.html
+    \page qtquickcontrols-containers.html
     \title Container Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for container controls
 
     Qt Quick Controls offers a selection of container-like controls.
 
-    \annotatedlist qtquickcontrols2-containers
+    \annotatedlist qtquickcontrols-containers
 
     Each type of container can be used to group a set of controls together.
     The following sections offer guidelines for choosing the appropriate type
@@ -17,28 +17,28 @@
 
     \section1 ApplicationWindow Control
 
-    \image qtquickcontrols2-applicationwindow-wireframe.png
+    \image qtquickcontrols-applicationwindow-wireframe.png
 
     \l ApplicationWindow creates the root window of an application, and makes
     it easy to add an optional header and footer to that window.
 
     \section1 Frame Control
 
-    \image qtquickcontrols2-frame.png
+    \image qtquickcontrols-frame.png
 
     \l Frame is used to layout a logical group of controls together, within
     a visual frame.
 
     \section1 GroupBox Control
 
-    \image qtquickcontrols2-groupbox.png
+    \image qtquickcontrols-groupbox.png
 
     \l GroupBox is used to layout a logical group of controls together,
     within a titled visual frame.
 
     \section1 Page Control
 
-    \image qtquickcontrols2-page-wireframe.png
+    \image qtquickcontrols-page-wireframe.png
 
     \l Page provides page-specific header and footer items.
     It is perfectly possible to use ApplicationWindow for setting the header
@@ -47,7 +47,7 @@
 
     \section1 Pane Control
 
-    \image qtquickcontrols2-pane.png
+    \image qtquickcontrols-pane.png
 
     \l Pane provides a background color that matches with the application
     style and theme. Pane does not provide a layout of its own, but requires
@@ -56,13 +56,13 @@
 
     \section1 ScrollView Control
 
-    \image qtquickcontrols2-scrollview-wireframe.png
+    \image qtquickcontrols-scrollview-wireframe.png
 
     \l ScrollView provides scrolling for user-defined content.
 
     \section1 StackView Control
 
-    \image qtquickcontrols2-stackview-wireframe.png
+    \image qtquickcontrols-stackview-wireframe.png
 
     \l StackView organizes content pages into a stack using a last-in-first-out
     principle: the last item to be "pushed" onto the stack is the first one to
@@ -70,19 +70,19 @@
 
     \section1 SwipeView Control
 
-    \image qtquickcontrols2-swipeview-wireframe.png
+    \image qtquickcontrols-swipeview-wireframe.png
 
     \l SwipeView organizes content pages into a swipable strip.
 
     \section1 TabBar Control
 
-    \image qtquickcontrols2-tabbar-wireframe.png
+    \image qtquickcontrols-tabbar-wireframe.png
 
     \l TabBar organizes content pages into tabs.
 
     \section1 ToolBar Control
 
-    \image qtquickcontrols2-toolbar.png
+    \image qtquickcontrols-toolbar.png
 
     \l ToolBar is a container of application-wide and context-sensitive
     actions and controls.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-cppclasses.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-cppclasses.qdoc
index 10ae30a689..10ae30a689 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-cppclasses.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-cppclasses.qdoc
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-customize.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-customize.qdoc
index e30d393771..19a2619164 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-customize.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-customize.html
+    \page qtquickcontrols-customize.html
     \keyword Customizing Qt Quick Controls 2
     \title Customizing Qt Quick Controls
     \brief A set of UI controls to create user interfaces in Qt Quick
@@ -500,7 +500,7 @@
 
     The end result:
 
-    \image qtquickcontrols2-customize-buttons.png
+    \image qtquickcontrols-customize-buttons.png
 
     Note that the \c {import MyStyle 1.0} statement is only necessary
     because we are using the attached property belonging to \c MyStyle.
@@ -545,9 +545,9 @@
         BusyIndicator consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{contentItem}.
 
-        \image qtquickcontrols2-busyindicator-custom.png
+        \image qtquickcontrols-busyindicator-custom.png
 
-        \snippet qtquickcontrols2-busyindicator-custom.qml file
+        \snippet qtquickcontrols-busyindicator-custom.qml file
 
 
     \section2 Customizing Button
@@ -555,9 +555,9 @@
         Button consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-button-custom.png
+        \image qtquickcontrols-button-custom.png
 
-        \snippet qtquickcontrols2-button-custom.qml file
+        \snippet qtquickcontrols-button-custom.qml file
 
 
     \section2 Customizing CheckBox
@@ -565,18 +565,18 @@
         CheckBox consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{contentItem} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-checkbox-custom.png
+        \image qtquickcontrols-checkbox-custom.png
 
-        \snippet qtquickcontrols2-checkbox-custom.qml file
+        \snippet qtquickcontrols-checkbox-custom.qml file
 
     \section2 Customizing CheckDelegate
 
         CheckDelegate consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{contentItem} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-checkdelegate-custom.png
+        \image qtquickcontrols-checkdelegate-custom.png
 
-        \snippet qtquickcontrols2-checkdelegate-custom.qml file
+        \snippet qtquickcontrols-checkdelegate-custom.qml file
 
 
     \section2 Customizing ComboBox
@@ -585,9 +585,9 @@
         \l {Control::contentItem}{content item}, \l {ComboBox::popup}{popup},
         \l {ComboBox::indicator}{indicator}, and \l {ComboBox::delegate}{delegate}.
 
-        \image qtquickcontrols2-combobox-custom.png
+        \image qtquickcontrols-combobox-custom.png
 
-        \snippet qtquickcontrols2-combobox-custom.qml file
+        \snippet qtquickcontrols-combobox-custom.qml file
 
         As explained in \l {ComboBox Model Roles}, ComboBox supports multiple
         types of models. If you know that your ComboBox instances will only
@@ -605,7 +605,7 @@
         However, if you want to support all standard models, the more complex
         binding is necessary, and is explained in detail below.
 
-        \quotefromfile qtquickcontrols2-combobox-custom.qml
+        \quotefromfile qtquickcontrols-combobox-custom.qml
         \skipto control.textRole
         \printto Array.isArray
 
@@ -636,9 +636,9 @@
         DelayButton consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-delaybutton-custom.png
+        \image qtquickcontrols-delaybutton-custom.png
 
-        \snippet qtquickcontrols2-delaybutton-custom.qml file
+        \snippet qtquickcontrols-delaybutton-custom.qml file
 
 
     \section2 Customizing Dial
@@ -646,9 +646,9 @@
         Dial consists of two visual items: \l {Control::background}{background}
         and \l {Dial::handle}{handle}.
 
-        \image qtquickcontrols2-dial-custom.png
+        \image qtquickcontrols-dial-custom.png
 
-        \snippet qtquickcontrols2-dial-custom.qml file
+        \snippet qtquickcontrols-dial-custom.qml file
 
 
     \section2 Customizing Drawer
@@ -672,9 +672,9 @@
 
         Frame consists of one visual item: \l {Control::background}{background}.
 
-        \image qtquickcontrols2-frame-custom.png
+        \image qtquickcontrols-frame-custom.png
 
-        \snippet qtquickcontrols2-frame-custom.qml file
+        \snippet qtquickcontrols-frame-custom.qml file
 
 
     \section2 Customizing GroupBox
@@ -682,9 +682,9 @@
         GroupBox consists of two visual items: \l {Control::background}{background}
         and \l {GroupBox::label}{label}.
 
-        \image qtquickcontrols2-groupbox-custom.png
+        \image qtquickcontrols-groupbox-custom.png
 
-        \snippet qtquickcontrols2-groupbox-custom.qml file
+        \snippet qtquickcontrols-groupbox-custom.qml file
 
 
     \section2 Customizing ItemDelegate
@@ -692,18 +692,18 @@
         ItemDelegate consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-itemdelegate-custom.png
+        \image qtquickcontrols-itemdelegate-custom.png
 
-        \snippet qtquickcontrols2-itemdelegate-custom.qml file
+        \snippet qtquickcontrols-itemdelegate-custom.qml file
 
 
     \section2 Customizing Label
 
         Label can have a visual \l {Label::background}{background} item.
 
-        \image qtquickcontrols2-label-custom.png
+        \image qtquickcontrols-label-custom.png
 
-        \snippet qtquickcontrols2-label-custom.qml file
+        \snippet qtquickcontrols-label-custom.qml file
 
 
     \section2 Customizing Menu
@@ -717,9 +717,9 @@
                 \l {Control::contentItem}{content item}.
         \endlist
 
-        \image qtquickcontrols2-menu-custom.png
+        \image qtquickcontrols-menu-custom.png
 
-        \quotefromfile qtquickcontrols2-menu-custom.qml
+        \quotefromfile qtquickcontrols-menu-custom.qml
         \skipto import QtQuick
         \printuntil import QtQuick.Controls
         \skipto Menu
@@ -732,9 +732,9 @@
         and MenuBarItem consists of two visual items: \l {Control::background}
         {background} and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-menubar-custom.png
+        \image qtquickcontrols-menubar-custom.png
 
-        \quotefromfile qtquickcontrols2-menubar-custom.qml
+        \quotefromfile qtquickcontrols-menubar-custom.qml
         \skipto import QtQuick
         \printuntil import QtQuick.Controls
         \skipto MenuBar
@@ -745,18 +745,18 @@
 
         PageIndicator consists of a \l {Control::background}{background}, \l {Control::contentItem}{content item}, and \l {PageIndicator::delegate}{delegate}.
 
-        \image qtquickcontrols2-pageindicator-custom.png
+        \image qtquickcontrols-pageindicator-custom.png
 
-        \snippet qtquickcontrols2-pageindicator-custom.qml file
+        \snippet qtquickcontrols-pageindicator-custom.qml file
 
 
     \section2 Customizing Pane
 
         Pane consists of a \l {Control::background}{background}.
 
-        \image qtquickcontrols2-pane-custom.png
+        \image qtquickcontrols-pane-custom.png
 
-        \snippet qtquickcontrols2-pane-custom.qml file
+        \snippet qtquickcontrols-pane-custom.qml file
 
 
     \section2 Customizing Popup
@@ -764,9 +764,9 @@
         Popup consists of a \l {Popup::background}{background} and
         \l {Popup::contentItem}{content item}.
 
-        \image qtquickcontrols2-popup-custom.png
+        \image qtquickcontrols-popup-custom.png
 
-        \quotefromfile qtquickcontrols2-popup-custom.qml
+        \quotefromfile qtquickcontrols-popup-custom.qml
         \skipto import QtQuick
         \printuntil import QtQuick.Controls
         \codeline
@@ -782,9 +782,9 @@
         ProgressBar consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-progressbar-custom.png
+        \image qtquickcontrols-progressbar-custom.png
 
-        \snippet qtquickcontrols2-progressbar-custom.qml file
+        \snippet qtquickcontrols-progressbar-custom.qml file
 
 
     \section2 Customizing RadioButton
@@ -792,9 +792,9 @@
         RadioButton consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{content item} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-radiobutton-custom.png
+        \image qtquickcontrols-radiobutton-custom.png
 
-        \snippet qtquickcontrols2-radiobutton-custom.qml file
+        \snippet qtquickcontrols-radiobutton-custom.qml file
 
 
     \section2 Customizing RadioDelegate
@@ -802,9 +802,9 @@
         RadioDelegate consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{contentItem} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-radiodelegate-custom.png
+        \image qtquickcontrols-radiodelegate-custom.png
 
-        \snippet qtquickcontrols2-radiodelegate-custom.qml file
+        \snippet qtquickcontrols-radiodelegate-custom.qml file
 
 
     \section2 Customizing RangeSlider
@@ -814,9 +814,9 @@
         \l {RangeSlider::first}{first.handle} and
         \l {RangeSlider::second.handle}{second.handle}.
 
-        \image qtquickcontrols2-rangeslider-custom.png
+        \image qtquickcontrols-rangeslider-custom.png
 
-        \snippet qtquickcontrols2-rangeslider-custom.qml file
+        \snippet qtquickcontrols-rangeslider-custom.qml file
 
 
     \section2 Customizing RoundButton
@@ -830,9 +830,9 @@
         ScrollBar consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-scrollbar-custom.png
+        \image qtquickcontrols-scrollbar-custom.png
 
-        \snippet qtquickcontrols2-scrollbar-custom.qml file
+        \snippet qtquickcontrols-scrollbar-custom.qml file
 
 
     \section2 Customizing ScrollIndicator
@@ -840,9 +840,9 @@
         ScrollIndicator consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-scrollindicator-custom.png
+        \image qtquickcontrols-scrollindicator-custom.png
 
-        \snippet qtquickcontrols2-scrollindicator-custom.qml file
+        \snippet qtquickcontrols-scrollindicator-custom.qml file
 
 
     \section2 Customizing ScrollView
@@ -850,9 +850,9 @@
         ScrollView consists of a \l {Control::background}{background} item,
         and horizontal and vertical scroll bars.
 
-        \image qtquickcontrols2-scrollview-custom.png
+        \image qtquickcontrols-scrollview-custom.png
 
-        \snippet qtquickcontrols2-scrollview-custom.qml file
+        \snippet qtquickcontrols-scrollview-custom.qml file
 
 
     \section2 Customizing Slider
@@ -860,9 +860,9 @@
         Slider consists of two visual items: \l {Control::background}{background},
         and \l {Slider::handle}{handle}.
 
-        \image qtquickcontrols2-slider-custom.png
+        \image qtquickcontrols-slider-custom.png
 
-        \snippet qtquickcontrols2-slider-custom.qml file
+        \snippet qtquickcontrols-slider-custom.qml file
 
 
     \section2 Customizing SpinBox
@@ -871,18 +871,18 @@
         \l {Control::contentItem}{contentItem}, \l {SpinBox::up.indicator}{up indicator},
         and \l {SpinBox::down.indicator}{down indicator}.
 
-        \image qtquickcontrols2-spinbox-custom.png
+        \image qtquickcontrols-spinbox-custom.png
 
-        \snippet qtquickcontrols2-spinbox-custom.qml file
+        \snippet qtquickcontrols-spinbox-custom.qml file
 
 
     \section2 Customizing SplitView
 
         SplitView consists of a visual \l {SplitView::handle}{handle} delegate.
 
-        \image qtquickcontrols2-splitview-custom.png
+        \image qtquickcontrols-splitview-custom.png
 
-        \snippet qtquickcontrols2-splitview-custom.qml 1
+        \snippet qtquickcontrols-splitview-custom.qml 1
 
 
     \section2 Customizing StackView
@@ -891,7 +891,7 @@
         item, and it allows customizing the transitions that are used for
         push, pop, and replace operations.
 
-        \snippet qtquickcontrols2-stackview-custom.qml file
+        \snippet qtquickcontrols-stackview-custom.qml file
 
 
     \section2 Customizing SwipeDelegate
@@ -900,9 +900,9 @@
         \l {Control::contentItem}{content item}, \l {AbstractButton::indicator}{indicator},
         \c swipe.left, \c swipe.right, and \c swipe.behind.
 
-        \image qtquickcontrols2-swipedelegate-custom.png
+        \image qtquickcontrols-swipedelegate-custom.png
 
-        \snippet qtquickcontrols2-swipedelegate-custom.qml file
+        \snippet qtquickcontrols-swipedelegate-custom.qml file
 
 
     \section2 Customizing SwipeView
@@ -911,7 +911,7 @@
         item. The navigation is implemented by the \l {Control::contentItem}
         {content item}.
 
-        \snippet qtquickcontrols2-swipeview-custom.qml file
+        \snippet qtquickcontrols-swipeview-custom.qml file
 
 
     \section2 Customizing Switch
@@ -919,18 +919,18 @@
         Switch consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{content item} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-switch-custom.png
+        \image qtquickcontrols-switch-custom.png
 
-        \snippet qtquickcontrols2-switch-custom.qml file
+        \snippet qtquickcontrols-switch-custom.qml file
 
     \section2 Customizing SwitchDelegate
 
         SwitchDelegate consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{contentItem} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-switchdelegate-custom.png
+        \image qtquickcontrols-switchdelegate-custom.png
 
-        \snippet qtquickcontrols2-switchdelegate-custom.qml file
+        \snippet qtquickcontrols-switchdelegate-custom.qml file
 
 
     \section2 Customizing TabBar
@@ -938,9 +938,9 @@
         TabBar consists of two visual items: \l {Control::background}{background},
         and \l {Control::contentItem}{contentItem}.
 
-        \image qtquickcontrols2-tabbar-custom.png
+        \image qtquickcontrols-tabbar-custom.png
 
-        \snippet qtquickcontrols2-tabbar-custom.qml file
+        \snippet qtquickcontrols-tabbar-custom.qml file
 
 
     \section2 Customizing TabButton
@@ -953,27 +953,27 @@
 
         TextArea consists of a \l {TextArea::background}{background} item.
 
-        \image qtquickcontrols2-textarea-custom.png
+        \image qtquickcontrols-textarea-custom.png
 
-        \snippet qtquickcontrols2-textarea-custom.qml file
+        \snippet qtquickcontrols-textarea-custom.qml file
 
 
     \section2 Customizing TextField
 
         TextField consists of a \l {TextField::background}{background} item.
 
-        \image qtquickcontrols2-textfield-custom.png
+        \image qtquickcontrols-textfield-custom.png
 
-        \snippet qtquickcontrols2-textfield-custom.qml file
+        \snippet qtquickcontrols-textfield-custom.qml file
 
 
     \section2 Customizing ToolBar
 
         ToolBar consists of one visual item: \l {Control::background}{background}.
 
-        \image qtquickcontrols2-toolbar-custom.png
+        \image qtquickcontrols-toolbar-custom.png
 
-        \snippet qtquickcontrols2-toolbar-custom.qml file
+        \snippet qtquickcontrols-toolbar-custom.qml file
 
 
     \section2 Customizing ToolButton
@@ -981,9 +981,9 @@
         ToolButton consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-toolbutton-custom.png
+        \image qtquickcontrols-toolbutton-custom.png
 
-        \snippet qtquickcontrols2-toolbutton-custom.qml file
+        \snippet qtquickcontrols-toolbutton-custom.qml file
 
 
     \section2 Customizing ToolSeparator
@@ -991,9 +991,9 @@
         ToolSeparator consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-toolseparator-custom.png
+        \image qtquickcontrols-toolseparator-custom.png
 
-        \snippet qtquickcontrols2-toolseparator-custom.qml file
+        \snippet qtquickcontrols-toolseparator-custom.qml file
 
 
     \section2 Customizing ToolTip
@@ -1001,7 +1001,7 @@
         ToolTip consists of two visual items: \l {Popup::background}{background}
         and \l {Popup::contentItem}{content item}.
 
-        \quotefromfile qtquickcontrols2-tooltip-custom.qml
+        \quotefromfile qtquickcontrols-tooltip-custom.qml
         \skipto import QtQuick
         \printuntil import QtQuick.Controls
         \skipto ToolTip
@@ -1018,16 +1018,16 @@
         \l {Control::contentItem}{contentItem}, and
         \l {Tumbler::delegate}{delegate}.
 
-        \image qtquickcontrols2-tumbler-custom.png
+        \image qtquickcontrols-tumbler-custom.png
 
-        \snippet qtquickcontrols2-tumbler-custom.qml file
+        \snippet qtquickcontrols-tumbler-custom.qml file
 
         If you want to define your own contentItem, use either a \l ListView or
         \l PathView as the root item. For a wrapping Tumbler, use PathView:
 
-        \snippet qtquickcontrols2-tumbler-pathView.qml contentItem
+        \snippet qtquickcontrols-tumbler-pathView.qml contentItem
 
         For a non-wrapping Tumbler, use ListView:
 
-        \snippet qtquickcontrols2-tumbler-listView.qml contentItem
+        \snippet qtquickcontrols-tumbler-listView.qml contentItem
 */
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-delegates.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-delegates.qdoc
index 5d498ced1f..a3fee8b5ae 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-delegates.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-delegates.qdoc
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-delegates.html
+    \page qtquickcontrols-delegates.html
     \title Delegate Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for delegate controls
 
     Qt Quick Controls offers a selection of controls that are used as
     delegates in views.
 
-    \annotatedlist qtquickcontrols2-delegates
+    \annotatedlist qtquickcontrols-delegates
 
     Each type of delegate has its own specific target use case. The following
     sections offer guidelines for choosing the appropriate type of delegate,
@@ -18,7 +18,7 @@
 
     \section1 CheckDelegate Control
 
-    \image qtquickcontrols2-checkdelegate.gif
+    \image qtquickcontrols-checkdelegate.gif
 
     \l CheckDelegate presents a checkable control that can be toggled on
     (checked) or off (unchecked). Check delegates are typically used to
@@ -28,14 +28,14 @@
 
     \section1 ItemDelegate Control
 
-    \image qtquickcontrols2-itemdelegate.gif
+    \image qtquickcontrols-itemdelegate.gif
 
     \l ItemDelegate presents a checkable control that can be pressed and
     clicked by the user.
 
     \section1 RadioDelegate Control
 
-    \image qtquickcontrols2-radiodelegate.gif
+    \image qtquickcontrols-radiodelegate.gif
 
     \l RadioDelegate presents a checkable control that can be toggled on
     (checked) or off (unchecked). Radio delegates are typically used to select
@@ -45,14 +45,14 @@
 
     \section1 SwipeDelegate Control
 
-    \image qtquickcontrols2-swipedelegate.gif
+    \image qtquickcontrols-swipedelegate.gif
 
     \l SwipeDelegate presents a view item that can be swiped left or right to
     expose more options or information.
 
     \section1 SwitchDelegate Control
 
-    \image qtquickcontrols2-switchdelegate.gif
+    \image qtquickcontrols-switchdelegate.gif
 
     \l SwitchDelegate presents a switchable delegate that can be toggled on or off.
 
@@ -60,7 +60,7 @@
 
     \section1 TreeViewDelegate Control
 
-    \image qtquickcontrols2-treeviewdelegate.png
+    \image qtquickcontrols-treeviewdelegate.png
 
     A \l TreeViewDelegate is a delegate that can be assigned to the delegate property
     of a TreeView.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-deployment.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-deployment.qdoc
index daea9eccf0..c4485c81f1 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-deployment.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-deployment.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-deployment.html
+    \page qtquickcontrols-deployment.html
     \title Deploying Qt Quick Controls Applications
 
     Deployment of Qt Quick Controls applications is very similar to
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-environment.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-environment.qdoc
index b939a6741a..fea7da1153 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-environment.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-environment.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-environment.html
+    \page qtquickcontrols-environment.html
     \title Supported Environment Variables in Qt Quick Controls
 
     This page contains a list of all environment variables that Qt Quick Controls
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-examples.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-examples.qdoc
index 505c6200f5..8cd6e7f914 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-examples.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-examples.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \group qtquickcontrols2-examples
+    \group qtquickcontrols-examples
     \ingroup all-examples
     \keyword Qt Quick Controls Examples
     \title Qt Quick Controls Examples
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-fileselectors.qdoc
index edd7b76d81..01c9b26bd2 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-fileselectors.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-fileselectors.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-fileselectors.html
+    \page qtquickcontrols-fileselectors.html
     \title Using File Selectors with Qt Quick Controls
 
     \l {QFileSelector}{File selectors} provide a convenient way of selecting
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-focus.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-focus.qdoc
index ff73e560a0..c39773020f 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-focus.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-focus.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-focus.html
+    \page qtquickcontrols-focus.html
     \keyword Focus Management in Qt Quick Controls 2
     \title Focus Management in Qt Quick Controls
     \brief Overview of focus handling with Qt Quick Controls
@@ -18,7 +18,7 @@
     Qt Quick Controls offers a selection of controls that act as
     \l {Acquiring Focus and Focus Scopes}{focus scopes}:
 
-    \annotatedlist qtquickcontrols2-focusscopes
+    \annotatedlist qtquickcontrols-focusscopes
 
     \sa {Keyboard Focus in Qt Quick}
 */
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-fusion.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-fusion.qdoc
index 42fcd6e87c..d3c4199e7d 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-fusion.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-fusion.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-fusion.html
+    \page qtquickcontrols-fusion.html
     \title Fusion Style
 
     The Fusion style is a desktop-oriented style.
@@ -11,7 +11,7 @@
     look and feel. It implements the same design language as the
     \l {Qt Widget Gallery}{Fusion style for Qt Widgets}.
 
-    \image qtquickcontrols2-fusion.png
+    \image qtquickcontrols-fusion.png
 
     To run an application with the Fusion style, see
     \l {Using Styles in Qt Quick Controls}.
@@ -26,7 +26,7 @@
     The Fusion style uses the standard system \l[QtQuick]{Palette}
     to provide colors that match the desktop environment.
 
-    \image qtquickcontrols2-fusion-palettes.png
+    \image qtquickcontrols-fusion-palettes.png
 
     Custom palettes can be specified for any control,
     \l{Popup::palette}{popup}, or \l{Window::palette}{application window}.
@@ -56,7 +56,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols2-fusion-violet.png
+                \image qtquickcontrols-fusion-violet.png
     \endtable
 
     \b {See also} \l {Basic Style}, \l {Material Style}, \l {Universal Style}
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-gettingstarted.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-gettingstarted.qdoc
index f8667579b6..1ab0c99bc6 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-gettingstarted.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-gettingstarted.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-gettingstarted.html
+    \page qtquickcontrols-gettingstarted.html
     \keyword Getting Started with Qt Quick Controls 2
     \title Getting Started with Qt Quick Controls
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-guidelines.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-guidelines.qdoc
index f9c8246be8..04e142f1c9 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-guidelines.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-guidelines.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-guidelines.html
+    \page qtquickcontrols-guidelines.html
     \keyword Qt Quick Controls Guidelines
     \title Qt Quick Controls Guidelines
     \keyword Qt Quick Controls 2 Guidelines
@@ -13,7 +13,7 @@
     Below you will find practical guidelines on how and when to use
     the controls.
 
-    \annotatedlist qtquickcontrols2-guidelines
+    \annotatedlist qtquickcontrols-guidelines
 
     \section1 Related Information
     \list
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-icons.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-icons.qdoc
index 4948461c1a..f9fbfa203f 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-icons.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-icons.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-icons.html
+    \page qtquickcontrols-icons.html
     \keyword Icons in Qt Quick Controls 2
     \title Icons in Qt Quick Controls
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-imagine.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-imagine.qdoc
index 98bb726d00..2e476c3b24 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-imagine.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-imagine.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-imagine.html
+    \page qtquickcontrols-imagine.html
     \title Imagine Style
 
     The Imagine Style is based on configurable image assets. \l{detailed-desc-imagine}{More...}
@@ -22,7 +22,7 @@
     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
+    \image qtquickcontrols-imagine.png
     \caption The Imagine style with the default images
 
     To run an application with the Imagine style, see
@@ -2273,7 +2273,7 @@
     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
+    \image qtquickcontrols-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
@@ -2286,7 +2286,7 @@
     The 9-patch lines must be black, and the remaining areas must be transparent
     or white:
 
-    \image qtquickcontrols2-imagine-9-patch-size.png
+    \image qtquickcontrols-imagine-9-patch-size.png
 
     \section3 Stretchable Areas
 
@@ -2296,7 +2296,7 @@
     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
+    \image qtquickcontrols-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.
@@ -2311,7 +2311,7 @@
     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
+    \image qtquickcontrols-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
@@ -2327,13 +2327,13 @@
     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
+    \image qtquickcontrols-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
+    \image qtquickcontrols-imagine-9-patch-inset-boundaries.png
 
     \section3 Exporting 9-Patch Images
 
@@ -2432,7 +2432,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols2-imagine-customization-dark.png
+                \image qtquickcontrols-imagine-customization-dark.png
     \endtable
 
     In addition to specifying the path in QML, it is also possible to specify
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-index.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-index.qdoc
index ea148e8568..ae16f75078 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-index.qdoc
@@ -12,7 +12,7 @@
     to build complete interfaces in Qt Quick. The module was introduced
     in Qt 5.7.
 
-    \image qtquickcontrols2-styles.png
+    \image qtquickcontrols-styles.png
 
     Qt Quick Controls comes with a selection of customizable styles.
     See \l {Styling Qt Quick Controls} for more details.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-indicators.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-indicators.qdoc
index 1526ec1b80..c8cd6e4f14 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-indicators.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-indicators.qdoc
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-indicators.html
+    \page qtquickcontrols-indicators.html
     \title Indicator Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for indicator controls
 
     Qt Quick Controls offers a selection of indicator-like controls.
 
-    \annotatedlist qtquickcontrols2-indicators
+    \annotatedlist qtquickcontrols-indicators
 
     Each type of indicator has its own specific target use case. The following
     sections offer guidelines for choosing the appropriate type of indicator,
@@ -17,28 +17,28 @@
 
     \section1 BusyIndicator Control
 
-    \image qtquickcontrols2-busyindicator.png
+    \image qtquickcontrols-busyindicator.png
 
     BusyIndicator can be used to show that an operation is in progress,
     and that the UI has to wait for the operation to complete.
 
     \section1 PageIndicator Control
 
-    \image qtquickcontrols2-pageindicator.png
+    \image qtquickcontrols-pageindicator.png
 
     \l PageIndicator is used to indicate the currently active page in
     a container of multiple pages.
 
     \section1 ProgressBar Control
 
-    \image qtquickcontrols2-progressbar.gif
+    \image qtquickcontrols-progressbar.gif
 
     \l ProgressBar indicates the progress of an operation. The value should be
     updated regularly.
 
     \section1 ScrollBar Control
 
-    \image qtquickcontrols2-scrollbar.gif
+    \image qtquickcontrols-scrollbar.gif
 
     \l ScrollBar is an interactive bar that indicates the current scroll
     position, and can be used to scroll to a specific position in a
@@ -46,7 +46,7 @@
 
     \section1 ScrollIndicator Control
 
-    \image qtquickcontrols2-scrollindicator.gif
+    \image qtquickcontrols-scrollindicator.gif
 
     \l ScrollIndicator is a non-interactive indicator that indicates the
     current scroll position, and can be used to scroll to a specific position in a
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-input.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-input.qdoc
index 580438e8ac..80f5e857bd 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-input.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-input.qdoc
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-input.html
+    \page qtquickcontrols-input.html
     \title Input Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for input controls
 
     Qt Quick Controls offers a variety of input controls for both numeric
     and textual input.
 
-    \annotatedlist qtquickcontrols2-input
+    \annotatedlist qtquickcontrols-input
 
     Each type of input control has its own specific target use case. The
     following sections offer guidelines for choosing the appropriate type
@@ -18,7 +18,7 @@
 
     \section1 ComboBox Control
 
-    \image qtquickcontrols2-combobox.gif
+    \image qtquickcontrols-combobox.gif
 
     \l ComboBox is used to select a value from a static multiple-line drop-down list.
     It is not possible to add new values, and only one option can be selected.
@@ -35,7 +35,7 @@
 
     \section1 Dial Control
 
-    \image qtquickcontrols2-dial.png
+    \image qtquickcontrols-dial.png
 
     \l Dial is similar to a traditional dial knob that is found on devices such
     as stereos or industrial equipment.
@@ -57,13 +57,13 @@
 
     \section1 TextArea Control
 
-    \image qtquickcontrols2-textarea.png
+    \image qtquickcontrols-textarea.png
 
     \l TextArea is a multi-line text editor.
 
     \section1 TextField Control
 
-    \image qtquickcontrols2-textfield.png
+    \image qtquickcontrols-textfield.png
 
     \l TextField is a single line text editor.
 
@@ -71,13 +71,13 @@
 
     \section1 Slider Control
 
-    \image qtquickcontrols2-slider.gif
+    \image qtquickcontrols-slider.gif
 
     \l Slider is used to select a value by sliding a handle along a track.
 
     \section1 RangeSlider Control
 
-    \image qtquickcontrols2-rangeslider.gif
+    \image qtquickcontrols-rangeslider.gif
 
     \l RangeSlider is used to select a range specified by two values,
     by sliding each handle along a track.
@@ -86,7 +86,7 @@
 
     \section1 Tumbler Control
 
-    \image qtquickcontrols2-tumbler.png
+    \image qtquickcontrols-tumbler.png
 
     \l Tumbler is a spinnable wheel of items that can be selected.
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-ios.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-ios.qdoc
index 3ac7d51710..2c90552d20 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-ios.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-ios.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-ios.html
+    \page qtquickcontrols-ios.html
     \title iOS Style
 
     The iOS Style is a native-looking style for iOS based on image assets.
@@ -34,9 +34,9 @@
 
     \table
         \row
-            \li \image qtquickcontrols2-ios-light.png
+            \li \image qtquickcontrols-ios-light.png
                 \caption The iOS style in light theme
-            \li \image qtquickcontrols2-ios-dark.png
+            \li \image qtquickcontrols-ios-dark.png
                 \caption The iOS style in dark theme
     \endtable
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-macos.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-macos.qdoc
index 911baf6c20..97d79c6278 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-macos.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-macos.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-macos.html
+    \page qtquickcontrols-macos.html
     \title macOS Style
 
     The macOS style is a style that looks native on macOS.
@@ -20,9 +20,9 @@
 
     \table
         \row
-            \li \image qtquickcontrols2-macos-light.png
+            \li \image qtquickcontrols-macos-light.png
                 \caption The macOS style in light theme
-            \li \image qtquickcontrols2-macos-dark.png
+            \li \image qtquickcontrols-macos-dark.png
                 \caption The macOS style in dark theme
     \endtable
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-material.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-material.qdoc
index 8b9c74eabb..36e3b96a97 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-material.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-material.html
+    \page qtquickcontrols-material.html
     \title Material Style
 
     The Material Style is based on the Google Material Design Guidelines.
@@ -36,9 +36,9 @@
 
     \table
         \row
-            \li \image qtquickcontrols2-material-light.png
+            \li \image qtquickcontrols-material-light.png
                 \caption The Material style in light theme
-            \li \image qtquickcontrols2-material-dark.png
+            \li \image qtquickcontrols-material-dark.png
                 \caption The Material style in dark theme
     \endtable
 
@@ -58,7 +58,7 @@
     \l {material-primary-attached-prop}{primary}, \l {material-accent-attached-prop}{accent},
     \l {material-foreground-attached-prop}{foreground}, and \l {material-background-attached-prop}{background}.
 
-    \image qtquickcontrols2-material-attributes.png
+    \image qtquickcontrols-material-attributes.png
 
     All attributes can be specified for any window or item, and they automatically
     propagate to children in the same manner as \l {Control::font}{fonts}. In the
@@ -89,7 +89,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols2-material-purple.png
+                \image qtquickcontrols-material-purple.png
     \endtable
 
     In addition to specifying the attributes in QML, it is also possible to
@@ -217,9 +217,9 @@
     \table
         \row
             \li
-                \image qtquickcontrols2-material-variant-normal.png
+                \image qtquickcontrols-material-variant-normal.png
             \li
-                \image qtquickcontrols2-material-variant-dense.png
+                \image qtquickcontrols-material-variant-dense.png
     \endtable
 
     Note that the heights shown above may vary based on differences in fonts
@@ -240,9 +240,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-material-accent.qml 1
+                \snippet qtquickcontrols-material-accent.qml 1
             \li
-                \image qtquickcontrols2-material-accent.png
+                \image qtquickcontrols-material-accent.png
     \endtable
 
     \note Even though the accent can be any \l {colorvaluetypedocs}{color}, it is
@@ -264,9 +264,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-material-background.qml 1
+                \snippet qtquickcontrols-material-background.qml 1
             \li
-                \image qtquickcontrols2-material-background.png
+                \image qtquickcontrols-material-background.png
     \endtable
 
     \endstyleproperty
@@ -286,9 +286,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-material-elevation.qml 1
+                \snippet qtquickcontrols-material-elevation.qml 1
             \li
-                \image qtquickcontrols2-material-elevation.png
+                \image qtquickcontrols-material-elevation.png
     \endtable
 
     \endstyleproperty
@@ -306,9 +306,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-material-foreground.qml 1
+                \snippet qtquickcontrols-material-foreground.qml 1
             \li
-                \image qtquickcontrols2-material-foreground.png
+                \image qtquickcontrols-material-foreground.png
     \endtable
 
     \endstyleproperty
@@ -348,9 +348,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-material-theme.qml 1
+                \snippet qtquickcontrols-material-theme.qml 1
             \li
-                \image qtquickcontrols2-material-theme.png
+                \image qtquickcontrols-material-theme.png
     \endtable
 
     \endstyleproperty
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-menus.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-menus.qdoc
index 7d54b4f027..f2f5b76ae2 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-menus.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-menus.qdoc
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-menus.html
+    \page qtquickcontrols-menus.html
     \title Menu Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for menu controls
 
-    \annotatedlist qtquickcontrols2-menus
+    \annotatedlist qtquickcontrols-menus
 
     Each type of menu control has its own specific target use case. The
     following sections offer guidelines for choosing the appropriate type
@@ -15,7 +15,7 @@
 
     \section1 Menu Control
 
-    \image qtquickcontrols2-menu.png
+    \image qtquickcontrols-menu.png
 
     \l Menu control can be used for context menus; for example, after
     right-clicking. It can also be used for popup menus; for example, a
@@ -31,7 +31,7 @@
 
     \section1 MenuBar Control
 
-    \image qtquickcontrols2-menubar.png
+    \image qtquickcontrols-menubar.png
 
     \l MenuBar control can be used for window menu bars.
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-navigation.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-navigation.qdoc
index 2013fc8dfd..0f5b1b1dc0 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-navigation.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-navigation.qdoc
@@ -2,21 +2,21 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-navigation.html
+    \page qtquickcontrols-navigation.html
     \title Navigation Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for navigation controls
 
     Qt Quick Controls offers a selection of navigation models.
 
-    \annotatedlist qtquickcontrols2-navigation
+    \annotatedlist qtquickcontrols-navigation
 
     The following sections offer guidelines for choosing the appropriate type
     of navigation model, depending on the use case.
 
     \section1 StackView Control
 
-    \image qtquickcontrols2-stackview-wireframe.png
+    \image qtquickcontrols-stackview-wireframe.png
 
     \l StackView provides a stack-based navigation model which can be used
     with a set of interlinked pages. StackView works according to a last-in
@@ -25,7 +25,7 @@
 
     \section1 SwipeView Control
 
-    \image qtquickcontrols2-swipeview-wireframe.png
+    \image qtquickcontrols-swipeview-wireframe.png
 
     \l SwipeView provides a navigation model that simplifies horizontal paged
     scrolling. The page indicator on the bottom shows which is the presently
@@ -33,14 +33,14 @@
 
     \section1 TabBar Control
 
-    \image qtquickcontrols2-tabbar-wireframe.png
+    \image qtquickcontrols-tabbar-wireframe.png
 
     \l TabBar is a bar with icons or text that allows the user to switch
     between different subtasks, views, or modes.
 
     \section1 TabButton Control
 
-    \image qtquickcontrols2-tabbutton.png
+    \image qtquickcontrols-tabbutton.png
 
     \l TabButton is a button with a layout suitable for a TabBar control.
 */
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-popups.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-popups.qdoc
index 388443e24f..f803ce990a 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-popups.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-popups.qdoc
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-popups.html
+    \page qtquickcontrols-popups.html
     \title Popup Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for popup controls
 
-    \annotatedlist qtquickcontrols2-popups
+    \annotatedlist qtquickcontrols-popups
 
     Each type of popup control has its own specific target use case. The
     following sections offer guidelines for choosing the appropriate type
@@ -15,7 +15,7 @@
 
     \section1 Drawer Control
 
-    \image qtquickcontrols2-drawer-expanded-wireframe.png
+    \image qtquickcontrols-drawer-expanded-wireframe.png
 
     \l Drawer provides a swipe-based side panel, similar to those often used
     in touch interfaces to provide a central location for navigation.
@@ -26,7 +26,7 @@
 
     \section1 Menu Control
 
-    \image qtquickcontrols2-menu.png
+    \image qtquickcontrols-menu.png
 
     The \l Menu control displays a vertical list of items that can be selected. It can
     be used for offering a list of actions that can be taken in a given context.
@@ -35,7 +35,7 @@
 
     \section1 Popup Control
 
-    \image qtquickcontrols2-popup-settings.png
+    \image qtquickcontrols-popup-settings.png
 
     A \l Popup displays content over other application content.
     It prompts the user to make a decision or enter information.
@@ -53,7 +53,7 @@
 
     \section1 ToolTip Control
 
-    \image qtquickcontrols2-tooltip.png
+    \image qtquickcontrols-tooltip.png
 
     \l ToolTip shows a short piece of text that informs the user of a control's
     function. It is typically placed above or below the parent control.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-qmltypes.qdoc
index f1ff074b57..f1ff074b57 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-qmltypes.qdoc
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-separators.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-separators.qdoc
index 1105a5bf5f..7c8845aaff 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-separators.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-separators.qdoc
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-separators.html
+    \page qtquickcontrols-separators.html
     \title Separator Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for separator controls
 
     Qt Quick Controls offers a selection of separators.
 
-    \annotatedlist qtquickcontrols2-separators
+    \annotatedlist qtquickcontrols-separators
 
     Each type of separator has its own specific use case. The following
     sections offer guidelines for choosing the appropriate type of separator,
@@ -17,7 +17,7 @@
 
     \section1 MenuSeparator Control
 
-    \image qtquickcontrols2-menuseparator.png
+    \image qtquickcontrols-menuseparator.png
 
     \l MenuSeparator should be used to separate items (typically MenuItem
     controls) in a Menu. Grouping related menu items together makes it easier
@@ -27,7 +27,7 @@
 
     \section1 ToolSeparator Control
 
-    \image qtquickcontrols2-toolseparator.png
+    \image qtquickcontrols-toolseparator.png
 
     \l ToolSeparator should be used to separate items (typically ToolButton
     controls) in a ToolBar. It can be used in horizontal or vertical toolbars.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-styles.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-styles.qdoc
index df79e08e3f..351732c9a3 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-styles.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-styles.html
+    \page qtquickcontrols-styles.html
     \title Styling Qt Quick Controls
 
     \section1 Available Styles
@@ -11,26 +11,26 @@
 
     \section2 Basic Style
 
-    \image qtquickcontrols2-basic-thumbnail.png
+    \image qtquickcontrols-basic-thumbnail.png
     The \l {Basic Style} is a simple and light-weight all-round style that offers
     the maximum performance for Qt Quick Controls.
 
     \section2 Fusion Style
 
-    \image qtquickcontrols2-fusion-thumbnail.png
+    \image qtquickcontrols-fusion-thumbnail.png
     The \l {Fusion Style} is a platform-agnostic style that offers a desktop-oriented
     look and feel for Qt Quick Controls.
 
     \section2 Imagine Style
 
-    \image qtquickcontrols2-imagine-thumbnail.png
+    \image qtquickcontrols-imagine-thumbnail.png
     The \l {Imagine Style} is based on image assets. The style comes with a default
     set of images which can easily be changed by providing a directory
     with images using a predefined naming convention.
 
     \section2 macOS Style
 
-    \image qtquickcontrols2-macos-thumbnail.png
+    \image qtquickcontrols-macos-thumbnail.png
     The \l {macOS Style} is a native-looking style for macOS.
     \note this style is only available for applications running on macOS.
 
@@ -42,7 +42,7 @@
 
     \section2 Material Style
 
-    \image qtquickcontrols2-material-thumbnail.png
+    \image qtquickcontrols-material-thumbnail.png
     The \l {Material Style} offers an appealing design based on the
     \l {https://www.google.com/design/spec/material-design/introduction.html}
     {Google Material Design Guidelines}, but requires more system resources than
@@ -50,14 +50,14 @@
 
     \section2 Universal Style
 
-    \image qtquickcontrols2-universal-thumbnail.png
+    \image qtquickcontrols-universal-thumbnail.png
     The \l {Universal Style} offers an appealing design based on the
     \l {https://dev.windows.com/design}{Microsoft Universal Design Guidelines},
     but requires more system resources than the Basic style.
 
     \section2 Windows Style
 
-    \image qtquickcontrols2-windows-thumbnail.png
+    \image qtquickcontrols-windows-thumbnail.png
     The \l {Windows Style} is a native-looking style for Windows.
     \note this style is only available for applications running on Windows.
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-universal.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-universal.qdoc
index 4dfdebb963..4c8db816d7 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-universal.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-universal.html
+    \page qtquickcontrols-universal.html
     \title Universal Style
 
     The Universal Style is based on the Microsoft Universal Design Guidelines.
@@ -35,9 +35,9 @@
 
     \table
         \row
-            \li \image qtquickcontrols2-universal-light.png
+            \li \image qtquickcontrols-universal-light.png
                 \caption The Universal style in light theme
-            \li \image qtquickcontrols2-universal-dark.png
+            \li \image qtquickcontrols-universal-dark.png
                 \caption The Universal style in dark theme
     \endtable
 
@@ -57,7 +57,7 @@
     \l {universal-accent-attached-prop}{accent}, \l {universal-foreground-attached-prop}{foreground}, and
     \l {universal-background-attached-prop}{background}.
 
-    \image qtquickcontrols2-universal-attributes.png
+    \image qtquickcontrols-universal-attributes.png
 
     Both attributes can be specified for any window or item, and they automatically
     propagate to children in the same manner as \l {Control::font}{fonts}. In the
@@ -88,7 +88,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols2-universal-violet.png
+                \image qtquickcontrols-universal-violet.png
     \endtable
 
     In addition to specifying the attributes in QML, it is also possible to
@@ -165,9 +165,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-universal-accent.qml 1
+                \snippet qtquickcontrols-universal-accent.qml 1
             \li
-                \image qtquickcontrols2-universal-accent.png
+                \image qtquickcontrols-universal-accent.png
     \endtable
 
     \note Even though the accent can be any \l {colorvaluetypedocs}{color}, it is
@@ -189,9 +189,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-universal-background.qml 1
+                \snippet qtquickcontrols-universal-background.qml 1
             \li
-                \image qtquickcontrols2-universal-background.png
+                \image qtquickcontrols-universal-background.png
     \endtable
 
     \endstyleproperty
@@ -209,9 +209,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-universal-foreground.qml 1
+                \snippet qtquickcontrols-universal-foreground.qml 1
             \li
-                \image qtquickcontrols2-universal-foreground.png
+                \image qtquickcontrols-universal-foreground.png
     \endtable
 
     \styleproperty {Universal.theme} {enumeration} {universal-theme-attached-prop}
@@ -234,9 +234,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-universal-theme.qml 1
+                \snippet qtquickcontrols-universal-theme.qml 1
             \li
-                \image qtquickcontrols2-universal-theme.png
+                \image qtquickcontrols-universal-theme.png
     \endtable
 
     \endstyleproperty
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-windows.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-windows.qdoc
index e068f3c86d..fee2ffa98f 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-windows.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-windows.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-windows.html
+    \page qtquickcontrols-windows.html
     \title Windows Style
 
     The Windows style is a style that looks native on Windows.
@@ -20,7 +20,7 @@
 
     \table
         \row
-            \li \image qtquickcontrols2-windows.png
+            \li \image qtquickcontrols-windows.png
                 \caption The Windows style
     \endtable
 
diff --git a/src/quickcontrols/qquickstyle.cpp b/src/quickcontrols/qquickstyle.cpp
index da1bcd200b..8befd80ea4 100644
--- a/src/quickcontrols/qquickstyle.cpp
+++ b/src/quickcontrols/qquickstyle.cpp
@@ -161,7 +161,7 @@ struct QQuickStyleSpec
                 << "checking if we have an appropriate style for this platform";
 
             // If these defaults are changed, ensure that the "Using Styles in Qt Quick Controls"
-            // section of qtquickcontrols2-styles.qdoc is updated.
+            // section of qtquickcontrols-styles.qdoc is updated.
 #if defined(Q_OS_MACOS)
             style = QLatin1String("macOS");
 #elif defined(Q_OS_WINDOWS)
diff --git a/src/quickdialogs/quickdialogs/doc/qtquickdialogs.qdocconf b/src/quickdialogs/quickdialogs/doc/qtquickdialogs.qdocconf
index d4f7595f0f..9fd4891d02 100644
--- a/src/quickdialogs/quickdialogs/doc/qtquickdialogs.qdocconf
+++ b/src/quickdialogs/quickdialogs/doc/qtquickdialogs.qdocconf
@@ -1,5 +1,5 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols.qdocconf)
 
 project                 = QtQuickDialogs
 description             = Qt Quick Dialogs Reference Documentation
diff --git a/src/quicktemplates/doc/src/qtquicktemplates2-index.qdoc b/src/quicktemplates/doc/src/qtquicktemplates-index.qdoc
index 49d4c96b44..49d4c96b44 100644
--- a/src/quicktemplates/doc/src/qtquicktemplates2-index.qdoc
+++ b/src/quicktemplates/doc/src/qtquicktemplates-index.qdoc
diff --git a/src/quicktemplates/doc/src/qtquicktemplates2-qmltypes.qdoc b/src/quicktemplates/doc/src/qtquicktemplates-qmltypes.qdoc
index c2c183ae72..c2c183ae72 100644
--- a/src/quicktemplates/doc/src/qtquicktemplates2-qmltypes.qdoc
+++ b/src/quicktemplates/doc/src/qtquicktemplates-qmltypes.qdoc
diff --git a/src/quicktemplates/qquickabstractbutton.cpp b/src/quicktemplates/qquickabstractbutton.cpp
index 5c2ecd2923..1b2bee07c9 100644
--- a/src/quicktemplates/qquickabstractbutton.cpp
+++ b/src/quicktemplates/qquickabstractbutton.cpp
@@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickAbstractButton
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-buttons
+    \ingroup qtquickcontrols-buttons
     \brief Abstract base type providing functionality common to buttons.
 
     AbstractButton provides the interface for controls with button-like
@@ -806,10 +806,10 @@ void QQuickAbstractButton::setIcon(const QQuickIcon &icon)
 
     \table
     \header \li Display \li Result
-    \row \li \c AbstractButton.IconOnly \li \image qtquickcontrols2-button-icononly.png
-    \row \li \c AbstractButton.TextOnly \li \image qtquickcontrols2-button-textonly.png
-    \row \li \c AbstractButton.TextBesideIcon \li \image qtquickcontrols2-button-textbesideicon.png
-    \row \li \c AbstractButton.TextUnderIcon \li \image qtquickcontrols2-button-textundericon.png
+    \row \li \c AbstractButton.IconOnly \li \image qtquickcontrols-button-icononly.png
+    \row \li \c AbstractButton.TextOnly \li \image qtquickcontrols-button-textonly.png
+    \row \li \c AbstractButton.TextBesideIcon \li \image qtquickcontrols-button-textbesideicon.png
+    \row \li \c AbstractButton.TextUnderIcon \li \image qtquickcontrols-button-textundericon.png
     \endtable
 
     \sa {Control::}{spacing}, {Control::}{padding}
diff --git a/src/quicktemplates/qquickaction.cpp b/src/quicktemplates/qquickaction.cpp
index 2ff5fd4a48..466501226d 100644
--- a/src/quicktemplates/qquickaction.cpp
+++ b/src/quicktemplates/qquickaction.cpp
@@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE
     \l triggered by the user via menu items, toolbar buttons, or keyboard shortcuts.
     A \l checkable Action toggles its \l checked state when triggered.
 
-    \snippet qtquickcontrols2-action.qml action
+    \snippet qtquickcontrols-action.qml action
 
     Action is commonly used to implement application commands that can be invoked
     via menu items, toolbar buttons, and keyboard shortcuts. Since the user expects
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
     example, when declaring buttons and menu items in \c .ui.qml files, actions can
     be declared elsewhere and assigned from the outside.
 
-    \snippet qtquickcontrols2-action.qml toolbutton
+    \snippet qtquickcontrols-action.qml toolbutton
 
     When an action is paired with buttons and menu items, the \c enabled, \c checkable,
     and \c checked states are synced automatically. For example, in a word processor,
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     default. An action-specific \c text or \c icon can be overridden for a specific
     control by specifying \c text or \c icon directly on the control.
 
-    \snippet qtquickcontrols2-action.qml menuitem
+    \snippet qtquickcontrols-action.qml menuitem
 
     Since Action presents a user interface action, it is intended to be assigned to
     a \l MenuItem, \l ToolButton, or any other control that inherits \l AbstractButton.
diff --git a/src/quicktemplates/qquickapplicationwindow.cpp b/src/quicktemplates/qquickapplicationwindow.cpp
index b0997aff0b..95dca6561e 100644
--- a/src/quicktemplates/qquickapplicationwindow.cpp
+++ b/src/quicktemplates/qquickapplicationwindow.cpp
@@ -27,8 +27,8 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickApplicationWindow
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-containers
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-containers
+    \ingroup qtquickcontrols-focusscopes
     \brief Styled top-level window with support for a header and footer.
 
     ApplicationWindow is a \l Window which makes it convenient to add
@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
     and run it by using \l QQmlApplicationEngine.  In this way you can control
     the window's properties, appearance and layout from QML.
 
-    \image qtquickcontrols2-applicationwindow-wireframe.png
+    \image qtquickcontrols-applicationwindow-wireframe.png
 
     \qml
     import QtQuick.Controls 2.12
diff --git a/src/quicktemplates/qquickbusyindicator.cpp b/src/quicktemplates/qquickbusyindicator.cpp
index bd51a33096..f8811a47c5 100644
--- a/src/quicktemplates/qquickbusyindicator.cpp
+++ b/src/quicktemplates/qquickbusyindicator.cpp
@@ -12,10 +12,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickBusyIndicator
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-indicators
+    \ingroup qtquickcontrols-indicators
     \brief Indicates background activity, for example, while content is being loaded.
 
-    \image qtquickcontrols2-busyindicator.gif
+    \image qtquickcontrols-busyindicator.gif
 
     The busy indicator should be used to indicate activity while content is
     being loaded or the UI is blocked waiting for a resource to become available.
diff --git a/src/quicktemplates/qquickbutton.cpp b/src/quicktemplates/qquickbutton.cpp
index d7f514d1a1..5e9476c039 100644
--- a/src/quicktemplates/qquickbutton.cpp
+++ b/src/quicktemplates/qquickbutton.cpp
@@ -14,10 +14,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickButton
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-buttons
+    \ingroup qtquickcontrols-buttons
     \brief Push-button that can be clicked to perform a command or answer a question.
 
-    \image qtquickcontrols2-button.gif
+    \image qtquickcontrols-button.gif
 
     Button presents a push-button control that can be pushed or clicked by
     the user. Buttons are normally used to perform an action, or to answer
@@ -71,7 +71,7 @@ QFont QQuickButton::defaultFont() const
 
     This property holds whether the button is highlighted.
 
-    \image qtquickcontrols2-button-highlighted.gif
+    \image qtquickcontrols-button-highlighted.gif
 
     A button can be highlighted in order to draw the user's attention towards
     it. It has no effect on keyboard interaction.
@@ -99,7 +99,7 @@ void QQuickButton::setHighlighted(bool highlighted)
 
     This property holds whether the button is flat.
 
-    \image qtquickcontrols2-button-flat.gif
+    \image qtquickcontrols-button-flat.gif
 
     A flat button typically does not draw a background unless it is pressed or checked.
 
diff --git a/src/quicktemplates/qquickcalendarmodel.cpp b/src/quicktemplates/qquickcalendarmodel.cpp
index 62d54b296c..0bac0969e0 100644
--- a/src/quicktemplates/qquickcalendarmodel.cpp
+++ b/src/quicktemplates/qquickcalendarmodel.cpp
@@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE
     instances. It is typically used as a model for a ListView that uses
     MonthGrid as a delegate.
 
-    \snippet qtquickcontrols2-calendarmodel.qml 1
+    \snippet qtquickcontrols-calendarmodel.qml 1
 
     In addition to the \c index property, a list of model data roles
     are available in the context of each delegate:
diff --git a/src/quicktemplates/qquickcheckbox.cpp b/src/quicktemplates/qquickcheckbox.cpp
index 1c6dc11eea..21038ccdb9 100644
--- a/src/quicktemplates/qquickcheckbox.cpp
+++ b/src/quicktemplates/qquickcheckbox.cpp
@@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickCheckBox
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-buttons
+    \ingroup qtquickcontrols-buttons
     \brief Check button that can be toggled on or off.
 
-    \image qtquickcontrols2-checkbox.gif
+    \image qtquickcontrols-checkbox.gif
 
     CheckBox presents an option button that can be toggled on (checked) or
     off (unchecked). Check boxes are typically used to select one or more
@@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE
     Hierarchical checkbox groups can be managed with a non-exclusive
     \l ButtonGroup.
 
-    \image qtquickcontrols2-checkbox-group.png
+    \image qtquickcontrols-checkbox-group.png
 
     The following example illustrates how the combined check state of
     children can be bound to the check state of the parent checkbox:
 
-    \snippet qtquickcontrols2-checkbox-group.qml 1
+    \snippet qtquickcontrols-checkbox-group.qml 1
 
     \sa {Customizing CheckBox}, ButtonGroup, {Button Controls}
 */
@@ -98,7 +98,7 @@ QQuickCheckBox::QQuickCheckBox(QQuickItem *parent)
 
     In the animation below, the first checkbox is tri-state:
 
-    \image qtquickcontrols2-checkbox-tristate.gif
+    \image qtquickcontrols-checkbox-tristate.gif
 
     The default is \c false, i.e., the checkbox has only two states.
 */
diff --git a/src/quicktemplates/qquickcheckdelegate.cpp b/src/quicktemplates/qquickcheckdelegate.cpp
index 18ed8e747c..a3c4a1b23c 100644
--- a/src/quicktemplates/qquickcheckdelegate.cpp
+++ b/src/quicktemplates/qquickcheckdelegate.cpp
@@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickCheckDelegate
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-delegates
+    \ingroup qtquickcontrols-delegates
     \brief Item delegate with a check indicator that can be toggled on or off.
 
-    \image qtquickcontrols2-checkdelegate.gif
+    \image qtquickcontrols-checkdelegate.gif
 
     CheckDelegate presents an item delegate that can be toggled on (checked) or
     off (unchecked). Check delegates are typically used to select one or more
@@ -85,7 +85,7 @@ QQuickCheckDelegate::QQuickCheckDelegate(QQuickItem *parent)
 
     In the animation below, the first checkdelegate is tri-state:
 
-    \image qtquickcontrols2-checkdelegate-tristate.gif
+    \image qtquickcontrols-checkdelegate-tristate.gif
 
     The default is \c false, i.e., the delegate has only two states.
 */
diff --git a/src/quicktemplates/qquickcombobox.cpp b/src/quicktemplates/qquickcombobox.cpp
index f90cf0254f..d421dd4610 100644
--- a/src/quicktemplates/qquickcombobox.cpp
+++ b/src/quicktemplates/qquickcombobox.cpp
@@ -35,11 +35,11 @@ Q_LOGGING_CATEGORY(lcCalculateWidestTextWidth, "qt.quick.controls.combobox.calcu
 //!     \instantiates QQuickComboBox
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-input
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-input
+    \ingroup qtquickcontrols-focusscopes
     \brief Combined button and popup list for selecting options.
 
-    \image qtquickcontrols2-combobox.gif
+    \image qtquickcontrols-combobox.gif
 
     ComboBox is a combined button and popup list. It provides a means of
     presenting a list of options to the user in a way that takes up the
@@ -63,7 +63,7 @@ Q_LOGGING_CATEGORY(lcCalculateWidestTextWidth, "qt.quick.controls.combobox.calcu
     The following example demonstrates appending content to an editable
     combo box by reacting to the \l accepted signal.
 
-    \snippet qtquickcontrols2-combobox-accepted.qml combobox
+    \snippet qtquickcontrols-combobox-accepted.qml combobox
 
     \section1 ComboBox's Popup
 
@@ -71,12 +71,12 @@ Q_LOGGING_CATEGORY(lcCalculateWidestTextWidth, "qt.quick.controls.combobox.calcu
     event is propagated to items lower in the stacking order. To prevent the
     popup from closing, set its \l {Popup::}{closePolicy}:
 
-    \snippet qtquickcontrols2-combobox-popup.qml closePolicy
+    \snippet qtquickcontrols-combobox-popup.qml closePolicy
 
     To prevent event propagation, set its \l {Popup::}{modal} property to
     \c true:
 
-    \snippet qtquickcontrols2-combobox-popup.qml modal
+    \snippet qtquickcontrols-combobox-popup.qml modal
 
     \section1 ComboBox Model Roles
 
@@ -96,7 +96,7 @@ Q_LOGGING_CATEGORY(lcCalculateWidestTextWidth, "qt.quick.controls.combobox.calcu
 
     For example:
 
-    \snippet qtquickcontrols2-combobox-valuerole.qml file
+    \snippet qtquickcontrols-combobox-valuerole.qml file
 
     \note If ComboBox is assigned a data model that has multiple named roles, but
     \l textRole is not defined, ComboBox is unable to visualize it and throws a
@@ -140,7 +140,7 @@ Q_LOGGING_CATEGORY(lcCalculateWidestTextWidth, "qt.quick.controls.combobox.calcu
     You can handle this signal in order to add the newly entered
     item to the model, for example:
 
-    \snippet qtquickcontrols2-combobox-accepted.qml combobox
+    \snippet qtquickcontrols-combobox-accepted.qml combobox
 
     Before the signal is emitted, a check is done to see if the string
     exists in the model. If it does, \l currentIndex will be set to its index,
@@ -1805,7 +1805,7 @@ void QQuickComboBox::setImplicitContentWidthPolicy(QQuickComboBox::ImplicitConte
 
     \include qquickcombobox.qdocinc functions-after-component-completion
     For example:
-    \snippet qtquickcontrols2-combobox-textat.qml textat
+    \snippet qtquickcontrols-combobox-textat.qml textat
 
     \sa textRole
 */
@@ -1838,7 +1838,7 @@ QString QQuickComboBox::textAt(int index) const
 
     \include qquickcombobox.qdocinc functions-after-component-completion
     For example:
-    \snippet qtquickcontrols2-combobox-find.qml find
+    \snippet qtquickcontrols-combobox-find.qml find
 
     \sa textRole
 */
diff --git a/src/quicktemplates/qquickcontainer.cpp b/src/quicktemplates/qquickcontainer.cpp
index 45bdfcc5b3..eefc9161e9 100644
--- a/src/quicktemplates/qquickcontainer.cpp
+++ b/src/quicktemplates/qquickcontainer.cpp
@@ -14,7 +14,7 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickContainer
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-containers
+    \ingroup qtquickcontrols-containers
     \brief Abstract base type providing functionality common to containers.
 
     Container is the base type of container-like user interface controls that
diff --git a/src/quicktemplates/qquickcontrol.cpp b/src/quicktemplates/qquickcontrol.cpp
index 0f6d02ccbd..cff2a3781e 100644
--- a/src/quicktemplates/qquickcontrol.cpp
+++ b/src/quicktemplates/qquickcontrol.cpp
@@ -42,7 +42,7 @@ Q_LOGGING_CATEGORY(lcItemManagement, "qt.quick.controls.control.itemmanagement")
 
     The following diagram illustrates the layout of a typical control:
 
-    \image qtquickcontrols2-control.png
+    \image qtquickcontrols-control.png
 
     The \l {Item::}{implicitWidth} and \l {Item::}{implicitHeight} of a control
     are typically based on the implicit sizes of the background and the content
diff --git a/src/quicktemplates/qquickdayofweekrow.cpp b/src/quicktemplates/qquickdayofweekrow.cpp
index 032ea4a069..e14f9962c8 100644
--- a/src/quicktemplates/qquickdayofweekrow.cpp
+++ b/src/quicktemplates/qquickdayofweekrow.cpp
@@ -18,15 +18,15 @@ QT_BEGIN_NAMESPACE
     DayOfWeekRow presents day of week names in a row. The names of the days
     are ordered and formatted using the specified \l {Control::locale}{locale}.
 
-    \image qtquickcontrols2-dayofweekrow.png
-    \snippet qtquickcontrols2-dayofweekrow.qml 1
+    \image qtquickcontrols-dayofweekrow.png
+    \snippet qtquickcontrols-dayofweekrow.qml 1
 
     DayOfWeekRow can be used as a standalone control, but it is most
     often used in conjunction with MonthGrid. Regardless of the use case,
     positioning of the row is left to the user.
 
-    \image qtquickcontrols2-dayofweekrow-layout.png
-    \snippet qtquickcontrols2-dayofweekrow-layout.qml 1
+    \image qtquickcontrols-dayofweekrow-layout.png
+    \snippet qtquickcontrols-dayofweekrow-layout.qml 1
 
     The visual appearance of DayOfWeekRow can be changed by
     implementing a \l {delegate}{custom delegate}.
diff --git a/src/quicktemplates/qquickdelaybutton.cpp b/src/quicktemplates/qquickdelaybutton.cpp
index ad83313fed..07ba127bac 100644
--- a/src/quicktemplates/qquickdelaybutton.cpp
+++ b/src/quicktemplates/qquickdelaybutton.cpp
@@ -16,10 +16,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickDelayButton
     \inqmlmodule QtQuick.Controls
     \since 5.9
-    \ingroup qtquickcontrols2-buttons
+    \ingroup qtquickcontrols-buttons
     \brief Check button that triggers when held down long enough.
 
-    \image qtquickcontrols2-delaybutton.gif
+    \image qtquickcontrols-delaybutton.gif
 
     DelayButton is a checkable button that incorporates a delay before the
     button becomes \l {AbstractButton::}{checked} and the \l activated()
diff --git a/src/quicktemplates/qquickdial.cpp b/src/quicktemplates/qquickdial.cpp
index dd1e6b5bfe..1e3698de9f 100644
--- a/src/quicktemplates/qquickdial.cpp
+++ b/src/quicktemplates/qquickdial.cpp
@@ -18,14 +18,14 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickDial
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-input
+    \ingroup qtquickcontrols-input
     \brief Circular dial that is rotated to set a value.
 
     The Dial is similar to a traditional dial knob that is found on devices
     such as stereos or industrial equipment. It allows the user to specify a
     value within a range.
 
-    \image qtquickcontrols2-dial-no-wrap.gif
+    \image qtquickcontrols-dial-no-wrap.gif
 
     The value of the dial is set with the \l value property. The range is
     set with the \l from and \l to properties. To enable or disable wrapping,
@@ -535,12 +535,12 @@ void QQuickDial::setInputMode(QQuickDial::InputMode mode)
     the \l to position will result in the handle being positioned at the
     \l from position, and vice versa:
 
-    \image qtquickcontrols2-dial-wrap.gif
+    \image qtquickcontrols-dial-wrap.gif
 
     When this property is \c false, it's not possible to drag the dial across
     the from and to values.
 
-    \image qtquickcontrols2-dial-no-wrap.gif
+    \image qtquickcontrols-dial-no-wrap.gif
 
     The default value is \c false.
 */
diff --git a/src/quicktemplates/qquickdialog.cpp b/src/quicktemplates/qquickdialog.cpp
index 94e35d2fb1..8bf180989e 100644
--- a/src/quicktemplates/qquickdialog.cpp
+++ b/src/quicktemplates/qquickdialog.cpp
@@ -14,8 +14,8 @@ QT_BEGIN_NAMESPACE
     \inherits Popup
 //!     \instantiates QQuickDialog
     \inqmlmodule QtQuick.Controls
-    \ingroup qtquickcontrols2-dialogs
-    \ingroup qtquickcontrols2-popups
+    \ingroup qtquickcontrols-dialogs
+    \ingroup qtquickcontrols-popups
     \brief Popup dialog with standard buttons and a title, used for short-term interaction with the user.
     \since 5.8
 
@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
     with the user. Similarly to \l ApplicationWindow and \l Page, Dialog is organized
     into three sections: \l header, \l {Popup::}{contentItem}, and \l footer.
 
-    \image qtquickcontrols2-page-wireframe.png
+    \image qtquickcontrols-page-wireframe.png
 
     By default, Dialogs have \l {QQuickItem::}{focus}.
 
@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
     \l {DialogButtonBox::}{accepted()} and \l {DialogButtonBox::}{rejected()}
     signals of the button box are connected to the respective signals in Dialog.
 
-    \snippet qtquickcontrols2-dialog.qml 1
+    \snippet qtquickcontrols-dialog.qml 1
 
     \section1 Modal Dialogs
 
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     interacting with the dialog and close it before they can access any
     other content in the same window.
 
-    \snippet qtquickcontrols2-dialog-modal.qml 1
+    \snippet qtquickcontrols-dialog-modal.qml 1
 
     \section1 Modeless Dialogs
 
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     is allowed to interact with both the dialog and the other content in
     the same window.
 
-    \snippet qtquickcontrols2-dialog-modeless.qml 1
+    \snippet qtquickcontrols-dialog-modeless.qml 1
 
     \sa DialogButtonBox, {Popup Controls}
 */
@@ -323,7 +323,7 @@ void QQuickDialog::setFooter(QQuickItem *footer)
 
     This property holds a combination of standard buttons that are used by the dialog.
 
-    \snippet qtquickcontrols2-dialog.qml 1
+    \snippet qtquickcontrols-dialog.qml 1
 
     The buttons will be positioned in the appropriate order for the user's platform.
 
diff --git a/src/quicktemplates/qquickdialogbuttonbox.cpp b/src/quicktemplates/qquickdialogbuttonbox.cpp
index 9b39f9e1ab..989c9b4506 100644
--- a/src/quicktemplates/qquickdialogbuttonbox.cpp
+++ b/src/quicktemplates/qquickdialogbuttonbox.cpp
@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
     \inherits Container
 //!     \instantiates QQuickDialogButtonBox
     \inqmlmodule QtQuick.Controls
-    \ingroup qtquickcontrols2-dialogs
+    \ingroup qtquickcontrols-dialogs
     \brief A button box used in dialogs.
     \since 5.8
 
@@ -53,13 +53,13 @@ QT_BEGIN_NAMESPACE
     the standard buttons (e.g. \uicontrol OK, \uicontrol Cancel, \uicontrol Save)
     and let the button box setup the buttons.
 
-    \image qtquickcontrols2-dialogbuttonbox.png
+    \image qtquickcontrols-dialogbuttonbox.png
 
-    \snippet qtquickcontrols2-dialogbuttonbox.qml 1
+    \snippet qtquickcontrols-dialogbuttonbox.qml 1
 
     Alternatively, buttons and their roles can be specified by hand:
 
-    \snippet qtquickcontrols2-dialogbuttonbox-attached.qml 1
+    \snippet qtquickcontrols-dialogbuttonbox-attached.qml 1
 
     You can also mix and match normal buttons and standard buttons.
 
@@ -546,7 +546,7 @@ void QQuickDialogButtonBox::resetAlignment()
 
     This property holds a combination of standard buttons that are used by the button box.
 
-    \snippet qtquickcontrols2-dialogbuttonbox.qml 1
+    \snippet qtquickcontrols-dialogbuttonbox.qml 1
 
     The buttons will be positioned in the appropriate order for the user's platform.
 
@@ -808,7 +808,7 @@ QQuickDialogButtonBox *QQuickDialogButtonBoxAttached::buttonBox() const
 
     This attached property holds the role of each button in a button box.
 
-    \snippet qtquickcontrols2-dialogbuttonbox-attached.qml 1
+    \snippet qtquickcontrols-dialogbuttonbox-attached.qml 1
 
     Available values:
     \value DialogButtonBox.InvalidRole The button is invalid.
diff --git a/src/quicktemplates/qquickdrawer.cpp b/src/quicktemplates/qquickdrawer.cpp
index caef208545..122af0b379 100644
--- a/src/quicktemplates/qquickdrawer.cpp
+++ b/src/quicktemplates/qquickdrawer.cpp
@@ -21,14 +21,14 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickDrawer
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-navigation
-    \ingroup qtquickcontrols2-popups
+    \ingroup qtquickcontrols-navigation
+    \ingroup qtquickcontrols-popups
     \brief Side panel that can be opened and closed using a swipe gesture.
 
     Drawer provides a swipe-based side panel, similar to those often used in
     touch interfaces to provide a central location for navigation.
 
-    \image qtquickcontrols2-drawer.gif
+    \image qtquickcontrols-drawer.gif
 
     Drawer can be positioned at any of the four edges of the content item.
     The drawer above is positioned against the left edge of the window. The
diff --git a/src/quicktemplates/qquickframe.cpp b/src/quicktemplates/qquickframe.cpp
index 8fb516a283..8b7a766eff 100644
--- a/src/quicktemplates/qquickframe.cpp
+++ b/src/quicktemplates/qquickframe.cpp
@@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickFrame
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-containers
+    \ingroup qtquickcontrols-containers
     \brief Visual frame for a logical group of controls.
 
     Frame is used to layout a logical group of controls together within a
@@ -28,9 +28,9 @@ QT_BEGIN_NAMESPACE
     implicit size of its contained item. This makes it particularly suitable
     for use together with layouts.
 
-    \image qtquickcontrols2-frame.png
+    \image qtquickcontrols-frame.png
 
-    \snippet qtquickcontrols2-frame.qml 1
+    \snippet qtquickcontrols-frame.qml 1
 
     \sa {Customizing Frame}, {Container Controls}
 */
diff --git a/src/quicktemplates/qquickgroupbox.cpp b/src/quicktemplates/qquickgroupbox.cpp
index db319b9bab..0a19d2ed43 100644
--- a/src/quicktemplates/qquickgroupbox.cpp
+++ b/src/quicktemplates/qquickgroupbox.cpp
@@ -15,7 +15,7 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickGroupBox
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-containers
+    \ingroup qtquickcontrols-containers
     \brief Visual frame and title for a logical group of controls.
 
     GroupBox is used to layout a logical group of controls together, within
@@ -31,22 +31,22 @@ QT_BEGIN_NAMESPACE
     implicit size of its contained item. This makes it particularly suitable
     for use together with layouts.
 
-    \image qtquickcontrols2-groupbox.png
+    \image qtquickcontrols-groupbox.png
 
-    \snippet qtquickcontrols2-groupbox.qml 1
+    \snippet qtquickcontrols-groupbox.qml 1
 
     \section2 Checkable GroupBox
 
     Even though GroupBox has no built-in check box, it is straightforward
     to create a checkable GroupBox by pairing it with a CheckBox.
 
-    \image qtquickcontrols2-groupbox-checkable.png
+    \image qtquickcontrols-groupbox-checkable.png
 
     It is a common pattern to enable or disable the groupbox's children when
     its checkbox is toggled on or off, but it is up to the application to decide
     on the behavior of the checkbox.
 
-    \snippet qtquickcontrols2-groupbox-checkable.qml 1
+    \snippet qtquickcontrols-groupbox-checkable.qml 1
 
     \sa CheckBox, {Customizing GroupBox}, {Container Controls}
 */
diff --git a/src/quicktemplates/qquickheaderview.cpp b/src/quicktemplates/qquickheaderview.cpp
index 69587c6485..7f04da8577 100644
--- a/src/quicktemplates/qquickheaderview.cpp
+++ b/src/quicktemplates/qquickheaderview.cpp
@@ -7,7 +7,7 @@
 /*!
     \qmltype HorizontalHeaderView
     \inqmlmodule QtQuick.Controls
-    \ingroup qtquickcontrols2-containers
+    \ingroup qtquickcontrols-containers
     \inherits TableView
     \brief Provides a horizontal header view to accompany a \l TableView.
 
@@ -15,7 +15,7 @@
     To add a horizontal header to a TableView, bind the
     \l {HorizontalHeaderView::syncView} {syncView} property to the TableView:
 
-    \snippet qtquickcontrols2-headerview-simple.qml horizontal
+    \snippet qtquickcontrols-headerview-simple.qml horizontal
 
     The header displays data from the {syncView}'s model by default, but can
     also have its own model. If the model is a QAbstractTableModel, then
@@ -26,7 +26,7 @@
 /*!
     \qmltype VerticalHeaderView
     \inqmlmodule QtQuick.Controls
-    \ingroup qtquickcontrols2-containers
+    \ingroup qtquickcontrols-containers
     \inherits TableView
     \brief Provides a vertical header view to accompany a \l TableView.
 
@@ -34,7 +34,7 @@
     To add a vertical header to a TableView, bind the
     \l {VerticalHeaderView::syncView} {syncView} property to the TableView:
 
-    \snippet qtquickcontrols2-headerview-simple.qml vertical
+    \snippet qtquickcontrols-headerview-simple.qml vertical
 
     The header displays data from the {syncView}'s model by default, but can
     also have its own model. If the model is a QAbstractTableModel, then
diff --git a/src/quicktemplates/qquickitemdelegate.cpp b/src/quicktemplates/qquickitemdelegate.cpp
index d6b639d46c..7b0a1c12ad 100644
--- a/src/quicktemplates/qquickitemdelegate.cpp
+++ b/src/quicktemplates/qquickitemdelegate.cpp
@@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickItemDelegate
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-delegates
+    \ingroup qtquickcontrols-delegates
     \brief Basic item delegate that can be used in various views and controls.
 
-    \image qtquickcontrols2-itemdelegate.gif
+    \image qtquickcontrols-itemdelegate.gif
 
     ItemDelegate presents a standard view item. It can be used as a delegate
     in various views and controls, such as \l ListView and \l ComboBox.
@@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE
     \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls}{icon},
     and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API.
 
-    \snippet qtquickcontrols2-itemdelegate.qml 1
+    \snippet qtquickcontrols-itemdelegate.qml 1
 
     \sa {Customizing ItemDelegate}, {Delegate Controls}
 */
diff --git a/src/quicktemplates/qquicklabel.cpp b/src/quicktemplates/qquicklabel.cpp
index 088207af6a..116884a46f 100644
--- a/src/quicktemplates/qquicklabel.cpp
+++ b/src/quicktemplates/qquicklabel.cpp
@@ -29,9 +29,9 @@ QT_BEGIN_NAMESPACE
     inheritance. The default colors and font are style specific. Label
     can also have a visual \l background item.
 
-    \image qtquickcontrols2-label.png
+    \image qtquickcontrols-label.png
 
-    \snippet qtquickcontrols2-label.qml 1
+    \snippet qtquickcontrols-label.qml 1
 
     You can use the properties of \l Text to change the appearance of the text as desired:
 
diff --git a/src/quicktemplates/qquickmenu.cpp b/src/quicktemplates/qquickmenu.cpp
index cc0cc36675..0324490a1b 100644
--- a/src/quicktemplates/qquickmenu.cpp
+++ b/src/quicktemplates/qquickmenu.cpp
@@ -41,11 +41,11 @@ static const int SUBMENU_DELAY = 225;
 //!     \instantiates QQuickMenu
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-menus
-    \ingroup qtquickcontrols2-popups
+    \ingroup qtquickcontrols-menus
+    \ingroup qtquickcontrols-popups
     \brief Menu popup that can be used as a context menu or popup menu.
 
-    \image qtquickcontrols2-menu.png
+    \image qtquickcontrols-menu.png
 
     Menu has two main use cases:
     \list
@@ -154,7 +154,7 @@ static const int SUBMENU_DELAY = 225;
     code shows how you can implement a "Recent Files" submenu, where the items
     come from a list of files stored in settings:
 
-    \snippet qtquickcontrols2-menu-instantiator.qml menu
+    \snippet qtquickcontrols-menu-instantiator.qml menu
 
     \sa {Customizing Menu}, MenuItem, {Menu Controls}, {Popup Controls}
 */
diff --git a/src/quicktemplates/qquickmenubar.cpp b/src/quicktemplates/qquickmenubar.cpp
index 624347822c..3af5bdd6d3 100644
--- a/src/quicktemplates/qquickmenubar.cpp
+++ b/src/quicktemplates/qquickmenubar.cpp
@@ -22,16 +22,16 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickMenuBar
     \inqmlmodule QtQuick.Controls
     \since 5.10
-    \ingroup qtquickcontrols2-menus
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-menus
+    \ingroup qtquickcontrols-focusscopes
     \brief Provides a window menu bar.
 
-    \image qtquickcontrols2-menubar.png
+    \image qtquickcontrols-menubar.png
 
     MenuBar consists of drop-down menus, and is normally located at the top
     edge of the window.
 
-    \quotefromfile qtquickcontrols2-menubar.qml
+    \quotefromfile qtquickcontrols-menubar.qml
     \skipuntil begin
     \printto skipfrom
     \skipuntil skipto
diff --git a/src/quicktemplates/qquickmenubaritem.cpp b/src/quicktemplates/qquickmenubaritem.cpp
index 6e78b74913..03e8c60f03 100644
--- a/src/quicktemplates/qquickmenubaritem.cpp
+++ b/src/quicktemplates/qquickmenubaritem.cpp
@@ -14,13 +14,13 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickMenuBarItem
     \inqmlmodule QtQuick.Controls
     \since 5.10
-    \ingroup qtquickcontrols2-menus
+    \ingroup qtquickcontrols-menus
     \brief Presents a drop-down menu within a MenuBar.
 
     MenuBarItem presents a Menu within a MenuBar. The respective drop-down menu
     is shown when a MenuBarItem is \l triggered via keyboard, mouse, or touch.
 
-    \image qtquickcontrols2-menubar.png
+    \image qtquickcontrols-menubar.png
 
     MenuBarItem is used as a default \l {MenuBar::}{delegate} type for MenuBar.
     Notice that it is not necessary to declare MenuBarItem instances by hand when
diff --git a/src/quicktemplates/qquickmenuitem.cpp b/src/quicktemplates/qquickmenuitem.cpp
index 2632affe9b..c5b0ea2753 100644
--- a/src/quicktemplates/qquickmenuitem.cpp
+++ b/src/quicktemplates/qquickmenuitem.cpp
@@ -17,7 +17,7 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickMenuItem
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-menus
+    \ingroup qtquickcontrols-menus
     \brief Presents an item within a Menu.
 
     MenuItem is a convenience type that implements the AbstractButton API,
diff --git a/src/quicktemplates/qquickmenuseparator.cpp b/src/quicktemplates/qquickmenuseparator.cpp
index 12b985b744..d9aa770ca5 100644
--- a/src/quicktemplates/qquickmenuseparator.cpp
+++ b/src/quicktemplates/qquickmenuseparator.cpp
@@ -12,15 +12,15 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickMenuSeparator
     \inqmlmodule QtQuick.Controls
     \since 5.8
-    \ingroup qtquickcontrols2-separators
+    \ingroup qtquickcontrols-separators
     \brief Separates a group of items in a menu from adjacent items.
 
     MenuSeparator is used to visually distinguish between groups of items in a
     menu by separating them with a line.
 
-    \image qtquickcontrols2-menuseparator.png
+    \image qtquickcontrols-menuseparator.png
 
-    \quotefromfile qtquickcontrols2-menuseparator-custom.qml
+    \quotefromfile qtquickcontrols-menuseparator-custom.qml
     \skipto import QtQuick
     \printuntil import QtQuick.Controls
     \skipto Menu
diff --git a/src/quicktemplates/qquickmonthgrid.cpp b/src/quicktemplates/qquickmonthgrid.cpp
index c7edc583bd..a470017676 100644
--- a/src/quicktemplates/qquickmonthgrid.cpp
+++ b/src/quicktemplates/qquickmonthgrid.cpp
@@ -21,15 +21,15 @@ QT_BEGIN_NAMESPACE
     calculated for a given \l month and \l year, using the specified
     \l {Control::locale}{locale}.
 
-    \image qtquickcontrols2-monthgrid.png
-    \snippet qtquickcontrols2-monthgrid.qml 1
+    \image qtquickcontrols-monthgrid.png
+    \snippet qtquickcontrols-monthgrid.qml 1
 
     MonthGrid can be used as a standalone control, but it is most often
     used in conjunction with DayOfWeekRow and WeekNumberColumn. Regardless
     of the use case, positioning of the grid is left to the user.
 
-    \image qtquickcontrols2-monthgrid-layout.png
-    \snippet qtquickcontrols2-monthgrid-layout.qml 1
+    \image qtquickcontrols-monthgrid-layout.png
+    \snippet qtquickcontrols-monthgrid-layout.qml 1
 
     The visual appearance of MonthGrid can be changed by
     implementing a \l {delegate}{custom delegate}.
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
     To localize days, use \l {Locale::toString()}{Locale.toString()}.
     For example, to display day numbers in an Arabic locale:
 
-    \snippet qtquickcontrols2-monthgrid-localization.qml 1
+    \snippet qtquickcontrols-monthgrid-localization.qml 1
 
     \sa DayOfWeekRow, WeekNumberColumn, CalendarModel
 */
diff --git a/src/quicktemplates/qquickoverlay.cpp b/src/quicktemplates/qquickoverlay.cpp
index 3b5e4afd1d..9f8393d7a1 100644
--- a/src/quicktemplates/qquickoverlay.cpp
+++ b/src/quicktemplates/qquickoverlay.cpp
@@ -679,7 +679,7 @@ QQuickOverlay *QQuickOverlayAttached::overlay() const
     For example, to change the color of the background dimming for a modal
     popup, the following code can be used:
 
-    \snippet qtquickcontrols2-overlay-modal.qml 1
+    \snippet qtquickcontrols-overlay-modal.qml 1
 
     \sa Popup::modal
 */
@@ -711,7 +711,7 @@ void QQuickOverlayAttached::setModal(QQmlComponent *modal)
     For example, to change the color of the background dimming for a modeless
     popup, the following code can be used:
 
-    \snippet qtquickcontrols2-overlay-modeless.qml 1
+    \snippet qtquickcontrols-overlay-modeless.qml 1
 
     \sa Popup::dim
 */
diff --git a/src/quicktemplates/qquickpage.cpp b/src/quicktemplates/qquickpage.cpp
index 6ada004c40..28348c2518 100644
--- a/src/quicktemplates/qquickpage.cpp
+++ b/src/quicktemplates/qquickpage.cpp
@@ -15,14 +15,14 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickPage
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-containers
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-containers
+    \ingroup qtquickcontrols-focusscopes
     \brief Styled page control with support for a header and footer.
 
     Page is a container control which makes it convenient to add
     a \l header and \l footer item to a page.
 
-    \image qtquickcontrols2-page-wireframe.png
+    \image qtquickcontrols-page-wireframe.png
 
     Items declared as children of a Page are:
     \list
diff --git a/src/quicktemplates/qquickpageindicator.cpp b/src/quicktemplates/qquickpageindicator.cpp
index de0bb137c1..b0bc5188fe 100644
--- a/src/quicktemplates/qquickpageindicator.cpp
+++ b/src/quicktemplates/qquickpageindicator.cpp
@@ -15,14 +15,14 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickPageIndicator
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-indicators
+    \ingroup qtquickcontrols-indicators
     \brief Indicates the currently active page.
 
     PageIndicator is used to indicate the currently active page
     in a container of multiple pages. PageIndicator consists of
     delegate items that present pages.
 
-    \image qtquickcontrols2-pageindicator.png
+    \image qtquickcontrols-pageindicator.png
 
     \code
     Column {
@@ -226,7 +226,7 @@ void QQuickPageIndicator::setCurrentIndex(int index)
     reacts to presses and automatically changes the \l {currentIndex}{current index}
     appropriately.
 
-    \snippet qtquickcontrols2-pageindicator-interactive.qml 1
+    \snippet qtquickcontrols-pageindicator-interactive.qml 1
 
     \note Page indicators are typically quite small (in order to avoid
     distracting the user from the actual content of the user interface). They
diff --git a/src/quicktemplates/qquickpane.cpp b/src/quicktemplates/qquickpane.cpp
index 05e5c90883..9f14843db4 100644
--- a/src/quicktemplates/qquickpane.cpp
+++ b/src/quicktemplates/qquickpane.cpp
@@ -17,8 +17,8 @@ Q_LOGGING_CATEGORY(lcPane, "qt.quick.controls.pane")
 //!     \instantiates QQuickPane
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-containers
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-containers
+    \ingroup qtquickcontrols-focusscopes
     \brief Provides a background matching with the application style and theme.
 
     Pane provides a background color that matches with the application style
@@ -36,9 +36,9 @@ Q_LOGGING_CATEGORY(lcPane, "qt.quick.controls.pane")
     implicit size of its contained item. This makes it particularly suitable
     for use together with layouts.
 
-    \image qtquickcontrols2-pane.png
+    \image qtquickcontrols-pane.png
 
-    \snippet qtquickcontrols2-pane.qml 1
+    \snippet qtquickcontrols-pane.qml 1
 
     Sometimes there might be two items within the pane:
 
diff --git a/src/quicktemplates/qquickpopup.cpp b/src/quicktemplates/qquickpopup.cpp
index 65d395247e..20f96e5e1b 100644
--- a/src/quicktemplates/qquickpopup.cpp
+++ b/src/quicktemplates/qquickpopup.cpp
@@ -28,8 +28,8 @@ Q_LOGGING_CATEGORY(lcPopup, "qt.quick.controls.popup")
 //!     \instantiates QQuickPopup
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-popups
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-popups
+    \ingroup qtquickcontrols-focusscopes
     \brief Base type of popup-like user interface controls.
 
     Popup is the base type of popup-like user interface controls. It can be
@@ -78,7 +78,7 @@ Q_LOGGING_CATEGORY(lcPopup, "qt.quick.controls.popup")
 
     The following diagram illustrates the layout of a popup within a window:
 
-    \image qtquickcontrols2-popup.png
+    \image qtquickcontrols-popup.png
 
     The \l implicitWidth and \l implicitHeight of a popup are typically based
     on the implicit sizes of the background and the content item plus any insets
@@ -181,7 +181,7 @@ Q_LOGGING_CATEGORY(lcPopup, "qt.quick.controls.popup")
     Another way to center a popup in the window regardless of its parent item
     is to use \l {anchors.centerIn}:
 
-    \snippet qtquickcontrols2-popup.qml centerIn
+    \snippet qtquickcontrols-popup.qml centerIn
 
     To ensure that the popup is positioned within the bounds of the enclosing
     window, the \l margins property can be set to a non-negative value.
@@ -662,7 +662,7 @@ void QQuickPopupPrivate::setBottomMargin(qreal value, bool reset)
 
     It is also possible to center the popup in the window by using \l Overlay:
 
-    \snippet qtquickcontrols2-popup.qml centerIn
+    \snippet qtquickcontrols-popup.qml centerIn
 
     This makes it easy to center a popup in the window from any component.
 
@@ -2107,7 +2107,7 @@ void QQuickPopup::resetClosePolicy()
     Nine transform origins are available, as shown in the image below.
     The default transform origin is \c Popup.Center.
 
-    \image qtquickcontrols2-popup-transformorigin.png
+    \image qtquickcontrols-popup-transformorigin.png
 
     \sa enter, exit, Item::transformOrigin
 */
diff --git a/src/quicktemplates/qquickprogressbar.cpp b/src/quicktemplates/qquickprogressbar.cpp
index 3bdd1baaec..c42a62b4fe 100644
--- a/src/quicktemplates/qquickprogressbar.cpp
+++ b/src/quicktemplates/qquickprogressbar.cpp
@@ -12,10 +12,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickProgressBar
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-indicators
+    \ingroup qtquickcontrols-indicators
     \brief Indicates the progress of an operation.
 
-    \image qtquickcontrols2-progressbar.gif
+    \image qtquickcontrols-progressbar.gif
 
     ProgressBar indicates the progress of an operation. The value should be updated
     regularly. The range is defined by \l from and \l to, which both can contain any value.
@@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE
     for example, when unable to determine the size of the item being downloaded,
     or if the download progress gets interrupted due to a network disconnection.
 
-    \image qtquickcontrols2-progressbar-indeterminate.gif
+    \image qtquickcontrols-progressbar-indeterminate.gif
 
     \code
     ProgressBar {
@@ -196,7 +196,7 @@ qreal QQuickProgressBar::visualPosition() const
     A progress bar in indeterminate mode displays that an operation is in progress, but it
     doesn't show how much progress has been made.
 
-    \image qtquickcontrols2-progressbar-indeterminate.gif
+    \image qtquickcontrols-progressbar-indeterminate.gif
 */
 bool QQuickProgressBar::isIndeterminate() const
 {
diff --git a/src/quicktemplates/qquickradiobutton.cpp b/src/quicktemplates/qquickradiobutton.cpp
index eb19c3edd8..a943da9de6 100644
--- a/src/quicktemplates/qquickradiobutton.cpp
+++ b/src/quicktemplates/qquickradiobutton.cpp
@@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickRadioButton
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-buttons
+    \ingroup qtquickcontrols-buttons
     \brief Exclusive radio button that can be toggled on or off.
 
-    \image qtquickcontrols2-radiobutton.gif
+    \image qtquickcontrols-radiobutton.gif
 
     RadioButton presents an option button that can be toggled on (checked) or
     off (unchecked). Radio buttons are typically used to select one option
diff --git a/src/quicktemplates/qquickradiodelegate.cpp b/src/quicktemplates/qquickradiodelegate.cpp
index 585d19df99..2c390ad487 100644
--- a/src/quicktemplates/qquickradiodelegate.cpp
+++ b/src/quicktemplates/qquickradiodelegate.cpp
@@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickRadioDelegate
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-delegates
+    \ingroup qtquickcontrols-delegates
     \brief Exclusive item delegate with a radio indicator that can be toggled on or off.
 
-    \image qtquickcontrols2-radiodelegate.gif
+    \image qtquickcontrols-radiodelegate.gif
 
     RadioDelegate presents an item delegate that can be toggled on (checked) or
     off (unchecked). Radio delegates are typically used to select one option
diff --git a/src/quicktemplates/qquickrangeslider.cpp b/src/quicktemplates/qquickrangeslider.cpp
index 1386c6db62..ff15a9194e 100644
--- a/src/quicktemplates/qquickrangeslider.cpp
+++ b/src/quicktemplates/qquickrangeslider.cpp
@@ -16,11 +16,11 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickRangeSlider
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-input
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-input
+    \ingroup qtquickcontrols-focusscopes
     \brief Used to select a range of values by sliding two handles along a track.
 
-    \image qtquickcontrols2-rangeslider.gif
+    \image qtquickcontrols-rangeslider.gif
 
     RangeSlider is used to select a range specified by two values, by sliding
     each handle along a track.
diff --git a/src/quicktemplates/qquickroundbutton.cpp b/src/quicktemplates/qquickroundbutton.cpp
index 335e1fce47..534fb2ed4e 100644
--- a/src/quicktemplates/qquickroundbutton.cpp
+++ b/src/quicktemplates/qquickroundbutton.cpp
@@ -13,16 +13,16 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickRoundButton
     \inqmlmodule QtQuick.Controls
     \since 5.8
-    \ingroup qtquickcontrols2-buttons
+    \ingroup qtquickcontrols-buttons
     \brief A push-button control with rounded corners that can be clicked by the user.
 
-    \image qtquickcontrols2-roundbutton.png
+    \image qtquickcontrols-roundbutton.png
 
     RoundButton is identical to \l Button, except that it has a \l radius property
     which allows the corners to be rounded without having to customize the
     \l background.
 
-    \snippet qtquickcontrols2-roundbutton.qml 1
+    \snippet qtquickcontrols-roundbutton.qml 1
 
     \sa {Customizing RoundButton}, {Button Controls}
 */
diff --git a/src/quicktemplates/qquickscrollbar.cpp b/src/quicktemplates/qquickscrollbar.cpp
index 5715d7fbd0..67fc8116a6 100644
--- a/src/quicktemplates/qquickscrollbar.cpp
+++ b/src/quicktemplates/qquickscrollbar.cpp
@@ -19,10 +19,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickScrollBar
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-indicators
+    \ingroup qtquickcontrols-indicators
     \brief Vertical or horizontal interactive scroll bar.
 
-    \image qtquickcontrols2-scrollbar.gif
+    \image qtquickcontrols-scrollbar.gif
 
     ScrollBar is an interactive bar that can be used to scroll to a specific
     position. A scroll bar can be either \l vertical or \l horizontal, and can
@@ -94,7 +94,7 @@ QT_BEGIN_NAMESPACE
     to either direction, establish a two-way binding between the active states
     as presented by the following example:
 
-    \snippet qtquickcontrols2-scrollbar-active.qml 1
+    \snippet qtquickcontrols-scrollbar-active.qml 1
 
     \section1 Non-attached Scroll Bars
 
@@ -104,9 +104,9 @@ QT_BEGIN_NAMESPACE
     following example, horizontal and vertical scroll bars are used to
     scroll over the text without using \l Flickable:
 
-    \snippet qtquickcontrols2-scrollbar-non-attached.qml 1
+    \snippet qtquickcontrols-scrollbar-non-attached.qml 1
 
-    \image qtquickcontrols2-scrollbar-non-attached.png
+    \image qtquickcontrols-scrollbar-non-attached.png
 
     When using a non-attached ScrollBar, the following must be done manually:
 
@@ -590,9 +590,9 @@ void QQuickScrollBar::setOrientation(Qt::Orientation orientation)
     \table
     \header
         \row \li \b Value \li \b Example
-        \row \li \c ScrollBar.NoSnap \li \image qtquickcontrols2-scrollbar-nosnap.gif
-        \row \li \c ScrollBar.SnapAlways \li \image qtquickcontrols2-scrollbar-snapalways.gif
-        \row \li \c ScrollBar.SnapOnRelease \li \image qtquickcontrols2-scrollbar-snaponrelease.gif
+        \row \li \c ScrollBar.NoSnap \li \image qtquickcontrols-scrollbar-nosnap.gif
+        \row \li \c ScrollBar.SnapAlways \li \image qtquickcontrols-scrollbar-snapalways.gif
+        \row \li \c ScrollBar.SnapOnRelease \li \image qtquickcontrols-scrollbar-snaponrelease.gif
     \endtable
 
     \sa stepSize
@@ -656,7 +656,7 @@ void QQuickScrollBar::resetInteractive()
 
     The following example keeps the vertical scroll bar always visible:
 
-    \snippet qtquickcontrols2-scrollbar-policy.qml 1
+    \snippet qtquickcontrols-scrollbar-policy.qml 1
 */
 QQuickScrollBar::Policy QQuickScrollBar::policy() const
 {
diff --git a/src/quicktemplates/qquickscrollindicator.cpp b/src/quicktemplates/qquickscrollindicator.cpp
index 9017890b8e..3a691852bc 100644
--- a/src/quicktemplates/qquickscrollindicator.cpp
+++ b/src/quicktemplates/qquickscrollindicator.cpp
@@ -16,10 +16,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickScrollIndicator
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-indicators
+    \ingroup qtquickcontrols-indicators
     \brief Vertical or horizontal non-interactive scroll indicator.
 
-    \image qtquickcontrols2-scrollindicator.gif
+    \image qtquickcontrols-scrollindicator.gif
 
     ScrollIndicator is a non-interactive indicator that indicates the current scroll
     position. A scroll indicator can be either \l vertical or \l horizontal, and can
@@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE
     to either direction, establish a two-way binding between the active states as
     presented by the following example:
 
-    \snippet qtquickcontrols2-scrollindicator-active.qml 1
+    \snippet qtquickcontrols-scrollindicator-active.qml 1
 
     \section1 Non-attached Scroll Indicators
 
@@ -86,9 +86,9 @@ QT_BEGIN_NAMESPACE
     indicate how far the user has scrolled over the text (using \l MouseArea
     instead of \l Flickable):
 
-    \snippet qtquickcontrols2-scrollindicator-non-attached.qml 1
+    \snippet qtquickcontrols-scrollindicator-non-attached.qml 1
 
-    \image qtquickcontrols2-scrollindicator-non-attached.png
+    \image qtquickcontrols-scrollindicator-non-attached.png
 
     \sa ScrollBar, {Customizing ScrollIndicator}, {Indicator Controls}
 */
diff --git a/src/quicktemplates/qquickscrollview.cpp b/src/quicktemplates/qquickscrollview.cpp
index b78ca920f4..8a352b7f61 100644
--- a/src/quicktemplates/qquickscrollview.cpp
+++ b/src/quicktemplates/qquickscrollview.cpp
@@ -15,23 +15,23 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickScrollView
     \inqmlmodule QtQuick.Controls
     \since 5.9
-    \ingroup qtquickcontrols2-containers
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-containers
+    \ingroup qtquickcontrols-focusscopes
     \brief Scrollable view.
 
     ScrollView provides scrolling for user-defined content. It can be used to
     either replace a \l Flickable, or to decorate an existing one.
 
-    \image qtquickcontrols2-scrollview.png
+    \image qtquickcontrols-scrollview.png
 
     The first example demonstrates the simplest usage of ScrollView.
 
-    \snippet qtquickcontrols2-scrollview.qml file
+    \snippet qtquickcontrols-scrollview.qml file
 
     The second example illustrates using an existing \l Flickable, that is,
     a \l ListView.
 
-    \snippet qtquickcontrols2-scrollview-listview.qml file
+    \snippet qtquickcontrols-scrollview-listview.qml file
 
     \note As of Qt-6.0, ScrollView automatically clips its contents if you
     don't use a Flickable as a child. If this is not wanted, you can
@@ -67,24 +67,24 @@ QT_BEGIN_NAMESPACE
     bar policies so that the horizontal scroll bar is always off, and the vertical
     scroll bar is always on.
 
-    \snippet qtquickcontrols2-scrollview-policy.qml file
+    \snippet qtquickcontrols-scrollview-policy.qml file
 
     \section2 Touch vs. Mouse Interaction
 
     On touch, ScrollView enables flicking and makes the scroll bars non-interactive.
 
-    \image qtquickcontrols2-scrollindicator.gif
+    \image qtquickcontrols-scrollindicator.gif
 
     When interacted with a mouse device, flicking is disabled and the scroll bars
     are interactive.
 
-    \image qtquickcontrols2-scrollbar.gif
+    \image qtquickcontrols-scrollbar.gif
 
     Scroll bars can be made interactive on touch, or non-interactive when interacted
     with a mouse device, by setting the \l {ScrollBar::}{interactive} property explicitly
     to \c true or \c false, respectively.
 
-    \snippet qtquickcontrols2-scrollview-interactive.qml file
+    \snippet qtquickcontrols-scrollview-interactive.qml file
 
     \sa ScrollBar, ScrollIndicator, {Customizing ScrollView}, {Container Controls},
         {Focus Management in Qt Quick Controls}
diff --git a/src/quicktemplates/qquickselectionrectangle.cpp b/src/quicktemplates/qquickselectionrectangle.cpp
index 612b53dca2..9e9fa60710 100644
--- a/src/quicktemplates/qquickselectionrectangle.cpp
+++ b/src/quicktemplates/qquickselectionrectangle.cpp
@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
     \ingroup utilities
     \brief Used to select table cells inside a TableView.
 
-    \image qtquickcontrols2-selectionrectangle.png
+    \image qtquickcontrols-selectionrectangle.png
 
     SelectionRectangle is used for selecting table cells in a TableView. It lets
     the user start a selection by doing a pointer drag inside the viewport, or by
@@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
     The following example shows how you can make a SelectionRectangle target
     a TableView:
 
-    \snippet qtquickcontrols2-selectionrectangle.qml 0
+    \snippet qtquickcontrols-selectionrectangle.qml 0
 
     \note A SelectionRectangle itself is not shown as part of a selection. Only the
     delegates (like topLeftHandle and bottomRightHandle) are used.
diff --git a/src/quicktemplates/qquickslider.cpp b/src/quicktemplates/qquickslider.cpp
index 28445fe733..a510e2e430 100644
--- a/src/quicktemplates/qquickslider.cpp
+++ b/src/quicktemplates/qquickslider.cpp
@@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickSlider
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-input
+    \ingroup qtquickcontrols-input
     \brief Used to select a value by sliding a handle along a track.
 
-    \image qtquickcontrols2-slider.gif
+    \image qtquickcontrols-slider.gif
 
     Slider is used to select a value by sliding a handle along a track.
 
@@ -425,9 +425,9 @@ void QQuickSlider::setStepSize(qreal step)
     \table
     \header
         \row \li \b Value \li \b Example
-        \row \li \c Slider.NoSnap \li \image qtquickcontrols2-slider-nosnap.gif
-        \row \li \c Slider.SnapAlways \li \image qtquickcontrols2-slider-snapalways.gif
-        \row \li \c Slider.SnapOnRelease \li \image qtquickcontrols2-slider-snaponrelease.gif
+        \row \li \c Slider.NoSnap \li \image qtquickcontrols-slider-nosnap.gif
+        \row \li \c Slider.SnapAlways \li \image qtquickcontrols-slider-snapalways.gif
+        \row \li \c Slider.SnapOnRelease \li \image qtquickcontrols-slider-snaponrelease.gif
     \endtable
 
     \sa stepSize
diff --git a/src/quicktemplates/qquickspinbox.cpp b/src/quicktemplates/qquickspinbox.cpp
index 867d72f550..5a8e8e12c3 100644
--- a/src/quicktemplates/qquickspinbox.cpp
+++ b/src/quicktemplates/qquickspinbox.cpp
@@ -27,10 +27,10 @@ static const int AUTO_REPEAT_INTERVAL = 100;
     \inqmlmodule QtQuick.Controls
     \since 5.7
     \ingroup input
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-focusscopes
     \brief Allows the user to select from a set of preset values.
 
-    \image qtquickcontrols2-spinbox.png
+    \image qtquickcontrols-spinbox.png
 
     SpinBox allows the user to choose an integer value by clicking the up
     or down indicator buttons, or by pressing up or down on the keyboard.
@@ -40,25 +40,25 @@ static const int AUTO_REPEAT_INTERVAL = 100;
     By default, SpinBox provides discrete values in the range of \c [0-99]
     with a \l stepSize of \c 1.
 
-    \snippet qtquickcontrols2-spinbox.qml 1
+    \snippet qtquickcontrols-spinbox.qml 1
 
     \section2 Custom Values
 
-    \image qtquickcontrols2-spinbox-textual.png
+    \image qtquickcontrols-spinbox-textual.png
 
     Even though SpinBox works on integer values, it can be customized to
     accept arbitrary input values. The following snippet demonstrates how
     \l validator, \l textFromValue and \l valueFromText can be used to
     customize the default behavior.
 
-    \snippet qtquickcontrols2-spinbox-textual.qml 1
+    \snippet qtquickcontrols-spinbox-textual.qml 1
 
     In the same manner, SpinBox can be customized to accept floating point
     numbers:
 
-    \image qtquickcontrols2-spinbox-double.png
+    \image qtquickcontrols-spinbox-double.png
 
-    \snippet qtquickcontrols2-spinbox-double.qml 1
+    \snippet qtquickcontrols-spinbox-double.qml 1
 
     \sa Tumbler, {Customizing SpinBox}, {Focus Management in Qt Quick Controls}
 */
diff --git a/src/quicktemplates/qquicksplitview.cpp b/src/quicktemplates/qquicksplitview.cpp
index 2ca9923860..7bb4d4dc3d 100644
--- a/src/quicktemplates/qquicksplitview.cpp
+++ b/src/quicktemplates/qquicksplitview.cpp
@@ -20,8 +20,8 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickSplitView
     \inqmlmodule QtQuick.Controls
     \since 5.13
-    \ingroup qtquickcontrols2-containers
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-containers
+    \ingroup qtquickcontrols-focusscopes
     \brief Lays out items with a draggable splitter between each item.
 
     SplitView is a control that lays out items horizontally or vertically with
@@ -1180,7 +1180,7 @@ bool QQuickSplitView::isResizing() const
     To change the size of the handle for mouse and touch events without
     changing its visual size, use a \l {Item::}{containmentMask}:
 
-    \snippet qtquickcontrols2-splitview-handle-containmentmask.qml 1
+    \snippet qtquickcontrols-splitview-handle-containmentmask.qml 1
 
     \sa {Customizing SplitView}
 */
diff --git a/src/quicktemplates/qquickstackview.cpp b/src/quicktemplates/qquickstackview.cpp
index 1b16c6e581..d09f55f6a4 100644
--- a/src/quicktemplates/qquickstackview.cpp
+++ b/src/quicktemplates/qquickstackview.cpp
@@ -22,12 +22,12 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickStackView
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-navigation
-    \ingroup qtquickcontrols2-containers
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-navigation
+    \ingroup qtquickcontrols-containers
+    \ingroup qtquickcontrols-focusscopes
     \brief Provides a stack-based navigation model.
 
-    \image qtquickcontrols2-stackview-wireframe.png
+    \image qtquickcontrols-stackview-wireframe.png
 
     StackView can be used with a set of inter-linked information pages. For
     example, an email application with separate views to list the latest emails,
@@ -102,7 +102,7 @@ QT_BEGIN_NAMESPACE
     In the following animation, three \l Label controls are pushed onto a
     stack view with the \l push() function:
 
-    \image qtquickcontrols2-stackview-push.gif
+    \image qtquickcontrols-stackview-push.gif
 
     The stack now contains the following items: \c [A, B, C].
 
@@ -115,7 +115,7 @@ QT_BEGIN_NAMESPACE
     Continuing on from the example above, the topmost item on the stack is
     removed with a call to \l pop():
 
-    \image qtquickcontrols2-stackview-pop.gif
+    \image qtquickcontrols-stackview-pop.gif
 
     The stack now contains the following items: \c [A, B].
 
@@ -136,7 +136,7 @@ QT_BEGIN_NAMESPACE
     In the following animation, we unwind the stack to the first item by
     calling \c pop(null):
 
-    \image qtquickcontrols2-stackview-unwind.gif
+    \image qtquickcontrols-stackview-unwind.gif
 
     The stack now contains a single item: \c [A].
 
@@ -144,7 +144,7 @@ QT_BEGIN_NAMESPACE
 
     In the following animation, we \l replace the topmost item with \c D:
 
-    \image qtquickcontrols2-stackview-replace.gif
+    \image qtquickcontrols-stackview-replace.gif
 
     The stack now contains the following items: \c [A, B, D].
 
@@ -1280,9 +1280,9 @@ QQuickStackView::Status QQuickStackViewAttached::status() const
           of items visible, consider customizing the \l transitions so that the
           items underneath can be seen.
 
-    \image qtquickcontrols2-stackview-visible.png
+    \image qtquickcontrols-stackview-visible.png
 
-    \snippet qtquickcontrols2-stackview-visible.qml 1
+    \snippet qtquickcontrols-stackview-visible.qml 1
 */
 bool QQuickStackViewAttached::isVisible() const
 {
diff --git a/src/quicktemplates/qquickswipedelegate.cpp b/src/quicktemplates/qquickswipedelegate.cpp
index 42343d1072..24ca772b06 100644
--- a/src/quicktemplates/qquickswipedelegate.cpp
+++ b/src/quicktemplates/qquickswipedelegate.cpp
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickSwipeDelegate
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-delegates
+    \ingroup qtquickcontrols-delegates
     \brief Swipable item delegate.
 
     SwipeDelegate presents a view item that can be swiped left or right to
@@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE
     In the following example, SwipeDelegate is used in a \l ListView to allow
     items to be removed from it by swiping to the left:
 
-    \snippet qtquickcontrols2-swipedelegate.qml 1
+    \snippet qtquickcontrols-swipedelegate.qml 1
 
     SwipeDelegate inherits its API from \l ItemDelegate, which is inherited
     from AbstractButton. For instance, you can set \l {AbstractButton::text}{text},
@@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE
     any position for \c swipe.left or \c swipe.right, the following will
     occur:
 
-    \image qtquickcontrols2-swipedelegate.gif
+    \image qtquickcontrols-swipedelegate.gif
 
     If \c swipe.left and \c swipe.right are anchored to the left and
     right of the \l {Control::}{background} item (respectively), they'll behave like this:
 
-    \image qtquickcontrols2-swipedelegate-leading-trailing.gif
+    \image qtquickcontrols-swipedelegate-leading-trailing.gif
 
     When using \c swipe.left and \c swipe.right, the control cannot be
     swiped past the left and right edges. To achieve this type of "wrapping"
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
     example, in the image below, we set \c swipe.behind and then swipe the
     control repeatedly in both directions:
 
-    \image qtquickcontrols2-swipedelegate-behind.gif
+    \image qtquickcontrols-swipedelegate-behind.gif
 
     \sa {Customizing SwipeDelegate}, {Delegate Controls}, {Qt Quick Controls 2 - Swipe to Remove}{Swipe to Remove Example}
 */
@@ -1164,7 +1164,7 @@ QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent)
         \li This property holds the transition that is applied when a swipe is released,
             or \l swipe.open() or \l swipe.close() is called.
 
-            \snippet qtquickcontrols2-swipedelegate-transition.qml 1
+            \snippet qtquickcontrols-swipedelegate-transition.qml 1
 
             This property was added in Qt Quick Controls 2.2.
     \endtable
diff --git a/src/quicktemplates/qquickswipeview.cpp b/src/quicktemplates/qquickswipeview.cpp
index b9ca6208d1..e19211e5ae 100644
--- a/src/quicktemplates/qquickswipeview.cpp
+++ b/src/quicktemplates/qquickswipeview.cpp
@@ -14,14 +14,14 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickSwipeView
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-navigation
-    \ingroup qtquickcontrols2-containers
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-navigation
+    \ingroup qtquickcontrols-containers
+    \ingroup qtquickcontrols-focusscopes
     \brief Enables the user to navigate pages by swiping sideways.
 
     SwipeView provides a swipe-based navigation model.
 
-    \image qtquickcontrols2-swipeview.gif
+    \image qtquickcontrols-swipeview.gif
 
     SwipeView is populated with a set of pages. One page is visible at a time.
     The user can navigate between the pages by swiping sideways. Notice that
@@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE
     with PageIndicator, to give the user a visual clue that there are multiple
     pages.
 
-    \snippet qtquickcontrols2-swipeview-indicator.qml 1
+    \snippet qtquickcontrols-swipeview-indicator.qml 1
 
     As shown above, SwipeView is typically populated with a static set of
     pages that are defined inline as children of the view. It is also possible
diff --git a/src/quicktemplates/qquickswitch.cpp b/src/quicktemplates/qquickswitch.cpp
index fadea992a6..1b2473cbdb 100644
--- a/src/quicktemplates/qquickswitch.cpp
+++ b/src/quicktemplates/qquickswitch.cpp
@@ -17,10 +17,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickSwitch
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-buttons
+    \ingroup qtquickcontrols-buttons
     \brief Switch button that can be toggled on or off.
 
-    \image qtquickcontrols2-switch.gif
+    \image qtquickcontrols-switch.gif
 
     Switch is an option button that can be dragged or toggled on (checked) or
     off (unchecked). Switches are typically used to select between two states.
diff --git a/src/quicktemplates/qquickswitchdelegate.cpp b/src/quicktemplates/qquickswitchdelegate.cpp
index 3e52f531fa..f17faf8aa9 100644
--- a/src/quicktemplates/qquickswitchdelegate.cpp
+++ b/src/quicktemplates/qquickswitchdelegate.cpp
@@ -13,10 +13,10 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickSwitchDelegate
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-delegates
+    \ingroup qtquickcontrols-delegates
     \brief Item delegate with a switch indicator that can be toggled on or off.
 
-    \image qtquickcontrols2-switchdelegate.gif
+    \image qtquickcontrols-switchdelegate.gif
 
     SwitchDelegate presents an item delegate that can be toggled on (checked) or
     off (unchecked). Switch delegates are typically used to select one or more
diff --git a/src/quicktemplates/qquicktabbar.cpp b/src/quicktemplates/qquicktabbar.cpp
index a1dfc9068c..3894d90af3 100644
--- a/src/quicktemplates/qquicktabbar.cpp
+++ b/src/quicktemplates/qquicktabbar.cpp
@@ -13,20 +13,20 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickTabBar
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-navigation
-    \ingroup qtquickcontrols2-containers
-    \ingroup qtquickcontrols2-focusscopes
+    \ingroup qtquickcontrols-navigation
+    \ingroup qtquickcontrols-containers
+    \ingroup qtquickcontrols-focusscopes
     \brief Allows the user to switch between different views or subtasks.
 
     TabBar provides a tab-based navigation model.
 
-    \image qtquickcontrols2-tabbar-wireframe.png
+    \image qtquickcontrols-tabbar-wireframe.png
 
     TabBar is populated with TabButton controls, and can be used together with
     any layout or container control that provides \c currentIndex -property,
     such as \l StackLayout or \l SwipeView
 
-    \snippet qtquickcontrols2-tabbar.qml 1
+    \snippet qtquickcontrols-tabbar.qml 1
 
     As shown above, TabBar is typically populated with a static set of tab buttons
     that are defined inline as children of the tab bar. It is also possible to
@@ -45,18 +45,18 @@ QT_BEGIN_NAMESPACE
     The following example illustrates how to keep each tab button at their
     implicit size instead of being resized to fit the tabbar:
 
-    \borderedimage qtquickcontrols2-tabbar-explicit.png
+    \borderedimage qtquickcontrols-tabbar-explicit.png
 
-    \snippet qtquickcontrols2-tabbar-explicit.qml 1
+    \snippet qtquickcontrols-tabbar-explicit.qml 1
 
     \section2 Flickable Tabs
 
     If the total width of the buttons exceeds the available width of the tab bar,
     it automatically becomes flickable.
 
-    \image qtquickcontrols2-tabbar-flickable.png
+    \image qtquickcontrols-tabbar-flickable.png
 
-    \snippet qtquickcontrols2-tabbar-flickable.qml 1
+    \snippet qtquickcontrols-tabbar-flickable.qml 1
 
     \sa TabButton, {Customizing TabBar}, {Navigation Controls}, {Container Controls},
         {Focus Management in Qt Quick Controls}
diff --git a/src/quicktemplates/qquicktabbutton.cpp b/src/quicktemplates/qquicktabbutton.cpp
index c3450ce164..500ee0e81b 100644
--- a/src/quicktemplates/qquicktabbutton.cpp
+++ b/src/quicktemplates/qquicktabbutton.cpp
@@ -15,14 +15,14 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickTabButton
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-navigation
+    \ingroup qtquickcontrols-navigation
     \brief Button with a look suitable for a TabBar.
 
-    \image qtquickcontrols2-tabbutton.png
+    \image qtquickcontrols-tabbutton.png
 
     TabButton is used in conjunction with a \l TabBar.
 
-    \snippet qtquickcontrols2-tabbutton.qml 1
+    \snippet qtquickcontrols-tabbutton.qml 1
 
     TabButton inherits its API from AbstractButton. For instance, you can set
     \l {AbstractButton::text}{text}, and react to \l {AbstractButton::clicked}{clicks}
diff --git a/src/quicktemplates/qquicktextarea.cpp b/src/quicktemplates/qquicktextarea.cpp
index 0572746d14..26083abbdf 100644
--- a/src/quicktemplates/qquicktextarea.cpp
+++ b/src/quicktemplates/qquicktextarea.cpp
@@ -27,13 +27,13 @@ using namespace Qt::StringLiterals;
 //!     \instantiates QQuickTextArea
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-input
+    \ingroup qtquickcontrols-input
     \brief Multi-line text input area.
 
     TextArea is a multi-line text editor. TextArea extends TextEdit with
     a \l {placeholderText}{placeholder text} functionality, and adds decoration.
 
-    \image qtquickcontrols2-textarea.png
+    \image qtquickcontrols-textarea.png
 
     \code
     TextArea {
@@ -53,9 +53,9 @@ using namespace Qt::StringLiterals;
     If you want to make a TextArea scrollable, for example, when it covers
     an entire application page, it can be placed inside a \l ScrollView.
 
-    \image qtquickcontrols2-textarea-scrollable.png
+    \image qtquickcontrols-textarea-scrollable.png
 
-    \snippet qtquickcontrols2-textarea-scrollable.qml 1
+    \snippet qtquickcontrols-textarea-scrollable.qml 1
 
     A TextArea that is placed inside a \l ScrollView does the following:
 
diff --git a/src/quicktemplates/qquicktextfield.cpp b/src/quicktemplates/qquicktextfield.cpp
index 3e6d2a48a7..8188dfb312 100644
--- a/src/quicktemplates/qquicktextfield.cpp
+++ b/src/quicktemplates/qquicktextfield.cpp
@@ -25,18 +25,18 @@ using namespace Qt::StringLiterals;
 //!     \instantiates QQuickTextField
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-input
+    \ingroup qtquickcontrols-input
     \brief Single-line text input field.
 
     TextField is a single line text editor. TextField extends TextInput with
     a \l {placeholderText}{placeholder text} functionality, and adds decoration.
 
     \table
-    \row \li \image qtquickcontrols2-textfield-normal.png
+    \row \li \image qtquickcontrols-textfield-normal.png
          \li A text field in its normal state.
-    \row \li \image qtquickcontrols2-textfield-focused.png
+    \row \li \image qtquickcontrols-textfield-focused.png
          \li A text field that has active focus.
-    \row \li \image qtquickcontrols2-textfield-disabled.png
+    \row \li \image qtquickcontrols-textfield-disabled.png
          \li A text field that is disabled.
     \endtable
 
diff --git a/src/quicktemplates/qquicktoolbar.cpp b/src/quicktemplates/qquicktoolbar.cpp
index f804684fa7..c6b622621d 100644
--- a/src/quicktemplates/qquicktoolbar.cpp
+++ b/src/quicktemplates/qquicktoolbar.cpp
@@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickToolBar
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-containers
+    \ingroup qtquickcontrols-containers
     \brief Container for context-sensitive controls.
 
     ToolBar is a container of application-wide and context sensitive
@@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE
     implicit size of its contained item. This makes it particularly suitable
     for use together with layouts.
 
-    \image qtquickcontrols2-toolbar.png
+    \image qtquickcontrols-toolbar.png
 
     \code
     ApplicationWindow {
diff --git a/src/quicktemplates/qquicktoolbutton.cpp b/src/quicktemplates/qquicktoolbutton.cpp
index 4b0a978878..3acf8782a1 100644
--- a/src/quicktemplates/qquicktoolbutton.cpp
+++ b/src/quicktemplates/qquicktoolbutton.cpp
@@ -15,15 +15,15 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickToolButton
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-buttons
+    \ingroup qtquickcontrols-buttons
     \brief Button with a look suitable for a ToolBar.
 
     ToolButton is functionally similar to \l Button, but provides a look that
     is more suitable within a \l ToolBar.
 
-    \image qtquickcontrols2-toolbar.png
+    \image qtquickcontrols-toolbar.png
 
-    \snippet qtquickcontrols2-toolbar.qml 1
+    \snippet qtquickcontrols-toolbar.qml 1
 
     ToolButton inherits its API from AbstractButton. For instance, you can set
     \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls}{icon},
diff --git a/src/quicktemplates/qquicktoolseparator.cpp b/src/quicktemplates/qquicktoolseparator.cpp
index 2ac2173085..afb3caa9cd 100644
--- a/src/quicktemplates/qquicktoolseparator.cpp
+++ b/src/quicktemplates/qquicktoolseparator.cpp
@@ -13,7 +13,7 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickToolSeparator
     \inqmlmodule QtQuick.Controls
     \since 5.8
-    \ingroup qtquickcontrols2-separators
+    \ingroup qtquickcontrols-separators
     \brief Separates a group of items in a toolbar from adjacent items.
 
     ToolSeparator is used to visually distinguish between groups of items in a
@@ -21,9 +21,9 @@ QT_BEGIN_NAMESPACE
     vertical toolbars by setting the \l orientation property to \c Qt.Vertical
     or \c Qt.Horizontal, respectively.
 
-    \image qtquickcontrols2-toolseparator.png
+    \image qtquickcontrols-toolseparator.png
 
-    \snippet qtquickcontrols2-toolseparator.qml 1
+    \snippet qtquickcontrols-toolseparator.qml 1
 
     \sa {Customizing ToolSeparator}, {Separator Controls}
 */
diff --git a/src/quicktemplates/qquicktooltip.cpp b/src/quicktemplates/qquicktooltip.cpp
index 7703d57b53..2a78e4d344 100644
--- a/src/quicktemplates/qquicktooltip.cpp
+++ b/src/quicktemplates/qquicktooltip.cpp
@@ -21,14 +21,14 @@ QT_BEGIN_NAMESPACE
 //!     \instantiates QQuickToolTip
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-popups
+    \ingroup qtquickcontrols-popups
     \brief Provides tool tips for any control.
 
     A tool tip is a short piece of text that informs the user of a control's
     function. It is typically placed above or below the parent control. The
     tip text can be any \l{Rich Text Processing}{rich text} formatted string.
 
-    \image qtquickcontrols2-tooltip.png
+    \image qtquickcontrols-tooltip.png
 
     \section2 Attached Tool Tips
 
@@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
     specify \l text and \l {visible}{visibility} via attached properties.
     The following example illustrates this approach:
 
-    \snippet qtquickcontrols2-tooltip.qml 1
+    \snippet qtquickcontrols-tooltip.qml 1
 
     Under normal circumstances, there is only one tool tip visible at a time.
     In order to save resources, all items that use the ToolTip attached property
@@ -63,14 +63,14 @@ QT_BEGIN_NAMESPACE
     interval is reached. In this example, the tool tip hides as soon as the
     button is released.
 
-    \snippet qtquickcontrols2-tooltip-pressandhold.qml 1
+    \snippet qtquickcontrols-tooltip-pressandhold.qml 1
 
     With pointer devices, however, it might be desired to show a tool tip as
     a result of hovering a button for a while. The following example presents
     how to show a tool tip after hovering a button for a second, and hide it
     after a timeout of five seconds.
 
-    \snippet qtquickcontrols2-tooltip-hover.qml 1
+    \snippet qtquickcontrols-tooltip-hover.qml 1
 
     \section2 Custom Tool Tips
 
@@ -81,9 +81,9 @@ QT_BEGIN_NAMESPACE
     API is available. The following example presents a tool tip that presents
     the value of a slider when the handle is dragged.
 
-    \image qtquickcontrols2-tooltip-slider.png
+    \image qtquickcontrols-tooltip-slider.png
 
-    \snippet qtquickcontrols2-tooltip-slider.qml 1
+    \snippet qtquickcontrols-tooltip-slider.qml 1
 
     \sa {Customizing ToolTip}, {Popup Controls},
     {QtQuick.Controls::Popup::closePolicy}{closePolicy}
diff --git a/src/quicktemplates/qquicktreeviewdelegate.cpp b/src/quicktemplates/qquicktreeviewdelegate.cpp
index f21b215dfe..1f4b8e38fe 100644
--- a/src/quicktemplates/qquicktreeviewdelegate.cpp
+++ b/src/quicktemplates/qquicktreeviewdelegate.cpp
@@ -14,10 +14,10 @@ QT_BEGIN_NAMESPACE
     \inherits ItemDelegate
     \inqmlmodule QtQuick.Controls
     \since 6.3
-    \ingroup qtquickcontrols2-delegates
+    \ingroup qtquickcontrols-delegates
     \brief A delegate that can be assigned to a TreeView.
 
-    \image qtquickcontrols2-treeviewdelegate.png
+    \image qtquickcontrols-treeviewdelegate.png
 
     A TreeViewDelegate is a delegate that can be assigned to the
     \l {TableView::delegate} {delegate property} of a \l TreeView.
diff --git a/src/quicktemplates/qquicktumbler.cpp b/src/quicktemplates/qquicktumbler.cpp
index 434f90ad3a..e7f6606de3 100644
--- a/src/quicktemplates/qquicktumbler.cpp
+++ b/src/quicktemplates/qquicktumbler.cpp
@@ -20,10 +20,10 @@ Q_LOGGING_CATEGORY(lcTumbler, "qt.quick.controls.tumbler")
 //!     \instantiates QQuickTumbler
     \inqmlmodule QtQuick.Controls
     \since 5.7
-    \ingroup qtquickcontrols2-input
+    \ingroup qtquickcontrols-input
     \brief Spinnable wheel of items that can be selected.
 
-    \image qtquickcontrols2-tumbler-wrap.gif
+    \image qtquickcontrols-tumbler-wrap.gif
 
     \code
     Tumbler {
@@ -52,7 +52,7 @@ Q_LOGGING_CATEGORY(lcTumbler, "qt.quick.controls.tumbler")
     long as there are more items in the model than there are visible items;
     that is, when \l count is greater than \l visibleItemCount:
 
-    \snippet qtquickcontrols2-tumbler-timePicker.qml tumbler
+    \snippet qtquickcontrols-tumbler-timePicker.qml tumbler
 
     \sa {Customizing Tumbler}, {Input Controls}
 */
diff --git a/src/quicktemplates/qquickweeknumbercolumn.cpp b/src/quicktemplates/qquickweeknumbercolumn.cpp
index 925e4b4b34..69a41c53bf 100644
--- a/src/quicktemplates/qquickweeknumbercolumn.cpp
+++ b/src/quicktemplates/qquickweeknumbercolumn.cpp
@@ -20,15 +20,15 @@ QT_BEGIN_NAMESPACE
     are calculated for a given \l month and \l year, using the specified
     \l {Control::locale}{locale}.
 
-    \image qtquickcontrols2-weeknumbercolumn.png
-    \snippet qtquickcontrols2-weeknumbercolumn.qml 1
+    \image qtquickcontrols-weeknumbercolumn.png
+    \snippet qtquickcontrols-weeknumbercolumn.qml 1
 
     WeekNumberColumn can be used as a standalone control, but it is most
     often used in conjunction with MonthGrid. Regardless of the use case,
     positioning of the column is left to the user.
 
-    \image qtquickcontrols2-weeknumbercolumn-layout.png
-    \snippet qtquickcontrols2-weeknumbercolumn-layout.qml 1
+    \image qtquickcontrols-weeknumbercolumn-layout.png
+    \snippet qtquickcontrols-weeknumbercolumn-layout.qml 1
 
     The visual appearance of WeekNumberColumn can be changed by
     implementing a \l {delegate}{custom delegate}.
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-busyindicator.qml
index 1463a48e42..1463a48e42 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-busyindicator.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-busyindicator.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-flat.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button-flat.qml
index c08885ccf7..c08885ccf7 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-flat.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button-flat.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-highlighted.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button-highlighted.qml
index 7d6baef42a..7d6baef42a 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-highlighted.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button-highlighted.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button.qml
index 895a143762..895a143762 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox-tristate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox-tristate.qml
index 55d9bc28e3..55d9bc28e3 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox-tristate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox-tristate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox.qml
index 867bb6142e..867bb6142e 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkdelegate-tristate.qml
index 3dfec43cf5..3dfec43cf5 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkdelegate-tristate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkdelegate.qml
index 274f7580e9..274f7580e9 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkdelegate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-combobox.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-combobox.qml
index 0982ff0bf0..0982ff0bf0 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-combobox.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-combobox.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-delaybutton.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-delaybutton.qml
index e044dc7744..e044dc7744 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-delaybutton.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-delaybutton.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-no-wrap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-dial-no-wrap.qml
index 13641e17f4..13641e17f4 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-no-wrap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-dial-no-wrap.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-wrap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-dial-wrap.qml
index 3a47350a4f..3a47350a4f 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-wrap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-dial-wrap.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-drawer.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-drawer.qml
index 2cf05730af..2cf05730af 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-drawer.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-drawer.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-itemdelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-itemdelegate.qml
index b4c7f29ec8..b4c7f29ec8 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-itemdelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-itemdelegate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-menu.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-menu.qml
index f39cc8f7c5..f39cc8f7c5 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-menu.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-menu.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-progressbar-indeterminate.qml
index 818c1a28ec..818c1a28ec 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-progressbar-indeterminate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-progressbar.qml
index 2faca20388..2faca20388 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-progressbar.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiobutton.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiobutton.qml
index 7e4c391673..7e4c391673 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiobutton.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiobutton.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiodelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiodelegate.qml
index 7569c8d7b2..7569c8d7b2 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiodelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiodelegate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-rangeslider.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-rangeslider.qml
index 6c7f548f48..6c7f548f48 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-rangeslider.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-rangeslider.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar-snap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollbar-snap.qml
index 06c8bd96d5..06c8bd96d5 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar-snap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollbar-snap.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollbar.qml
index 63afabbefe..63afabbefe 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollbar.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollindicator.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollindicator.qml
index f2f12bbe91..f2f12bbe91 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollindicator.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollindicator.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider-snap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-slider-snap.qml
index ae5d8cf6cb..ae5d8cf6cb 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider-snap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-slider-snap.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-slider.qml
index 134341ccfa..134341ccfa 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-slider.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-pop.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-pop.qml
index 64c44063a6..64c44063a6 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-pop.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-pop.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-push.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-push.qml
index 523c482de8..523c482de8 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-push.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-push.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-replace.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-replace.qml
index f1ba010b93..f1ba010b93 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-replace.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-replace.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-unwind.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-unwind.qml
index 4631dce66a..4631dce66a 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-unwind.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-unwind.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-behind.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate-behind.qml
index 9a059e8c3d..9a059e8c3d 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate-behind.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate-leading-trailing.qml
index 7e09e7bcc6..7e09e7bcc6 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate-leading-trailing.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate.qml
index a203f6fe83..a203f6fe83 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipeview.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipeview.qml
index dcdc8832c9..dcdc8832c9 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipeview.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipeview.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-switch.qml
index 7099def2fc..7099def2fc 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switch.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-switch.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switchdelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-switchdelegate.qml
index 123c4aec00..123c4aec00 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switchdelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-switchdelegate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-tabbar.qml
index 2a2da93f87..2a2da93f87 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tabbar.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-tabbar.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-tumbler-wrap.qml
index 1d6832bbc2..1d6832bbc2 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tumbler-wrap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-tumbler-wrap.qml
diff --git a/tests/manual/quickcontrols/gifs/tst_gifs.cpp b/tests/manual/quickcontrols/gifs/tst_gifs.cpp
index 2c8dd2e596..72f7039374 100644
--- a/tests/manual/quickcontrols/gifs/tst_gifs.cpp
+++ b/tests/manual/quickcontrols/gifs/tst_gifs.cpp
@@ -115,7 +115,7 @@ void tst_Gifs::tumblerWrap()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(5);
-    gifRecorder.setQmlFileName("qtquickcontrols2-tumbler-wrap.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-tumbler-wrap.qml");
 
     gifRecorder.start();
 
@@ -189,7 +189,7 @@ void tst_Gifs::slider()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(5);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-slider.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-slider.qml");
 
     gifRecorder.start();
 
@@ -223,9 +223,9 @@ void tst_Gifs::sliderSnap_data()
 {
     QTest::addColumn<QString>("gifBaseName");
     QTest::addColumn<int>("snapMode");
-    QTest::newRow("NoSnap") << "qtquickcontrols2-slider-nosnap" << 0;
-    QTest::newRow("SnapAlways") << "qtquickcontrols2-slider-snapalways" << 1;
-    QTest::newRow("SnapOnRelease") << "qtquickcontrols2-slider-snaponrelease" << 2;
+    QTest::newRow("NoSnap") << "qtquickcontrols-slider-nosnap" << 0;
+    QTest::newRow("SnapAlways") << "qtquickcontrols-slider-snapalways" << 1;
+    QTest::newRow("SnapOnRelease") << "qtquickcontrols-slider-snaponrelease" << 2;
 }
 
 void tst_Gifs::sliderSnap()
@@ -238,7 +238,7 @@ void tst_Gifs::sliderSnap()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(8);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-slider-snap.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-slider-snap.qml");
     gifRecorder.setOutputFileBaseName(gifBaseName);
 
     gifRecorder.start();
@@ -278,7 +278,7 @@ void tst_Gifs::rangeSlider()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(7);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-rangeslider.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-rangeslider.qml");
 
     gifRecorder.start();
 
@@ -327,7 +327,7 @@ void tst_Gifs::busyIndicator()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-busyindicator.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-busyindicator.qml");
 
     gifRecorder.start();
 
@@ -354,7 +354,7 @@ void tst_Gifs::switchGif()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(3);
-    gifRecorder.setQmlFileName("qtquickcontrols2-switch.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-switch.qml");
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -369,9 +369,9 @@ void tst_Gifs::switchGif()
 void tst_Gifs::button_data()
 {
     QTest::addColumn<QString>("qmlFileName");
-    QTest::newRow("button") << QString::fromLatin1("qtquickcontrols2-button.qml");
-    QTest::newRow("button-flat") << QString::fromLatin1("qtquickcontrols2-button-flat.qml");
-    QTest::newRow("button-highlighted") << QString::fromLatin1("qtquickcontrols2-button-highlighted.qml");
+    QTest::newRow("button") << QString::fromLatin1("qtquickcontrols-button.qml");
+    QTest::newRow("button-flat") << QString::fromLatin1("qtquickcontrols-button-flat.qml");
+    QTest::newRow("button-highlighted") << QString::fromLatin1("qtquickcontrols-button-highlighted.qml");
 }
 
 void tst_Gifs::button()
@@ -397,7 +397,7 @@ void tst_Gifs::button()
 
 void tst_Gifs::tabBar()
 {
-    const QString qmlFileName = QStringLiteral("qtquickcontrols2-tabbar.qml");
+    const QString qmlFileName = QStringLiteral("qtquickcontrols-tabbar.qml");
 
     GifRecorder gifRecorder;
     gifRecorder.setDataDirPath(dataDirPath);
@@ -426,7 +426,7 @@ void tst_Gifs::tabBar()
 
 void tst_Gifs::menu()
 {
-    const QString qmlFileName = QStringLiteral("qtquickcontrols2-menu.qml");
+    const QString qmlFileName = QStringLiteral("qtquickcontrols-menu.qml");
 
     GifRecorder gifRecorder;
     gifRecorder.setDataDirPath(dataDirPath);
@@ -463,7 +463,7 @@ void tst_Gifs::swipeView()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(8);
-    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols2-swipeview.qml"));
+    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols-swipeview.qml"));
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -485,8 +485,8 @@ void tst_Gifs::swipeView()
 void tst_Gifs::swipeDelegate_data()
 {
     QTest::addColumn<QString>("qmlFileName");
-    QTest::newRow("qtquickcontrols2-swipedelegate.qml") << QString::fromLatin1("qtquickcontrols2-swipedelegate.qml");
-    QTest::newRow("qtquickcontrols2-swipedelegate-leading-trailing.qml") << QString::fromLatin1("qtquickcontrols2-swipedelegate-leading-trailing.qml");
+    QTest::newRow("qtquickcontrols-swipedelegate.qml") << QString::fromLatin1("qtquickcontrols-swipedelegate.qml");
+    QTest::newRow("qtquickcontrols-swipedelegate-leading-trailing.qml") << QString::fromLatin1("qtquickcontrols-swipedelegate-leading-trailing.qml");
 }
 
 void tst_Gifs::swipeDelegate()
@@ -538,7 +538,7 @@ void tst_Gifs::swipeDelegateBehind()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(14);
-    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols2-swipedelegate-behind.qml"));
+    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols-swipedelegate-behind.qml"));
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -595,7 +595,7 @@ void tst_Gifs::delegates()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(duration);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-%1.qml").arg(name));
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -631,7 +631,7 @@ void tst_Gifs::dial()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(10);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-dial-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-dial-%1.qml").arg(name));
     gifRecorder.setHighQuality(false);
 
     gifRecorder.start();
@@ -692,7 +692,7 @@ void tst_Gifs::checkables()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-%1.qml").arg(name));
 
     gifRecorder.start();
 
@@ -718,7 +718,7 @@ void tst_Gifs::comboBox()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
-    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols2-combobox.qml"));
+    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols-combobox.qml"));
 
     gifRecorder.start();
 
@@ -771,7 +771,7 @@ void tst_Gifs::triState()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-%1.qml").arg(name));
 
     gifRecorder.start();
 
@@ -806,7 +806,7 @@ void tst_Gifs::scrollBar()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
-    gifRecorder.setQmlFileName("qtquickcontrols2-scrollbar.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-scrollbar.qml");
 
     gifRecorder.start();
 
@@ -837,9 +837,9 @@ void tst_Gifs::scrollBarSnap_data()
 {
     QTest::addColumn<QString>("gifBaseName");
     QTest::addColumn<int>("snapMode");
-    QTest::newRow("NoSnap") << "qtquickcontrols2-scrollbar-nosnap" << 0;
-    QTest::newRow("SnapAlways") << "qtquickcontrols2-scrollbar-snapalways" << 1;
-    QTest::newRow("SnapOnRelease") << "qtquickcontrols2-scrollbar-snaponrelease" << 2;
+    QTest::newRow("NoSnap") << "qtquickcontrols-scrollbar-nosnap" << 0;
+    QTest::newRow("SnapAlways") << "qtquickcontrols-scrollbar-snapalways" << 1;
+    QTest::newRow("SnapOnRelease") << "qtquickcontrols-scrollbar-snaponrelease" << 2;
 }
 
 void tst_Gifs::scrollBarSnap()
@@ -852,7 +852,7 @@ void tst_Gifs::scrollBarSnap()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(8);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-scrollbar-snap.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-scrollbar-snap.qml");
     gifRecorder.setOutputFileBaseName(gifBaseName);
 
     gifRecorder.start();
@@ -889,7 +889,7 @@ void tst_Gifs::scrollIndicator()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
-    gifRecorder.setQmlFileName("qtquickcontrols2-scrollindicator.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-scrollindicator.qml");
 
     gifRecorder.start();
 
@@ -929,7 +929,7 @@ void tst_Gifs::progressBar()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(4);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-progressbar%1").arg(
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-progressbar%1").arg(
         indeterminate ? QLatin1String("-indeterminate.qml") : QLatin1String(".qml")));
 
     gifRecorder.start();
@@ -957,7 +957,7 @@ void tst_Gifs::stackView()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(duration);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-stackview-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-stackview-%1.qml").arg(name));
 
     gifRecorder.start();
     gifRecorder.waitForFinish();
@@ -970,7 +970,7 @@ void tst_Gifs::drawer()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(4);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-drawer.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-drawer.qml");
 
     gifRecorder.start();
 
@@ -994,7 +994,7 @@ void tst_Gifs::delayButton()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(9);
-    gifRecorder.setQmlFileName("qtquickcontrols2-delaybutton.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-delaybutton.qml");
 
     gifRecorder.start();
 
diff --git a/tests/manual/quickcontrols/nativestyle/CMakeLists.txt b/tests/manual/quickcontrols/nativestyle/CMakeLists.txt
index 0f4e30bd53..0ae9935bcd 100644
--- a/tests/manual/quickcontrols/nativestyle/CMakeLists.txt
+++ b/tests/manual/quickcontrols/nativestyle/CMakeLists.txt
@@ -20,7 +20,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
   set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/desktopgallery")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/desktopgallery")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.qml b/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.qml
index 04a483f6a7..051732ec6b 100644
--- a/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.qml
+++ b/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.qml
@@ -27,13 +27,13 @@ Window {
         anchors.leftMargin: 130
         anchors.rightMargin: 130
         model: ListModel {
-            ListElement { source: "qtquickcontrols2-basic.png"; dark: false }
-            ListElement { source: "qtquickcontrols2-fusion.png"; dark: false }
-            ListElement { source: "qtquickcontrols2-universal-light.png"; dark: false }
-            ListElement { source: "qtquickcontrols2-universal-dark.png"; dark: true }
-            ListElement { source: "qtquickcontrols2-material-dark.png"; dark: true }
-            ListElement { source: "qtquickcontrols2-imagine.png"; dark: false }
-            ListElement { source: "qtquickcontrols2-material-light.png"; dark: false }
+            ListElement { source: "qtquickcontrols-basic.png"; dark: false }
+            ListElement { source: "qtquickcontrols-fusion.png"; dark: false }
+            ListElement { source: "qtquickcontrols-universal-light.png"; dark: false }
+            ListElement { source: "qtquickcontrols-universal-dark.png"; dark: true }
+            ListElement { source: "qtquickcontrols-material-dark.png"; dark: true }
+            ListElement { source: "qtquickcontrols-imagine.png"; dark: false }
+            ListElement { source: "qtquickcontrols-material-light.png"; dark: false }
         }
 
         highlightRangeMode: PathView.StrictlyEnforceRange