Doc: add 2-suffix to the image assets and snippets

Change-Id: Ib8050cb3baefe07d28c7e2dcec64af155d2d7c9b
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

386 files changed, 223 insertions, 223 deletions

diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter1.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png
index ee03535f..ee03535f 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter1.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2-listview-header.gif b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif
index 17096519..17096519 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2-listview-header.gif
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png
index c2c49e3e..c2c49e3e 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-listview-header.gif b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif
index 07eb93b1..07eb93b1 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-listview-header.gif
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-view-margins.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png
index 9ca0fe69..9ca0fe69 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-view-margins.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3.gif b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif
index 1763b1f3..1763b1f3 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3.gif
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-long-message.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png
index acbe1886..acbe1886 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-long-message.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-message-timestamp.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
index e4a578cc..e4a578cc 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-message-timestamp.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4.gif b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif
index dd47c4cb..dd47c4cb 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4.gif
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
index 9a3d00bd..9a3d00bd 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-test.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
index 501ea772..501ea772 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-test.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png
index 57782b58..57782b58 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
index 22183c82..22183c82 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
index 327076d3..327076d3 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
index 19a7b685..19a7b685 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-test.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
index 4cc4caa3..4cc4caa3 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-test.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png
index bdc9bcd3..bdc9bcd3 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
index f10d6cb6..f10d6cb6 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal.png b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
index a6913c3c..a6913c3c 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal.png
+++ b/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
diff --git a/examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index f4fc9f70..e83f84c2 100644
--- a/examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -187,7 +187,7 @@ This line determines where the example will be copied to when running
 
 Now we can build and run the application:
 
-\image qtquickcontrols-chattutorial-chapter1.png
+\image qtquickcontrols2-chattutorial-chapter1.png
 
 \section1 Chapter 2: Lists
 
@@ -261,7 +261,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.
 
-\image qtquickcontrols-chattutorial-chapter2.png
+\image qtquickcontrols2-chattutorial-chapter2.png
 
 \section1 Chapter 3: Navigation
 
@@ -312,7 +312,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:
 
-\image qtquickcontrols-chattutorial-chapter2-listview-header.gif
+\image qtquickcontrols2-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
@@ -332,7 +332,7 @@ usual, comes from the application style. Here it is in action:
 \printuntil }
 \printuntil }
 
-\image qtquickcontrols-chattutorial-chapter3-listview-header.gif
+\image qtquickcontrols2-chattutorial-chapter3-listview-header.gif
 
 It has no layout of its own, so we center the label within it ourselves.
 
@@ -436,7 +436,7 @@ the view. This gives us a nice alignment with the placeholder text in the
 \omit
 TODO: recreate image
 \endomit
-\image qtquickcontrols-chattutorial-chapter3-view-margins.png
+\image qtquickcontrols2-chattutorial-chapter3-view-margins.png
 
 Next, we set \l {ListView::}{displayMarginBeginning} and \l
 {ListView::}{displayMarginEnd}. These properties ensure that the delegates
@@ -488,7 +488,7 @@ does not go outside of the screen.
 
 Finally, the button is only enabled when there is actually a message to send.
 
-\image qtquickcontrols-chattutorial-chapter3.gif
+\image qtquickcontrols2-chattutorial-chapter3.gif
 
 \section1 Chapter 4: Models
 
@@ -666,7 +666,7 @@ timestamp that we want to display below every message:
 \printuntil }
 \printuntil }
 
-\image qtquickcontrols-chattutorial-chapter4-message-timestamp.png
+\image qtquickcontrols2-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.
@@ -688,7 +688,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:
 
-\image qtquickcontrols-chattutorial-chapter4-long-message.png
+\image qtquickcontrols2-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
@@ -704,7 +704,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.
 
-\image qtquickcontrols-chattutorial-chapter4.gif
+\image qtquickcontrols2-chattutorial-chapter4.gif
 
 \section1 Chapter 5: Styling
 
@@ -717,12 +717,12 @@ So far, we've just been testing the application with the Default style. If we
 run it with the \l {Material Style}, for example, we'll immediately see some issues.
 Here is the Contacts page:
 
-\image qtquickcontrols-chattutorial-chapter5-contacts-material-test.png
+\image qtquickcontrols2-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:
 
-\image qtquickcontrols-chattutorial-chapter5-conversations-material-test.png
+\image qtquickcontrols2-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
@@ -792,13 +792,13 @@ We'll make the same changes to \c ConversationPage.qml:
 
 Now both pages look correct:
 
-\image qtquickcontrols-chattutorial-chapter5-contacts-material.png
-\image qtquickcontrols-chattutorial-chapter5-conversations-material.png
+\image qtquickcontrols2-chattutorial-chapter5-contacts-material.png
+\image qtquickcontrols2-chattutorial-chapter5-conversations-material.png
 
 Let's try out the Universal style:
 
-\image qtquickcontrols-chattutorial-chapter5-contacts-universal.png
-\image qtquickcontrols-chattutorial-chapter5-conversations-universal.png
+\image qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
+\image qtquickcontrols2-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.
@@ -817,8 +817,8 @@ Theme=Dark
 
 Once this is done, build and run the application. This is what you should see:
 
-\image qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png
-\image qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png
+\image qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
+\image qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
 
 Both pages look fine. Now add an entry for the Universal style:
 
@@ -829,8 +829,8 @@ Theme=Dark
 
 After building and running the application, you should see these results:
 
-\image qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png
-\image qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png
+\image qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
+\image qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
 
 \section1 Summary
 
diff --git a/examples/controls/gallery/doc/images/qtquickcontrols-gallery-drawer.png b/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
index 57ec1026..57ec1026 100644
--- a/examples/controls/gallery/doc/images/qtquickcontrols-gallery-drawer.png
+++ b/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
diff --git a/examples/controls/gallery/doc/images/qtquickcontrols-gallery-menu.png b/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-menu.png
index 5b34264e..5b34264e 100644
--- a/examples/controls/gallery/doc/images/qtquickcontrols-gallery-menu.png
+++ b/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-menu.png
diff --git a/examples/controls/gallery/doc/images/qtquickcontrols-gallery-welcome.png b/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
index 5c2bb682..5c2bb682 100644
--- a/examples/controls/gallery/doc/images/qtquickcontrols-gallery-welcome.png
+++ b/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
diff --git a/examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc b/examples/controls/gallery/doc/src/qtquickcontrols2-gallery.qdoc
index b1420101..2f43472f 100644
--- a/examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc
+++ b/examples/controls/gallery/doc/src/qtquickcontrols2-gallery.qdoc
@@ -35,17 +35,17 @@
     <div class="table"><table style="background:transparent; border:0px">
     <tr><td style="border:0px">
     \endraw
-    \image qtquickcontrols-gallery-welcome.png
+    \image qtquickcontrols2-gallery-welcome.png
     \caption Welcome Screen
     \raw HTML
     </td><td style="border:0px">
     \endraw
-    \image qtquickcontrols-gallery-drawer.png
+    \image qtquickcontrols2-gallery-drawer.png
     \caption Side Drawer
     \raw HTML
     </td><td style="border:0px">
     \endraw
-    \image qtquickcontrols-gallery-menu.png
+    \image qtquickcontrols2-gallery-menu.png
     \caption Options Menu
     \raw HTML
     </td></tr>
