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

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

36 files changed, 85 insertions, 85 deletions

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