diff --git a/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols2-applicationwindow-wireframe.png
index f612c243..f612c243 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-applicationwindow-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-busyindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png
index 03cf98d0..03cf98d0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-busyindicator-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-busyindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png
index fb14cb86..fb14cb86 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-busyindicator-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-busyindicator.gif b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif
index 31ab2d1c..31ab2d1c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-busyindicator.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-busyindicator.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.png
index e631df32..e631df32 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-busyindicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-button-background.png b/src/imports/controls/doc/images/qtquickcontrols2-button-background.png
index c2703157..c2703157 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-button-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-button-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png
index 73d8f2fb..73d8f2fb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-button-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-button-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
index 33638d1e..33638d1e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-button-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-button-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
index 24d2cd06..24d2cd06 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-button-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-button-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
index 9a5ea80e..9a5ea80e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-button-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-button-pressed.png b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
index c88d57b0..c88d57b0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-button-pressed.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-button.gif b/src/imports/controls/doc/images/qtquickcontrols2-button.gif
index 89dcba31..89dcba31 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-button.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-button.png b/src/imports/controls/doc/images/qtquickcontrols2-button.png
index d8a39e55..d8a39e55 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-button.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png
index 4d24fa2f..4d24fa2f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkbox-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkbox-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
index 8620b0c2..8620b0c2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkbox-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkbox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png
index d5a1ef2e..d5a1ef2e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkbox-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkbox-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
index 63669b29..63669b29 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkbox-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkbox-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
index ea49c721..ea49c721 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkbox-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkbox-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png
index fe6cd7a2..fe6cd7a2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkbox-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkbox-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
index b185fc99..b185fc99 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkbox-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkbox.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox.png
index a824949c..a824949c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkbox.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png
index 79023922..79023922 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkdelegate-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png
index 29d900a8..29d900a8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkdelegate-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png
index e1708413..e1708413 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkdelegate-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-checkdelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif
index d379f63c..d379f63c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-checkdelegate.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-combobox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png
index 1930034b..1930034b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-combobox-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-combobox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png
index 08c7bfc8..08c7bfc8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-combobox-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-combobox-delegate.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png
index d76776cf..d76776cf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-combobox-delegate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-combobox-popup.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png
index 5cb32247..5cb32247 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-combobox-popup.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-combobox.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox.png
index e687fb0e..e687fb0e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-combobox.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-control.png b/src/imports/controls/doc/images/qtquickcontrols2-control.png
index eb5ee349..eb5ee349 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-control.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-control.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-default.png b/src/imports/controls/doc/images/qtquickcontrols2-default.png
index 144ceacb..144ceacb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-default.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-default.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-dial-background.png b/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png
index ca6c9283..ca6c9283 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-dial-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-dial-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png
index b9a8e0d8..b9a8e0d8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-dial-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-dial.png b/src/imports/controls/doc/images/qtquickcontrols2-dial.png
index dfe37f87..dfe37f87 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-dial.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-dial.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-drawer-expanded-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png
index 8a8078bf..8a8078bf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-drawer-expanded-wireframe.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-drawer-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols2-drawer-wireframe.png
index d1ef1801..d1ef1801 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-drawer-wireframe.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-drawer-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-frame-background.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png
index 75ad77bd..75ad77bd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-frame-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-frame.png
index dc14acaf..dc14acaf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-frame.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-frame.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-groupbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png
index baec44d5..baec44d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-groupbox-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-groupbox-checkable.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png
index 9b3f32b1..9b3f32b1 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-groupbox-checkable.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-groupbox-label.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
index ea4dfb32..ea4dfb32 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-groupbox-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-groupbox.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png
index c0fc92c7..c0fc92c7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-groupbox.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-itemdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png
index 8a97d8ee..8a97d8ee 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-itemdelegate-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-itemdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png
index 89f094c6..89f094c6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-itemdelegate-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-itemdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png
index 029abb00..029abb00 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-itemdelegate-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-itemdelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif
index 0e8554ff..0e8554ff 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-itemdelegate.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-itemdelegate.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png
index 456a0d55..456a0d55 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-itemdelegate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-label-background.png b/src/imports/controls/doc/images/qtquickcontrols2-label-background.png
index 34a638d6..34a638d6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-label-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-label-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-label.png b/src/imports/controls/doc/images/qtquickcontrols2-label.png
index 961ce3e3..961ce3e3 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-material-button.png b/src/imports/controls/doc/images/qtquickcontrols2-material-button.png
index 5181d8b1..5181d8b1 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-material-button.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-material-button.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-material-dark.png b/src/imports/controls/doc/images/qtquickcontrols2-material-dark.png
index 8afb2cd6..8afb2cd6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-material-dark.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-material-dark.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-material.png b/src/imports/controls/doc/images/qtquickcontrols2-material.png
index d7ce0e88..d7ce0e88 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-material.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-material.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-menu-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png
index 4dcf1fac..4dcf1fac 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-menu-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-menu.gif b/src/imports/controls/doc/images/qtquickcontrols2-menu.gif
index 93a873a3..93a873a3 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-menu.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-menu.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-menu.png b/src/imports/controls/doc/images/qtquickcontrols2-menu.png
index b6446d39..b6446d39 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-menu.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-menu.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols2-page-wireframe.png
index f612c243..f612c243 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-page-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-pageindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png
index 756b87f1..756b87f1 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-pageindicator-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-pageindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png
index cfce4ffb..cfce4ffb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-pageindicator-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-pageindicator-delegate.png b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-delegate.png
index a1e9a8cd..a1e9a8cd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-pageindicator-delegate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-delegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-pageindicator.png b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator.png
index 872012d0..872012d0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-pageindicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-pane-background.png b/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png
index a379d915..a379d915 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-pane-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-pane.png b/src/imports/controls/doc/images/qtquickcontrols2-pane.png
index fe534424..fe534424 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-pane.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-pane.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-popup-transformorigin.png b/src/imports/controls/doc/images/qtquickcontrols2-popup-transformorigin.png
index 4af320fb..4af320fb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-popup-transformorigin.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-popup-transformorigin.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-progressbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png
index 59e81b2b..59e81b2b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-progressbar-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-progressbar-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png
index 9ce19e92..9ce19e92 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-progressbar-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-progressbar-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png
index 9ce19e92..9ce19e92 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-progressbar-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-progressbar-indeterminate.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.png
index ec2e9ae9..ec2e9ae9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-progressbar-indeterminate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-progressbar-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png
index 9ce19e92..9ce19e92 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-progressbar-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png
index 30295394..30295394 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
index 8f5af513..8f5af513 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png
index 457555b7..457555b7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
index 626cd616..626cd616 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
index 797e50a9..797e50a9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png
index 0d78a0d5..0d78a0d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
index f8d0828b..f8d0828b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiobutton-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiobutton.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.png
index 6c217968..6c217968 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiobutton.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiodelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png
index f9ff48c2..f9ff48c2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiodelegate-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiodelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png
index 9ede889f..9ede889f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiodelegate-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiodelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png
index 9d8cbdbd..9d8cbdbd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiodelegate-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-radiodelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif
index 851064e9..851064e9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-radiodelegate.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-background.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png
index c045fdbb..c045fdbb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png
index abb033c2..abb033c2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-first-handle-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png
index abb033c2..abb033c2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-first-handle-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-first-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png
index fb246db3..fb246db3 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-first-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png
index abb033c2..abb033c2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-second-handle-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png
index abb033c2..abb033c2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-second-handle-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-second-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png
index a33a6de2..a33a6de2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-rangeslider-second-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-rangeslider.gif b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif
index 394e8085..394e8085 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-rangeslider.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-rangeslider.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.png
index abb033c2..abb033c2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-rangeslider.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-scrollbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png
index 0b1aa171..0b1aa171 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-scrollbar-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-scrollbar-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png
index 5d916e66..5d916e66 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-scrollbar-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-scrollbar.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.png
index b1abafb5..b1abafb5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-scrollbar.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-scrollindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png
index e9fa04c7..e9fa04c7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-scrollindicator-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-scrollindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png
index 99266362..99266362 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-scrollindicator-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-scrollindicator.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png
index ea0923cc..ea0923cc 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-scrollindicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-slider-background.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png
index 23a754c3..23a754c3 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-slider-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-slider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
index 2e27a604..2e27a604 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-slider-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-slider-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
index 2e27a604..2e27a604 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-slider-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-slider-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
index 7729ef07..7729ef07 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-slider-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-slider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
index 2e27a604..2e27a604 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-slider-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-slider.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif
index 7cb84b56..7cb84b56 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-slider.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-slider.png b/src/imports/controls/doc/images/qtquickcontrols2-slider.png
index 2e27a604..2e27a604 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-slider.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-spinbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png
index 74fbab6e..74fbab6e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-spinbox-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-spinbox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png
index 81d549c0..81d549c0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-spinbox-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-spinbox-down.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png
index e7c43101..e7c43101 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-spinbox-down.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-spinbox-textual.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png
index 4361c492..4361c492 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-spinbox-textual.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-spinbox-up.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png
index b9992471..b9992471 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-spinbox-up.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-spinbox.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png
index 909fbda6..909fbda6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-spinbox.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-stackview-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols2-stackview-wireframe.png
index 65704c25..65704c25 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-stackview-wireframe.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-stackview-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png
index 07f388bb..07f388bb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate-behind.gif b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-behind.gif
index 97d6a592..97d6a592 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate-behind.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-behind.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png
index cec6cf15..cec6cf15 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png
index 1b43928b..1b43928b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate-leading-trailing.gif b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif
index 0641bd14..0641bd14 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate-leading-trailing.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate.gif
index 86c380b7..86c380b7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-swipedelegate.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-swipeview-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-swipeview-indicator.png
index 91786964..91786964 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-swipeview-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-swipeview-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-swipeview-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols2-swipeview-wireframe.png
index 7e387c2d..7e387c2d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-swipeview-wireframe.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-swipeview-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switch-background.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png
index c3cf20f3..c3cf20f3 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switch-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switch-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
index 7c678417..7c678417 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switch-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switch-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png
index 50f608ab..50f608ab 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switch-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switch-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
index 15ff76e6..15ff76e6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switch-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switch-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
index 9e973d0e..9e973d0e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switch-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switch-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png
index 02b88dde..02b88dde 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switch-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switch-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
index aac440a0..aac440a0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switch-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switch.gif b/src/imports/controls/doc/images/qtquickcontrols2-switch.gif
index 5f956304..5f956304 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switch.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switch.png b/src/imports/controls/doc/images/qtquickcontrols2-switch.png
index b9d0812e..b9d0812e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switch.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switchdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png
index e53141ac..e53141ac 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switchdelegate-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switchdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png
index e12be69a..e12be69a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switchdelegate-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switchdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png
index 33c15cdf..33c15cdf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switchdelegate-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-switchdelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate.gif
index 950b1073..950b1073 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-switchdelegate.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tabbar-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbar-wireframe.png
index 443f6757..443f6757 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tabbar-wireframe.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbar-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tabbar.gif b/src/imports/controls/doc/images/qtquickcontrols2-tabbar.gif
index 31db1f9e..31db1f9e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tabbar.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbar.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tabbar.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png
index 44a91d63..44a91d63 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tabbar.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tabbutton.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png
index 76d1e35c..76d1e35c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tabbutton.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-textarea.png b/src/imports/controls/doc/images/qtquickcontrols2-textarea.png
index f468bfd4..f468bfd4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-textarea.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textarea.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-textfield-background.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png
index e345124d..e345124d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-textfield-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-textfield-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
index 55034be2..55034be2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-textfield-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-textfield-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
index bf5ee32a..bf5ee32a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-textfield-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-textfield-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
index 02bb465a..02bb465a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-textfield-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-textfield.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield.png
index 9ea62acb..9ea62acb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-textfield.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png
index 8f390b49..8f390b49 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png
index fa883751..fa883751 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png
index 794692b0..794692b0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png
index f52e4686..f52e4686 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png
index 97e06e2c..97e06e2c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png
index 3eb3ba35..3eb3ba35 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png
index b066c565..b066c565 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-togglebutton-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-toolbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png
index 12b4c348..12b4c348 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-toolbar-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-toolbar.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png
index 3e64b4e4..3e64b4e4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-toolbar.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-toolbutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png
index 8dd64031..8dd64031 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-toolbutton-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-toolbutton-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png
index f4797098..f4797098 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-toolbutton-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-toolbutton.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton.png
index b350cdba..b350cdba 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-toolbutton.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tooltip-background.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png
index c082c840..c082c840 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tooltip-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tooltip-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png
index d79a336f..d79a336f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tooltip-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tooltip-delay.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-delay.png
index eb9499fd..eb9499fd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tooltip-delay.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-delay.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tooltip-hover.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png
index b5c70d86..b5c70d86 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tooltip-hover.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tooltip-pressandhold.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png
index b5c70d86..b5c70d86 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tooltip-pressandhold.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tooltip-slider.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png
index 6dad4464..6dad4464 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tooltip-slider.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tooltip.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png
index ffac3ed6..ffac3ed6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tooltip.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tumbler-background.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png
index 24c200de..24c200de 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tumbler-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tumbler-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png
index 24c200de..24c200de 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tumbler-contentItem.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tumbler-delegate.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png
index d274d444..d274d444 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tumbler-delegate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tumbler-wrap.gif b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif
index 4821a4e8..4821a4e8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tumbler-wrap.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols-tumbler.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler.png
index e22330a6..e22330a6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-tumbler.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tumbler.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-universal-button.png b/src/imports/controls/doc/images/qtquickcontrols2-universal-button.png
index 6c764ec9..6c764ec9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-universal-button.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-universal-button.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png b/src/imports/controls/doc/images/qtquickcontrols2-universal-dark.png
index ec459457..ec459457 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-universal-dark.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-universal.png b/src/imports/controls/doc/images/qtquickcontrols2-universal.png
index 89a0f069..89a0f069 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-universal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-universal.png
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-busyindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml
index 5ccd8f20..5ccd8f20 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-busyindicator-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-busyindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml
index 8f212c37..8f212c37 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-busyindicator-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-busyindicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator.qml
index 703161a4..703161a4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-busyindicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-button-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml
index 7c0a6b50..7c0a6b50 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-button-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-button-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml
index ee59ab7f..ee59ab7f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-button-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-button-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml
index 13037b8d..13037b8d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-button-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-button-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml
index ee72caf6..ee72caf6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-button-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-button-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml
index 692d9066..692d9066 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-button-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-button-pressed.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml
index b5c918db..b5c918db 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-button-pressed.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-button.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button.qml
index 86d339b7..86d339b7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-button.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml
index 566202b5..566202b5 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-checked.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml
index 3acb9321..3acb9321 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-checked.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml
index bef150a3..bef150a3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml
index 6069edad..6069edad 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml
index a90a42d6..a90a42d6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml
index ae9a0b0a..ae9a0b0a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml
index bc86f927..bc86f927 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox.qml
index 2bf74b42..2bf74b42 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkbox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml
index fe60d47c..fe60d47c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkdelegate-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml
index d1c83028..d1c83028 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkdelegate-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-checkdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml
index e3ba48b8..e3ba48b8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-checkdelegate-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-combobox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml
index d6715f07..d6715f07 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-combobox-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-combobox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml
index 08523088..08523088 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-combobox-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-combobox-delegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml
index 1241eeaa..1241eeaa 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-combobox-delegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-combobox-popup.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml
index 0fea67d1..0fea67d1 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-combobox-popup.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-combobox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox.qml
index 4d7fe7fd..4d7fe7fd 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-combobox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-dial-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml
index 333db1ca..333db1ca 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-dial-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-dial-handle.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml
index 73794cc0..73794cc0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-dial-handle.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-dial.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial.qml
index b42e418d..b42e418d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-dial.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dial.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-frame-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml
index 08084e61..08084e61 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-frame-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-frame.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml
index 7fadc9e5..7fadc9e5 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-frame.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-groupbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml
index 480aa8e6..480aa8e6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-groupbox-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-groupbox-checkable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
index 1c1232c7..1c1232c7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-groupbox-checkable.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-groupbox-label.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml
index 53da863b..53da863b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-groupbox-label.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-groupbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml
index 81b234f4..81b234f4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-groupbox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-itemdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml
index 85aba1c8..85aba1c8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-itemdelegate-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-itemdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml
index aa7d5e2b..aa7d5e2b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-itemdelegate-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-itemdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml
index 13e8b6cf..13e8b6cf 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-itemdelegate-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-itemdelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml
index d02f722a..d02f722a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-itemdelegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-label-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml
index 55cbf4eb..55cbf4eb 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-label-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-label.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml
index cb26658d..cb26658d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-label.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-menu-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml
index 0c270d34..0c270d34 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-menu-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-menu.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu.qml
index b0f32203..b0f32203 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-menu.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menu.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-pageindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml
index 1c6a53b6..1c6a53b6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-pageindicator-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-pageindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml
index b36b78bf..b36b78bf 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-pageindicator-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-pageindicator-delegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml
index 39247607..39247607 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-pageindicator-delegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-pageindicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml
index c37b37c6..c37b37c6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-pageindicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-pane-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml
index d1d9f22f..d1d9f22f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-pane-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-pane.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml
index 09bfa6a0..09bfa6a0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-pane.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-progressbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml
index 55e71b81..55e71b81 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-progressbar-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-progressbar-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml
index 0bb1b418..0bb1b418 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-progressbar-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-progressbar-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-disabled.qml
index 0f74ea46..0f74ea46 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-progressbar-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-disabled.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-progressbar-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-normal.qml
index e1c200b5..e1c200b5 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-progressbar-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-normal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml
index d7c6d258..d7c6d258 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-checked.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-checked.qml
index 49f82a5c..49f82a5c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-checked.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-checked.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml
index 14bb7c47..14bb7c47 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-disabled.qml
index 1a087593..1a087593 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-disabled.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-focused.qml
index 2ad1cbfc..2ad1cbfc 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-focused.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml
index d36932dc..d36932dc 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-normal.qml
index 8c746468..8c746468 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-normal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton.qml
index 8f898d18..8f898d18 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiobutton.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiodelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml
index 8d6fd78a..8d6fd78a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiodelegate-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiodelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml
index a1b08c4e..a1b08c4e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiodelegate-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-radiodelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml
index ffb91097..ffb91097 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-radiodelegate-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml
index 2b8ab5a1..2b8ab5a1 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-disabled.qml
index af167461..af167461 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-disabled.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-first-handle-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle-focused.qml
index 04081cb8..04081cb8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-first-handle-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle-focused.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-first-handle.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle.qml
index f27f904a..f27f904a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-first-handle.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-normal.qml
index 343c24e9..343c24e9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-normal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-second-handle-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle-focused.qml
index 15da7776..15da7776 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-second-handle-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle-focused.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-second-handle.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle.qml
index dd54d2fb..dd54d2fb 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider-second-handle.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider.qml
index 343c24e9..343c24e9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-rangeslider.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollbar-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml
index 8903f064..8903f064 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-scrollbar-active.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml
index 90d341b9..90d341b9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-scrollbar-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollbar-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml
index d1ce40d7..d1ce40d7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-scrollbar-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar.qml
index b677137d..b677137d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-scrollbar.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
index 3399e5fb..3399e5fb 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-active.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml
index b276e8ae..b276e8ae 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml
index ef85fe69..ef85fe69 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator.qml
index 8efa0eed..8efa0eed 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-slider-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml
index 74c4fbb6..74c4fbb6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-slider-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-slider-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-disabled.qml
index 57429fb4..57429fb4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-slider-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-disabled.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-slider-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-focused.qml
index 69a24b1a..69a24b1a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-slider-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-focused.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-slider-handle.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml
index 58bd139e..58bd139e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-slider-handle.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-slider-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-normal.qml
index 331d076a..331d076a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-slider-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-normal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-slider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider.qml
index 331d076a..331d076a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-slider.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml
index 21d1fe92..21d1fe92 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml
index 5d1f66f6..5d1f66f6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox-down.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml
index 2294741c..2294741c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox-down.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox-textual.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml
index b7d7b9b8..b7d7b9b8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox-textual.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox-up.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml
index dc6887c0..dc6887c0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox-up.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml
index a8adfbd6..a8adfbd6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-spinbox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-swipedelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml
index be665771..be665771 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-swipedelegate-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-swipedelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml
index 897d4792..897d4792 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-swipedelegate-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-swipedelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml
index e184dc64..e184dc64 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-swipedelegate-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-swipedelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
index 97f57dca..97f57dca 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-swipedelegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-swipeview-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
index c3a38b92..c3a38b92 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-swipeview-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switch-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml
index 1829bb26..1829bb26 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switch-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switch-checked.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml
index 4a2ff8f9..4a2ff8f9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switch-checked.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switch-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml
index 99f2af7e..99f2af7e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switch-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switch-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml
index c84afdb1..c84afdb1 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switch-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switch-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml
index e1b5bd3f..e1b5bd3f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switch-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switch-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml
index 12d4f20d..12d4f20d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switch-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switch-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml
index 9a766524..9a766524 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switch-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switch.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch.qml
index 9e30f8d5..9e30f8d5 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switch.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switchdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml
index 65342e74..65342e74 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switchdelegate-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switchdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml
index 2aeb9082..2aeb9082 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switchdelegate-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-switchdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml
index 258a011a..258a011a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-switchdelegate-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tabbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml
index a0282d91..a0282d91 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tabbar.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tabbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml
index 5412db66..5412db66 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tabbutton.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-textarea.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml
index c99fdd13..c99fdd13 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-textarea.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-textfield-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml
index 87324b2d..87324b2d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-textfield-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-textfield-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml
index e4359d57..e4359d57 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-textfield-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-textfield-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml
index 9bbcb8ad..9bbcb8ad 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-textfield-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-textfield-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml
index de360a33..de360a33 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-textfield-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-textfield.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield.qml
index 838bd111..838bd111 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-textfield.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-toolbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml
index 486e841f..486e841f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-toolbar-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-toolbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
index 7def9a83..7def9a83 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-toolbar.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-toolbutton-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml
index 62338070..62338070 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-toolbutton-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-toolbutton-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml
index 9a25d130..9a25d130 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-toolbutton-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-toolbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton.qml
index 0db6bfe2..0db6bfe2 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-toolbutton.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml
index fe4f33a5..fe4f33a5 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml
index 2a62c86a..2a62c86a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip-hover.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml
index a8df6277..a8df6277 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip-hover.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
index 47f1440c..47f1440c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip-slider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml
index cac6872c..cac6872c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip-slider.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml
index 7a061b2d..7a061b2d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tooltip.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tumbler-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml
index 8a423cac..8a423cac 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tumbler-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tumbler-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml
index 0e26661e..0e26661e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tumbler-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tumbler-delegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml
index cf18fd93..cf18fd93 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tumbler-delegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-tumbler.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler.qml
index f96ed893..f96ed893 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-tumbler.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler.qml
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
index 9e7872d7..33859cc8 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
@@ -39,7 +39,7 @@
 
     \section1 Button Control
 
-    \image qtquickcontrols-button.png
+    \image qtquickcontrols2-button.png
 
     \l 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
@@ -48,7 +48,7 @@
 
     \section1 CheckBox Control
 
-    \image qtquickcontrols-checkbox.png
+    \image qtquickcontrols2-checkbox.png
 
     \l CheckBox presents an option button that can be toggled on (checked)
     or off (unchecked). Check boxes are typically used to select one or more
@@ -56,7 +56,7 @@
 
     \section1 RadioButton Control
 
-    \image qtquickcontrols-radiobutton.png
+    \image qtquickcontrols2-radiobutton.png
 
     \l RadioButton presents an option button that can be toggled on (checked)
     or off (unchecked). Radio buttons are typically used to select one option
@@ -64,7 +64,7 @@
 
     \section1 Switch Control
 
-    \image qtquickcontrols-switch.png
+    \image qtquickcontrols2-switch.png
 
     \l Switch is an option button that can be dragged or toggled on (checked)
     or off (unchecked). Switches are typically used to select between two
@@ -72,7 +72,7 @@
 
     \section1 ToolButton Control
 
-    \image qtquickcontrols-toolbutton.png
+    \image qtquickcontrols2-toolbutton.png
 
     \l ToolButton is functionally similar to \l Button, but provides a look
     that is more suitable within a \l ToolBar.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
index 9a9a6bd6..4e037033 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
@@ -39,58 +39,58 @@
 
     \section1 ApplicationWindow Control
 
-    \image qtquickcontrols-applicationwindow-wireframe.png
+    \image qtquickcontrols2-applicationwindow-wireframe.png
 
     \l ApplicationWindow contains optional header and footer items.
 
     \section1 Frame Control
 
-    \image qtquickcontrols-frame.png
+    \image qtquickcontrols2-frame.png
 
     \l Frame is used to layout a logical group of controls together, within
     a visual frame.
 
     \section1 GroupBox Control
 
-    \image qtquickcontrols-groupbox.png
+    \image qtquickcontrols2-groupbox.png
 
     \l GroupBox is used to layout a logical group of controls together,
     within a titled visual frame.
 
     \section1 Page Control
 
-    \image qtquickcontrols-page-wireframe.png
+    \image qtquickcontrols2-page-wireframe.png
 
     \l Page provides page-specific header and footer items.
 
     \section1 Pane Control
 
-    \image qtquickcontrols-pane.png
+    \image qtquickcontrols2-pane.png
 
     \l Pane provides a background color that matches with the application
     style and theme.
 
     \section1 StackView Control
 
-    \image qtquickcontrols-stackview-wireframe.png
+    \image qtquickcontrols2-stackview-wireframe.png
 
     \l StackView organizes content pages into a stack.
 
     \section1 SwipeView Control
 
-    \image qtquickcontrols-swipeview-wireframe.png
+    \image qtquickcontrols2-swipeview-wireframe.png
 
     \l SwipeView organizes content pages into a swipable strip.
 
     \section1 TabBar Control
 
-    \image qtquickcontrols-tabbar-wireframe.png
+    \image qtquickcontrols2-tabbar-wireframe.png
 
     \l TabBar organizes content pages into tabs.
 
     \section1 ToolBar Control
 
-    \image qtquickcontrols-toolbar.png
+    \image qtquickcontrols2-toolbar.png
 
     \l ToolBar is a container of application-wide and context-sensitive
     actions and controls.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 4204de4b..a2929b26 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -43,13 +43,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-busyindicator-background.png
+            \image qtquickcontrols2-busyindicator-background.png
 
             BusyIndicator has no background item by default.
 
         \section3 Content item
 
-            \image qtquickcontrols-busyindicator-contentItem.png
+            \image qtquickcontrols2-busyindicator-contentItem.png
 
             \snippet BusyIndicator.qml contentItem
 
@@ -61,13 +61,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-button-background.png
+            \image qtquickcontrols2-button-background.png
 
             \snippet Button.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-button-contentItem.png
+            \image qtquickcontrols2-button-contentItem.png
 
             \snippet Button.qml contentItem
 
@@ -79,19 +79,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols-checkbox-background.png
+            \image qtquickcontrols2-checkbox-background.png
 
             CheckBox has no background item by default.
 
         \section3 Content item
 
-            \image qtquickcontrols-checkbox-contentItem.png
+            \image qtquickcontrols2-checkbox-contentItem.png
 
             \snippet CheckBox.qml contentItem
 
         \section3 Indicator
 
-            \image qtquickcontrols-checkbox-indicator.png
+            \image qtquickcontrols2-checkbox-indicator.png
 
             \snippet CheckBox.qml indicator
 
@@ -103,19 +103,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols-checkdelegate-background.png
+            \image qtquickcontrols2-checkdelegate-background.png
 
             \snippet CheckDelegate.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-checkdelegate-contentItem.png
+            \image qtquickcontrols2-checkdelegate-contentItem.png
 
             \snippet CheckDelegate.qml contentItem
 
         \section3 Indicator
 
-            \image qtquickcontrols-checkdelegate-indicator.png
+            \image qtquickcontrols2-checkdelegate-indicator.png
 
             \snippet CheckDelegate.qml indicator
 
@@ -128,25 +128,25 @@
 
         \section3 Background
 
-            \image qtquickcontrols-combobox-background.png
+            \image qtquickcontrols2-combobox-background.png
 
             \snippet ComboBox.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-combobox-contentItem.png
+            \image qtquickcontrols2-combobox-contentItem.png
 
             \snippet ComboBox.qml contentItem
 
         \section3 Popup
 
-            \image qtquickcontrols-combobox-popup.png
+            \image qtquickcontrols2-combobox-popup.png
 
             \snippet ComboBox.qml popup
 
         \section3 Delegate
 
-            \image qtquickcontrols-combobox-delegate.png
+            \image qtquickcontrols2-combobox-delegate.png
 
             \snippet ComboBox.qml delegate
 
@@ -158,13 +158,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-dial-background.png
+            \image qtquickcontrols2-dial-background.png
 
             \snippet Dial.qml background
 
         \section3 Indicator
 
-            \image qtquickcontrols-dial-handle.png
+            \image qtquickcontrols2-dial-handle.png
 
             \snippet Dial.qml handle
 
@@ -185,7 +185,7 @@
 
         \section3 Background
 
-            \image qtquickcontrols-frame-background.png
+            \image qtquickcontrols2-frame-background.png
 
             \snippet Frame.qml background
 
@@ -197,13 +197,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-groupbox-background.png
+            \image qtquickcontrols2-groupbox-background.png
 
             \snippet GroupBox.qml background
 
         \section3 Label
 
-            \image qtquickcontrols-groupbox-label.png
+            \image qtquickcontrols2-groupbox-label.png
 
             \snippet GroupBox.qml label
 
@@ -216,13 +216,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-itemdelegate-background.png
+            \image qtquickcontrols2-itemdelegate-background.png
 
             \snippet ItemDelegate.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-itemdelegate-contentItem.png
+            \image qtquickcontrols2-itemdelegate-contentItem.png
 
             \snippet ItemDelegate.qml contentItem
 
@@ -237,7 +237,7 @@
 
         \section3 Background
 
-            \image qtquickcontrols-label-background.png
+            \image qtquickcontrols2-label-background.png
 
             Label has no background item by default.
 
@@ -248,7 +248,7 @@
 
         \section3 Content item
 
-            \image qtquickcontrols-menu-contentItem.png
+            \image qtquickcontrols2-menu-contentItem.png
 
             \snippet Menu.qml contentItem
 
@@ -265,19 +265,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols-pageindicator-background.png
+            \image qtquickcontrols2-pageindicator-background.png
 
         PageIndicator has no background item by default.
 
         \section3 Content item
 
-            \image qtquickcontrols-pageindicator-contentItem.png
+            \image qtquickcontrols2-pageindicator-contentItem.png
 
             \snippet PageIndicator.qml contentItem
 
         \section3 Delegate
 
-            \image qtquickcontrols-pageindicator-delegate.png
+            \image qtquickcontrols2-pageindicator-delegate.png
 
             \snippet PageIndicator.qml delegate
 
@@ -289,7 +289,7 @@
 
         \section3 Background
 
-            \image qtquickcontrols-pane-background.png
+            \image qtquickcontrols2-pane-background.png
 
             \snippet Pane.qml background
 
@@ -301,13 +301,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-progressbar-background.png
+            \image qtquickcontrols2-progressbar-background.png
 
             \snippet ProgressBar.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-progressbar-contentItem.png
+            \image qtquickcontrols2-progressbar-contentItem.png
 
             \snippet ProgressBar.qml contentItem
 
@@ -319,19 +319,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols-radiobutton-background.png
+            \image qtquickcontrols2-radiobutton-background.png
 
             RadioButton has no background item by default.
 
         \section3 Content item
 
-            \image qtquickcontrols-radiobutton-contentItem.png
+            \image qtquickcontrols2-radiobutton-contentItem.png
 
             \snippet RadioButton.qml contentItem
 
         \section3 Indicator
 
-            \image qtquickcontrols-radiobutton-indicator.png
+            \image qtquickcontrols2-radiobutton-indicator.png
 
             \snippet RadioButton.qml indicator
 
@@ -343,19 +343,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols-radiodelegate-background.png
+            \image qtquickcontrols2-radiodelegate-background.png
 
             \snippet RadioDelegate.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-radiodelegate-contentItem.png
+            \image qtquickcontrols2-radiodelegate-contentItem.png
 
             \snippet RadioDelegate.qml contentItem
 
         \section3 Indicator
 
-            \image qtquickcontrols-radiodelegate-indicator.png
+            \image qtquickcontrols2-radiodelegate-indicator.png
 
             \snippet RadioDelegate.qml indicator
 
@@ -369,19 +369,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols-rangeslider-background.png
+            \image qtquickcontrols2-rangeslider-background.png
 
             \snippet RangeSlider.qml background
 
         \section3 First Handle
 
-            \image qtquickcontrols-rangeslider-first-handle.png
+            \image qtquickcontrols2-rangeslider-first-handle.png
 
             \snippet RangeSlider.qml firstHandle
 
         \section3 Second Handle
 
-            \image qtquickcontrols-rangeslider-second-handle.png
+            \image qtquickcontrols2-rangeslider-second-handle.png
 
             \snippet RangeSlider.qml secondHandle
 
@@ -393,13 +393,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-scrollbar-background.png
+            \image qtquickcontrols2-scrollbar-background.png
 
             ScrollBar has no background item by default.
 
         \section3 Content item
 
-            \image qtquickcontrols-scrollbar-contentItem.png
+            \image qtquickcontrols2-scrollbar-contentItem.png
 
             \snippet ScrollBar.qml contentItem
 
@@ -411,13 +411,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-scrollindicator-background.png
+            \image qtquickcontrols2-scrollindicator-background.png
 
             ScrollIndicator has no background item by default.
 
         \section3 Content item
 
-            \image qtquickcontrols-scrollindicator-contentItem.png
+            \image qtquickcontrols2-scrollindicator-contentItem.png
 
             \snippet ScrollIndicator.qml contentItem
 
@@ -429,13 +429,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-slider-background.png
+            \image qtquickcontrols2-slider-background.png
 
             \snippet Slider.qml background
 
         \section3 Handle
 
-            \image qtquickcontrols-slider-handle.png
+            \image qtquickcontrols2-slider-handle.png
 
             \snippet Slider.qml handle
 
@@ -448,25 +448,25 @@
 
         \section3 Background
 
-            \image qtquickcontrols-spinbox-background.png
+            \image qtquickcontrols2-spinbox-background.png
 
             \snippet SpinBox.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-spinbox-contentItem.png
+            \image qtquickcontrols2-spinbox-contentItem.png
 
             \snippet SpinBox.qml contentItem
 
         \section3 Down indicator
 
-            \image qtquickcontrols-spinbox-down.png
+            \image qtquickcontrols2-spinbox-down.png
 
             \snippet SpinBox.qml down.indicator
 
         \section3 Up indicator
 
-            \image qtquickcontrols-spinbox-up.png
+            \image qtquickcontrols2-spinbox-up.png
 
             \snippet SpinBox.qml up.indicator
 
@@ -509,13 +509,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-swipedelegate-background.png
+            \image qtquickcontrols2-swipedelegate-background.png
 
             \snippet SwipeDelegate.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-swipedelegate-contentItem.png
+            \image qtquickcontrols2-swipedelegate-contentItem.png
 
             \snippet SwipeDelegate.qml contentItem
 
@@ -525,7 +525,7 @@
 
         \section3 Left, right, and behind
 
-            \image qtquickcontrols-swipedelegate.gif
+            \image qtquickcontrols2-swipedelegate.gif
 
             By default, there are no left, right, or behind items defined.
 
@@ -550,19 +550,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols-switch-background.png
+            \image qtquickcontrols2-switch-background.png
 
             Switch has no background item by default.
 
         \section3 Content item
 
-            \image qtquickcontrols-switch-contentItem.png
+            \image qtquickcontrols2-switch-contentItem.png
 
             \snippet Switch.qml contentItem
 
         \section3 Indicator
 
-            \image qtquickcontrols-switch-indicator.png
+            \image qtquickcontrols2-switch-indicator.png
 
             \snippet Switch.qml indicator
 
@@ -573,19 +573,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols-switchdelegate-background.png
+            \image qtquickcontrols2-switchdelegate-background.png
 
             \snippet SwitchDelegate.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-switchdelegate-contentItem.png
+            \image qtquickcontrols2-switchdelegate-contentItem.png
 
             \snippet SwitchDelegate.qml contentItem
 
         \section3 Indicator
 
-            \image qtquickcontrols-switchdelegate-indicator.png
+            \image qtquickcontrols2-switchdelegate-indicator.png
 
             \snippet SwitchDelegate.qml indicator
 
@@ -610,7 +610,7 @@
 
         \section3 Background
 
-            \image qtquickcontrols-textfield-background.png
+            \image qtquickcontrols2-textfield-background.png
 
             \snippet TextField.qml background
 
@@ -621,7 +621,7 @@
 
         \section3 Background
 
-            \image qtquickcontrols-toolbar-background.png
+            \image qtquickcontrols2-toolbar-background.png
 
             \snippet ToolBar.qml background
 
@@ -633,13 +633,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-toolbutton-background.png
+            \image qtquickcontrols2-toolbutton-background.png
 
             \snippet ToolButton.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-toolbutton-contentItem.png
+            \image qtquickcontrols2-toolbutton-contentItem.png
 
             \snippet ToolButton.qml contentItem
 
@@ -651,13 +651,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols-tooltip-background.png
+            \image qtquickcontrols2-tooltip-background.png
 
             \snippet ToolTip.qml background
 
         \section3 Content item
 
-            \image qtquickcontrols-tooltip-contentItem.png
+            \image qtquickcontrols2-tooltip-contentItem.png
 
             \snippet ToolTip.qml contentItem
 
@@ -671,19 +671,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols-tumbler-background.png
+            \image qtquickcontrols2-tumbler-background.png
 
             Tumbler has no background item by default.
 
         \section3 Content Item
 
-            \image qtquickcontrols-tumbler-contentItem.png
+            \image qtquickcontrols2-tumbler-contentItem.png
 
             \snippet Tumbler.qml contentItem
 
         \section3 Delegate
 
-            \image qtquickcontrols-tumbler-delegate.png
+            \image qtquickcontrols2-tumbler-delegate.png
 
             \snippet Tumbler.qml delegate
 */
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
index daa063ed..8ff518f5 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
@@ -35,7 +35,7 @@
     performance for Qt Quick Controls 2. It is built with a minimal amount of Qt
     Quick primitives, and keeps animations and transitions to the minimum.
 
-    \image qtquickcontrols-default.png
+    \image qtquickcontrols2-default.png
 
     The style is selected by default when running Qt Quick Controls 2 applications.
     It is built into the module's resources, so by default it is shipped with
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc
index 40500e99..6275e6ba 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc
@@ -40,14 +40,14 @@
 
     \section1 ItemDelegate Control
 
-    \image qtquickcontrols-itemdelegate.gif
+    \image qtquickcontrols2-itemdelegate.gif
 
     \l ItemDelegate presents a checkable control that can be pressed and
     clicked by the user.
 
     \section1 RadioDelegate Control
 
-    \image qtquickcontrols-radiodelegate.gif
+    \image qtquickcontrols2-radiodelegate.gif
 
     \l RadioDelegate presents a checkable control that can be toggled on
     (checked) or off (unchecked). Radio delegates are typically used to select
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
index 6b67c317..cf1ac057 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
@@ -39,20 +39,20 @@
 
     \section1 BusyIndicator Control
 
-    \image qtquickcontrols-busyindicator.png
+    \image qtquickcontrols2-busyindicator.png
 
     \l BusyIndicator should be used to indicate activity.
 
     \section1 PageIndicator Control
 
-    \image qtquickcontrols-pageindicator.png
+    \image qtquickcontrols2-pageindicator.png
 
     \l PageIndicator is used to indicate the currently active page in
     a container of multiple pages.
 
     \section1 ScrollBar Control
 
-    \image qtquickcontrols-scrollbar.png
+    \image qtquickcontrols2-scrollbar.png
 
     \l ScrollBar is an interactive bar that indicates the current scroll
     position, and can be used to scroll to a specific position in a
@@ -60,7 +60,7 @@
 
     \section1 ScrollIndicator Control
 
-    \image qtquickcontrols-scrollindicator.png
+    \image qtquickcontrols2-scrollindicator.png
 
     \l ScrollIndicator is a non-interactive indicator that indicates the
     current scroll position in a \l Flickable.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
index c9773a5f..16b14d51 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
@@ -40,44 +40,44 @@
 
     \section1 ComboBox Control
 
-    \image qtquickcontrols-combobox.png
+    \image qtquickcontrols2-combobox.png
 
     \l ComboBox is used to select a value from a drop-down list.
 
     \section1 Dial Control
 
-    \image qtquickcontrols-dial.png
+    \image qtquickcontrols2-dial.png
 
     \l Dial is a circular dial that is rotated to set a value.
 
     \section1 TextArea Control
 
-    \image qtquickcontrols-textarea.png
+    \image qtquickcontrols2-textarea.png
 
     \l TextArea is a multi-line text editor.
 
     \section1 TextField Control
 
-    \image qtquickcontrols-textfield.png
+    \image qtquickcontrols2-textfield.png
 
     \l TextField is a single line text editor.
 
     \section1 Slider Control
 
-    \image qtquickcontrols-slider.png
+    \image qtquickcontrols2-slider.png
 
     \l Slider is used to select a value by sliding a handle along a track.
 
     \section1 RangeSlider Control
 
-    \image qtquickcontrols-rangeslider.png
+    \image qtquickcontrols2-rangeslider.png
 
     \l RangeSlider is used to select a range specified by two values,
     by sliding each handle along a track.
 
     \section1 Tumbler Control
 
-    \image qtquickcontrols-tumbler.png
+    \image qtquickcontrols2-tumbler.png
 
     \l Tumbler is a spinnable wheel of items that can be selected.
 */
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index afa207a9..2491eb43 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -48,7 +48,7 @@
     {Google Material Design Guidelines}. It allows for a unified experience
     across platforms and device sizes.
 
-    \image qtquickcontrols-material.png
+    \image qtquickcontrols2-material.png
     \caption The Material style in light and dark themes
 
     \note The Material style is not a native Android style. The Material
@@ -81,7 +81,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols-material-button.png
+                \image qtquickcontrols2-material-button.png
     \endtable
 
     Both attributes can be specified for any window or item, and they automatically
@@ -113,7 +113,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols-material-dark.png
+                \image qtquickcontrols2-material-dark.png
     \endtable
 
     In addition to specifying the attributes in QML, it is also possible to
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc
index c469da43..0eb93fdf 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc
@@ -37,7 +37,7 @@
 
     \section1 Menu Control
 
-    \image qtquickcontrols-menu.png
+    \image qtquickcontrols2-menu.png
 
     \l Menu is a traditional menu.
 */
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc
index afb82c53..6eb0c449 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc
@@ -38,19 +38,19 @@
 
     \section1 StackView Control
 
-    \image qtquickcontrols-stackview-wireframe.png
+    \image qtquickcontrols2-stackview-wireframe.png
 
     \l StackView provides a stack-based navigation model.
 
     \section1 SwipeView Control
 
-    \image qtquickcontrols-swipeview-wireframe.png
+    \image qtquickcontrols2-swipeview-wireframe.png
 
     \l SwipeView provides a swipe-based navigation model.
 
     \section1 TabBar and TabButton Controls
 
-    \image qtquickcontrols-tabbar-wireframe.png
+    \image qtquickcontrols2-tabbar-wireframe.png
 
     \l TabBar and \l TabButton provide a tab-based navigation model.
 */
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
index cf0a7377..97e9bb2b 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
@@ -48,7 +48,7 @@
     The Universal style has been designed to look good on all devices, from
     phones and tablets to PCs.
 
-    \image qtquickcontrols-universal.png
+    \image qtquickcontrols2-universal.png
     \caption The Universal style in light and dark themes
 
     \note The Universal style is not a native Windows 10 style. The Universal
@@ -81,7 +81,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols-universal-button.png
+                \image qtquickcontrols2-universal-button.png
     \endtable
 
     Both attributes can be specified for any window or item, and they automatically
@@ -113,7 +113,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols-universal-dark.png
+                \image qtquickcontrols2-universal-dark.png
     \endtable
 
     In addition to specifying the attributes in QML, it is also possible to
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index d9a0097b..8a6f84cb 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -64,7 +64,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 qtquickcontrols-applicationwindow-wireframe.png
+    \image qtquickcontrols2-applicationwindow-wireframe.png
 
     \qml
     import Qt.labs.controls 1.0
diff --git a/src/quicktemplates2/qquickbusyindicator.cpp b/src/quicktemplates2/qquickbusyindicator.cpp
index 631101c3..d3673462 100644
--- a/src/quicktemplates2/qquickbusyindicator.cpp
+++ b/src/quicktemplates2/qquickbusyindicator.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \ingroup qtquickcontrols2-indicators
     \brief Indicates activity while content is being loaded.
 
-    \image qtquickcontrols-busyindicator.gif
+    \image qtquickcontrols2-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/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp
index 3dbab498..57d0912e 100644
--- a/src/quicktemplates2/qquickbutton.cpp
+++ b/src/quicktemplates2/qquickbutton.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
     \ingroup qtquickcontrols2-buttons
     \brief A push-button control that can be clicked by the user.
 
-    \image qtquickcontrols-button.gif
+    \image qtquickcontrols2-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
@@ -57,13 +57,13 @@ QT_BEGIN_NAMESPACE
     \e Yes, \e No, and \e Help.
 
     \table
-    \row \li \image qtquickcontrols-button-normal.png
+    \row \li \image qtquickcontrols2-button-normal.png
          \li A button in its normal state.
-    \row \li \image qtquickcontrols-button-pressed.png
+    \row \li \image qtquickcontrols2-button-pressed.png
          \li A button that is pressed.
-    \row \li \image qtquickcontrols-button-focused.png
+    \row \li \image qtquickcontrols2-button-focused.png
          \li A button that has active focus.
-    \row \li \image qtquickcontrols-button-disabled.png
+    \row \li \image qtquickcontrols2-button-disabled.png
          \li A button that is disabled.
     \endtable
 
diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp
index 8e0b3953..58f04ea1 100644
--- a/src/quicktemplates2/qquickcheckbox.cpp
+++ b/src/quicktemplates2/qquickcheckbox.cpp
@@ -63,13 +63,13 @@ QT_BEGIN_NAMESPACE
     in a treeview, for example.
 
     \table
-    \row \li \image qtquickcontrols-checkbox-normal.png
+    \row \li \image qtquickcontrols2-checkbox-normal.png
          \li A check box in its normal state.
-    \row \li \image qtquickcontrols-checkbox-checked.png
+    \row \li \image qtquickcontrols2-checkbox-checked.png
          \li A check box that is checked.
-    \row \li \image qtquickcontrols-checkbox-focused.png
+    \row \li \image qtquickcontrols2-checkbox-focused.png
          \li A check box that has active focus.
-    \row \li \image qtquickcontrols-checkbox-disabled.png
+    \row \li \image qtquickcontrols2-checkbox-disabled.png
          \li A check box that is disabled.
     \endtable
 
diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp
index 53c2af69..3fc7210c 100644
--- a/src/quicktemplates2/qquickcheckdelegate.cpp
+++ b/src/quicktemplates2/qquickcheckdelegate.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
     \ingroup qtlabscontrols-delegates
     \brief An item delegate that can be checked or unchecked.
 
-    \image qtquickcontrols-checkdelegate.gif
+    \image qtquickcontrols2-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
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index d25e674c..5f232867 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     \ingroup qtquickcontrols2-input
     \brief A combined button and popup list taking minimal space.
 
-    \image qtquickcontrols-combobox.png
+    \image qtquickcontrols2-combobox.png
 
     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
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 2bee0ed2..d67ac46a 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
     events from the window system, and paints a representation of itself on
     the screen.
 
-    \image qtquickcontrols-control.png
+    \image qtquickcontrols2-control.png
     \labs
 */
 
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index 8d8d2d78..63fa2737 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
@@ -61,11 +61,11 @@ QT_BEGIN_NAMESPACE
 
     \table
     \row
-        \li \image qtquickcontrols-drawer-wireframe.png
+        \li \image qtquickcontrols2-drawer-wireframe.png
             Drawer can be positioned at any of the four edges of the content item. \br
             In this image, it is against the left edge of the window.
 
-        \li \image qtquickcontrols-drawer-expanded-wireframe.png
+        \li \image qtquickcontrols2-drawer-expanded-wireframe.png
             The drawer is then opened by \e "dragging" it out from the left edge \br
             of the window.
     \endtable
diff --git a/src/quicktemplates2/qquickframe.cpp b/src/quicktemplates2/qquickframe.cpp
index 265c2ba3..52277e9c 100644
--- a/src/quicktemplates2/qquickframe.cpp
+++ b/src/quicktemplates2/qquickframe.cpp
@@ -60,9 +60,9 @@ QT_BEGIN_NAMESPACE
     implicit size of its contained item. This makes it particularly suitable
     for use together with layouts.
 
-    \image qtquickcontrols-frame.png
+    \image qtquickcontrols2-frame.png
 
-    \snippet qtquickcontrols-frame.qml 1
+    \snippet qtquickcontrols2-frame.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp
index 6efdb140..b135a92c 100644
--- a/src/quicktemplates2/qquickgroupbox.cpp
+++ b/src/quicktemplates2/qquickgroupbox.cpp
@@ -62,22 +62,22 @@ QT_BEGIN_NAMESPACE
     implicit size of its contained item. This makes it particularly suitable
     for use together with layouts.
 
-    \image qtquickcontrols-groupbox.png
+    \image qtquickcontrols2-groupbox.png
 
-    \snippet qtquickcontrols-groupbox.qml 1
+    \snippet qtquickcontrols2-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 qtquickcontrols-groupbox-checkable.png
+    \image qtquickcontrols2-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 the application that decides
     on the behavior of the groupbox.
 
-    \snippet qtquickcontrols-groupbox-checkable.qml 1
+    \snippet qtquickcontrols2-groupbox-checkable.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp
index 604c7464..0483cc32 100644
--- a/src/quicktemplates2/qquickitemdelegate.cpp
+++ b/src/quicktemplates2/qquickitemdelegate.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
     \inqmlmodule Qt.labs.controls
     \brief  A standard view item that can be used in various views and controls.
 
-    \image qtquickcontrols-itemdelegate.gif
+    \image qtquickcontrols2-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.
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
     \l {AbstractButton::text}{text}, make items \l {AbstractButton::checkable}{checkable},
     and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API.
 
-    \snippet qtquickcontrols-itemdelegate.qml 1
+    \snippet qtquickcontrols2-itemdelegate.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index 86eb9144..47a55f1c 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -61,9 +61,9 @@ QT_BEGIN_NAMESPACE
     inheritance. The default colors and font are style specific. Label
     can also have a visual \l background item.
 
-    \image qtquickcontrols-label.png
+    \image qtquickcontrols2-label.png
 
-    \snippet qtquickcontrols-label.qml 1
+    \snippet qtquickcontrols2-label.qml 1
 
     You can use the properties of Text to change the appearance of the text as desired:
 
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index b4154dc9..cf29a8f0 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     \ingroup qtquickcontrols2-menus
     \brief A menu control that can be used as a context menu or popup menu.
 
-    \image qtquickcontrols-menu.png
+    \image qtquickcontrols2-menu.png
 
     Menu has two main use cases:
     \list
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp
index 8e0b542f..d04c02eb 100644
--- a/src/quicktemplates2/qquickpage.cpp
+++ b/src/quicktemplates2/qquickpage.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     Page is a container control which makes it convenient to add
     a \l header and \l footer item to a page.
 
-    \image qtquickcontrols-page-wireframe.png
+    \image qtquickcontrols2-page-wireframe.png
 
     The following example snippet illustrates how to use a page-specific
     toolbar header and an application-wide tabbar footer.
diff --git a/src/quicktemplates2/qquickpageindicator.cpp b/src/quicktemplates2/qquickpageindicator.cpp
index f49909cc..1ef4e447 100644
--- a/src/quicktemplates2/qquickpageindicator.cpp
+++ b/src/quicktemplates2/qquickpageindicator.cpp
@@ -55,9 +55,9 @@ QT_BEGIN_NAMESPACE
     in a container of multiple pages. PageIndicator consists of
     delegate items that present pages.
 
-    \image qtquickcontrols-pageindicator.png
+    \image qtquickcontrols2-pageindicator.png
 
-    \snippet qtquickcontrols-pageindicator.qml 1
+    \snippet qtquickcontrols2-pageindicator.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp
index f5588d86..84b5624e 100644
--- a/src/quicktemplates2/qquickpane.cpp
+++ b/src/quicktemplates2/qquickpane.cpp
@@ -60,9 +60,9 @@ QT_BEGIN_NAMESPACE
     implicit size of its contained item. This makes it particularly suitable
     for use together with layouts.
 
-    \image qtquickcontrols-pane.png
+    \image qtquickcontrols2-pane.png
 
-    \snippet qtquickcontrols-pane.qml 1
+    \snippet qtquickcontrols2-pane.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index be3c720c..8e892bd9 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -1566,7 +1566,7 @@ void QQuickPopup::setClosePolicy(ClosePolicy policy)
     Nine transform origins are available, as shown in the image below.
     The default transform origin is \c Popup.Center.
 
-    \image qtquickcontrols-popup-transformorigin.png
+    \image qtquickcontrols2-popup-transformorigin.png
 
     \sa enter, exit, Item::transformOrigin
 */
diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp
index 779f2468..745499da 100644
--- a/src/quicktemplates2/qquickprogressbar.cpp
+++ b/src/quicktemplates2/qquickprogressbar.cpp
@@ -51,9 +51,9 @@ QT_BEGIN_NAMESPACE
     regularly. The range is defined by \l from and \l to, which both can contain any value.
 
     \table
-    \row \li \image qtquickcontrols-progressbar-normal.png
+    \row \li \image qtquickcontrols2-progressbar-normal.png
          \li A progress bar in its normal state.
-    \row \li \image qtquickcontrols-progressbar-disabled.png
+    \row \li \image qtquickcontrols2-progressbar-disabled.png
          \li A progress bar that is disabled.
     \endtable
 
@@ -216,7 +216,7 @@ qreal QQuickProgressBar::visualPosition() const
     doesn't show how much progress has been made.
 
     See below for an example:
-    \image qtquickcontrols-progressbar-indeterminate.png
+    \image qtquickcontrols2-progressbar-indeterminate.png
 
 */
 bool QQuickProgressBar::isIndeterminate() const
diff --git a/src/quicktemplates2/qquickradiobutton.cpp b/src/quicktemplates2/qquickradiobutton.cpp
index 93a3c4a7..d9561ed0 100644
--- a/src/quicktemplates2/qquickradiobutton.cpp
+++ b/src/quicktemplates2/qquickradiobutton.cpp
@@ -54,13 +54,13 @@ QT_BEGIN_NAMESPACE
     from a set of options.
 
     \table
-    \row \li \image qtquickcontrols-radiobutton-normal.png
+    \row \li \image qtquickcontrols2-radiobutton-normal.png
          \li A radio button in its normal state.
-    \row \li \image qtquickcontrols-radiobutton-checked.png
+    \row \li \image qtquickcontrols2-radiobutton-checked.png
          \li A radio button that is checked.
-    \row \li \image qtquickcontrols-radiobutton-focused.png
+    \row \li \image qtquickcontrols2-radiobutton-focused.png
          \li A radio button that has active focus.
-    \row \li \image qtquickcontrols-radiobutton-disabled.png
+    \row \li \image qtquickcontrols2-radiobutton-disabled.png
          \li A radio button that is disabled.
     \endtable
 
diff --git a/src/quicktemplates2/qquickradiodelegate.cpp b/src/quicktemplates2/qquickradiodelegate.cpp
index e70044e7..e44fa1bc 100644
--- a/src/quicktemplates2/qquickradiodelegate.cpp
+++ b/src/quicktemplates2/qquickradiodelegate.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
     \ingroup qtlabscontrols-delegates
     \brief An item delegate that can be checked or unchecked.
 
-    \image qtquickcontrols-radiodelegate.gif
+    \image qtquickcontrols2-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/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index 19ce5e19..b80b83b0 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
@@ -50,19 +50,19 @@ QT_BEGIN_NAMESPACE
     \ingroup qtquickcontrols2-input
     \brief A slider control used to select a range of values.
 
-    \image qtquickcontrols-rangeslider.gif
+    \image qtquickcontrols2-rangeslider.gif
 
     RangeSlider is used to select a range specified by two values, by sliding
     each handle along a track.
 
     \table
-    \row \li \image qtquickcontrols-rangeslider-normal.png
+    \row \li \image qtquickcontrols2-rangeslider-normal.png
          \li A range slider in its normal state.
-    \row \li \image qtquickcontrols-rangeslider-first-handle-focused.png
+    \row \li \image qtquickcontrols2-rangeslider-first-handle-focused.png
          \li A range slider whose first handle has active focus.
-    \row \li \image qtquickcontrols-rangeslider-second-handle-focused.png
+    \row \li \image qtquickcontrols2-rangeslider-second-handle-focused.png
          \li A range slider whose second handle has active focus.
-    \row \li \image qtquickcontrols-rangeslider-disabled.png
+    \row \li \image qtquickcontrols2-rangeslider-disabled.png
          \li A range slider that is disabled.
     \endtable
 
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index f8ce76ab..d84b46b3 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     position. A scroll bar can be either \l vertical or \l horizontal, and can
     be attached to any \l Flickable, such as \l ListView and \l GridView.
 
-    \image qtquickcontrols-scrollbar.png
+    \image qtquickcontrols2-scrollbar.png
 
     \code
     Flickable {
@@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE
     to either direction, establish a two-way binding between the active states
     as presented by the following example:
 
-    \snippet qtquickcontrols-scrollbar-active.qml 1
+    \snippet qtquickcontrols2-scrollbar-active.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp
index 619c9b4b..16e86225 100644
--- a/src/quicktemplates2/qquickscrollindicator.cpp
+++ b/src/quicktemplates2/qquickscrollindicator.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     position. A scroll indicator can be either \l vertical or \l horizontal, and can
     be attached to any \l Flickable, such as \l ListView and \l GridView.
 
-    \image qtquickcontrols-scrollindicator.png
+    \image qtquickcontrols2-scrollindicator.png
 
     \code
     Flickable {
@@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE
     to either direction, establish a two-way binding between the active states as
     presented by the following example:
 
-    \snippet qtquickcontrols-scrollindicator-active.qml 1
+    \snippet qtquickcontrols2-scrollindicator-active.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index 16be7677..bbff4629 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -49,16 +49,16 @@ QT_BEGIN_NAMESPACE
     \ingroup qtquickcontrols2-input
     \brief Selects a value by sliding a handle along a track.
 
-    \image qtquickcontrols-slider.gif
+    \image qtquickcontrols2-slider.gif
 
     Slider is used to select a value by sliding a handle along a track.
 
     \table
-    \row \li \image qtquickcontrols-slider-normal.png
+    \row \li \image qtquickcontrols2-slider-normal.png
          \li A slider in its normal state.
-    \row \li \image qtquickcontrols-slider-focused.png
+    \row \li \image qtquickcontrols2-slider-focused.png
          \li A slider that has active focus.
-    \row \li \image qtquickcontrols-slider-disabled.png
+    \row \li \image qtquickcontrols2-slider-disabled.png
          \li A slider that is disabled.
     \endtable
 
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index a18e2bde..b22ee198 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -58,7 +58,7 @@ static const int AUTO_REPEAT_INTERVAL = 100;
     \ingroup input
     \brief A spinbox control that allows the user to select from a set of preset values.
 
-    \image qtquickcontrols-spinbox.png
+    \image qtquickcontrols2-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.
@@ -68,18 +68,18 @@ 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 qtquickcontrols-spinbox.qml 1
+    \snippet qtquickcontrols2-spinbox.qml 1
 
     \section2 Custom Values
 
-    \image qtquickcontrols-spinbox-textual.png
+    \image qtquickcontrols2-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 qtquickcontrols-spinbox-textual.qml 1
+    \snippet qtquickcontrols2-spinbox-textual.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp
index f5d6f5b1..905cba41 100644
--- a/src/quicktemplates2/qquickstackview.cpp
+++ b/src/quicktemplates2/qquickstackview.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \ingroup qtquickcontrols2-containers
     \brief Provides a stack-based navigation model.
 
-    \image qtquickcontrols-stackview-wireframe.png
+    \image qtquickcontrols2-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,
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp
index 064aebb7..d4edf087 100644
--- a/src/quicktemplates2/qquickswipedelegate.cpp
+++ b/src/quicktemplates2/qquickswipedelegate.cpp
@@ -72,12 +72,12 @@ QT_BEGIN_NAMESPACE
     any position for \c exposure.left or \c exposure.right, the following will
     occur:
 
-    \image qtquickcontrols-swipedelegate.gif
+    \image qtquickcontrols2-swipedelegate.gif
 
     If \c exposure.left and \c exposure.right are anchored to the left and
     right of the \l background item (respectively), they'll behave like this:
 
-    \image qtquickcontrols-swipedelegate-leading-trailing.gif
+    \image qtquickcontrols2-swipedelegate-leading-trailing.gif
 
     When using \c exposure.left and \c exposure.right, the control cannot be
     swiped past the left and right edges. To achieve this type of "wrapping"
@@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
     example, in the image below, we set \c exposure.behind and then swipe the
     control repeatedly in both directions:
 
-    \image qtquickcontrols-swipedelegate-behind.gif
+    \image qtquickcontrols2-swipedelegate-behind.gif
 
     \labs
 
diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp
index 6614ebe2..8e703d8b 100644
--- a/src/quicktemplates2/qquickswipeview.cpp
+++ b/src/quicktemplates2/qquickswipeview.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
     SwipeView provides a swipe-based navigation model.
 
-    \image qtquickcontrols-swipeview-wireframe.png
+    \image qtquickcontrols2-swipeview-wireframe.png
 
     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
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     with PageIndicator, to give the user a visual clue that there are multiple
     pages.
 
-    \snippet qtquickcontrols-swipeview-indicator.qml 1
+    \snippet qtquickcontrols2-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/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index 04281a9e..493dc189 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -50,19 +50,19 @@ QT_BEGIN_NAMESPACE
     \ingroup qtquickcontrols2-buttons
     \brief An option button that can be toggled on or off.
 
-    \image qtquickcontrols-switch.gif
+    \image qtquickcontrols2-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.
 
     \table
-    \row \li \image qtquickcontrols-switch-normal.png
+    \row \li \image qtquickcontrols2-switch-normal.png
          \li A switch in its normal state.
-    \row \li \image qtquickcontrols-switch-checked.png
+    \row \li \image qtquickcontrols2-switch-checked.png
          \li A switch that is checked.
-    \row \li \image qtquickcontrols-switch-focused.png
+    \row \li \image qtquickcontrols2-switch-focused.png
          \li A switch that has active focus.
-    \row \li \image qtquickcontrols-switch-disabled.png
+    \row \li \image qtquickcontrols2-switch-disabled.png
          \li A switch that is disabled.
     \endtable
 
diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp
index 05cee244..813da37f 100644
--- a/src/quicktemplates2/qquickswitchdelegate.cpp
+++ b/src/quicktemplates2/qquickswitchdelegate.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
     \ingroup qtlabscontrols-delegates
     \brief An item delegate that can be toggled on or off.
 
-    \image qtquickcontrols-switchdelegate.gif
+    \image qtquickcontrols2-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/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index 8d6a65f8..8687a0cb 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
@@ -51,13 +51,13 @@ QT_BEGIN_NAMESPACE
 
     TabBar provides a tab-based navigation model.
 
-    \image qtquickcontrols-tabbar-wireframe.png
+    \image qtquickcontrols2-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 qtquickcontrols-tabbar.qml 1
+    \snippet qtquickcontrols2-tabbar.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquicktabbutton.cpp b/src/quicktemplates2/qquicktabbutton.cpp
index fc7cb634..d4760bc9 100644
--- a/src/quicktemplates2/qquicktabbutton.cpp
+++ b/src/quicktemplates2/qquicktabbutton.cpp
@@ -49,11 +49,11 @@ QT_BEGIN_NAMESPACE
     \ingroup qtquickcontrols2-navigation
     \brief A tab button control that can be found on a TabBar.
 
-    \image qtquickcontrols-tabbutton.png
+    \image qtquickcontrols2-tabbutton.png
 
     TabButton is used in conjunction with a \l TabBar.
 
-    \snippet qtquickcontrols-tabbutton.qml 1
+    \snippet qtquickcontrols2-tabbutton.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index 7a8dae0d..d95ba4c5 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -63,11 +63,11 @@ QT_BEGIN_NAMESPACE
     a \l {placeholderText}{placeholder text} functionality, and adds decoration.
 
     \table
-    \row \li \image qtquickcontrols-textfield-normal.png
+    \row \li \image qtquickcontrols2-textfield-normal.png
          \li A text field in its normal state.
-    \row \li \image qtquickcontrols-textfield-focused.png
+    \row \li \image qtquickcontrols2-textfield-focused.png
          \li A text field that has active focus.
-    \row \li \image qtquickcontrols-textfield-disabled.png
+    \row \li \image qtquickcontrols2-textfield-disabled.png
          \li A text field that is disabled.
     \endtable
 
diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp
index 541160fd..85735d07 100644
--- a/src/quicktemplates2/qquicktoolbar.cpp
+++ b/src/quicktemplates2/qquicktoolbar.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
     implicit size of its contained item. This makes it particularly suitable
     for use together with layouts.
 
-    \image qtquickcontrols-toolbar.png
+    \image qtquickcontrols2-toolbar.png
 
     \code
     ApplicationWindow {
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index 010a07c5..1a22679b 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -57,13 +57,13 @@ QT_BEGIN_NAMESPACE
     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 qtquickcontrols-tooltip.png
+    \image qtquickcontrols2-tooltip.png
 
     The most straight-forward way to setup tool tips for controls is to
     specify \l text and \l {visible}{visibility} via attached properties.
     The following example illustrates this approach:
 
-    \snippet qtquickcontrols-tooltip.qml 1
+    \snippet qtquickcontrols2-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
@@ -88,14 +88,14 @@ QT_BEGIN_NAMESPACE
     interval is reached. In this example, the tool tip hides as soon as the
     button is released.
 
-    \snippet qtquickcontrols-tooltip-pressandhold.qml 1
+    \snippet qtquickcontrols2-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 qtquickcontrols-tooltip-hover.qml 1
+    \snippet qtquickcontrols2-tooltip-hover.qml 1
 
     \section2 Custom Tool Tips
 
@@ -106,9 +106,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 qtquickcontrols-tooltip-slider.png
+    \image qtquickcontrols2-tooltip-slider.png
 
-    \snippet qtquickcontrols-tooltip-slider.qml 1
+    \snippet qtquickcontrols2-tooltip-slider.qml 1
 
     \labs
 
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp
index ee82128f..4a858235 100644
--- a/src/quicktemplates2/qquicktumbler.cpp
+++ b/src/quicktemplates2/qquicktumbler.cpp
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 
     \snippet tst_tumbler.qml contentItem
 
-    \image qtquickcontrols-tumbler-wrap.gif
+    \image qtquickcontrols2-tumbler-wrap.gif
 
     \labs
 
diff --git a/tests/manual/gifs/data/qtquickcontrols-busyindicator.qml b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml
index e68af7dd..e68af7dd 100644
--- a/tests/manual/gifs/data/qtquickcontrols-busyindicator.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-button.qml b/tests/manual/gifs/data/qtquickcontrols2-button.qml
index 3d9a4f45..3d9a4f45 100644
--- a/tests/manual/gifs/data/qtquickcontrols-button.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-button.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-checkdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml
index ac276c06..ac276c06 100644
--- a/tests/manual/gifs/data/qtquickcontrols-checkdelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-itemdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml
index f0c029a6..f0c029a6 100644
--- a/tests/manual/gifs/data/qtquickcontrols-itemdelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-menu.qml b/tests/manual/gifs/data/qtquickcontrols2-menu.qml
index 81ea3137..81ea3137 100644
--- a/tests/manual/gifs/data/qtquickcontrols-menu.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-menu.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-radiodelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml
index 9cc542f6..9cc542f6 100644
--- a/tests/manual/gifs/data/qtquickcontrols-radiodelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-rangeslider.qml b/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml
index 55056cf8..55056cf8 100644
--- a/tests/manual/gifs/data/qtquickcontrols-rangeslider.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-slider.qml b/tests/manual/gifs/data/qtquickcontrols2-slider.qml
index af582d7c..af582d7c 100644
--- a/tests/manual/gifs/data/qtquickcontrols-slider.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-slider.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-swipedelegate-behind.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
index 31246a79..31246a79 100644
--- a/tests/manual/gifs/data/qtquickcontrols-swipedelegate-behind.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-swipedelegate-leading-trailing.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
index d346a377..d346a377 100644
--- a/tests/manual/gifs/data/qtquickcontrols-swipedelegate-leading-trailing.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-swipedelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml
index 78d36e3b..78d36e3b 100644
--- a/tests/manual/gifs/data/qtquickcontrols-swipedelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-switch.qml b/tests/manual/gifs/data/qtquickcontrols2-switch.qml
index f6067c1b..f6067c1b 100644
--- a/tests/manual/gifs/data/qtquickcontrols-switch.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-switch.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-switchdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml
index e9fec94e..e9fec94e 100644
--- a/tests/manual/gifs/data/qtquickcontrols-switchdelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-tabbar.qml b/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml
index 8ca14721..8ca14721 100644
--- a/tests/manual/gifs/data/qtquickcontrols-tabbar.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols-tumbler-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
index 4b84c6d1..4b84c6d1 100644
--- a/tests/manual/gifs/data/qtquickcontrols-tumbler-wrap.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp
index 8c8e43b2..b4dcd745 100644
--- a/tests/manual/gifs/tst_gifs.cpp
+++ b/tests/manual/gifs/tst_gifs.cpp
@@ -102,7 +102,7 @@ void tst_Gifs::tumblerWrap()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(4);
-    gifRecorder.setQmlFileName("qtquickcontrols-tumbler-wrap.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols2-tumbler-wrap.qml");
 
     gifRecorder.start();
 
@@ -172,7 +172,7 @@ void tst_Gifs::slider()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(5);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols-slider.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols2-slider.qml");
 
     gifRecorder.start();
 
@@ -209,7 +209,7 @@ void tst_Gifs::rangeSlider()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(7);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols-rangeslider.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols2-rangeslider.qml");
 
     gifRecorder.start();
 
@@ -258,7 +258,7 @@ void tst_Gifs::busyIndicator()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(3);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols-busyindicator.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols2-busyindicator.qml");
 
     gifRecorder.start();
 
@@ -285,7 +285,7 @@ void tst_Gifs::switchGif()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(3);
-    gifRecorder.setQmlFileName("qtquickcontrols-switch.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols2-switch.qml");
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -303,7 +303,7 @@ void tst_Gifs::button()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(3);
-    gifRecorder.setQmlFileName("qtquickcontrols-button.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols2-button.qml");
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -317,7 +317,7 @@ void tst_Gifs::button()
 
 void tst_Gifs::tabBar()
 {
-    const QString qmlFileName = QStringLiteral("qtquickcontrols-tabbar.qml");
+    const QString qmlFileName = QStringLiteral("qtquickcontrols2-tabbar.qml");
 
     GifRecorder gifRecorder;
     gifRecorder.setDataDirPath(dataDirPath);
@@ -346,7 +346,7 @@ void tst_Gifs::tabBar()
 
 void tst_Gifs::menu()
 {
-    const QString qmlFileName = QStringLiteral("qtquickcontrols-menu.qml");
+    const QString qmlFileName = QStringLiteral("qtquickcontrols2-menu.qml");
 
     GifRecorder gifRecorder;
     gifRecorder.setDataDirPath(dataDirPath);
@@ -380,8 +380,8 @@ void tst_Gifs::menu()
 void tst_Gifs::swipeDelegate_data()
 {
     QTest::addColumn<QString>("qmlFileName");
-    QTest::newRow("qtquickcontrols-swipedelegate.qml") << QString::fromLatin1("qtquickcontrols-swipedelegate.qml");
-    QTest::newRow("qtquickcontrols-swipedelegate-leading-trailing.qml") << QString::fromLatin1("qtquickcontrols-swipedelegate-leading-trailing.qml");
+    QTest::newRow("qtquickcontrols2-swipedelegate.qml") << QString::fromLatin1("qtquickcontrols2-swipedelegate.qml");
+    QTest::newRow("qtquickcontrols2-swipedelegate-leading-trailing.qml") << QString::fromLatin1("qtquickcontrols2-swipedelegate-leading-trailing.qml");
 }
 
 void tst_Gifs::swipeDelegate()
@@ -433,7 +433,7 @@ void tst_Gifs::swipeDelegateBehind()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(14);
-    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols-swipedelegate-behind.qml"));
+    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols2-swipedelegate-behind.qml"));
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -490,7 +490,7 @@ void tst_Gifs::delegates()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(duration);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-%1.qml").arg(name));
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();