Doc: Rename Qt Labs Controls to Qt Quick Controls 2

Replaced all remaining instances of "Qt Labs Controls"

Change-Id: Iab8ca27d98a16a7c99bd364c66efc8b98d93eacc
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>

41 files changed, 88 insertions, 88 deletions

diff --git a/examples/controls/chattutorial/doc/src/qtlabscontrols-chattutorial.qdoc b/examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index 53931f42..f4fc9f70 100644
--- a/examples/controls/chattutorial/doc/src/qtlabscontrols-chattutorial.qdoc
+++ b/examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -27,12 +27,12 @@
 
 /*!
 \example chattutorial
-\title Qt Labs Controls - Chat Tutorial
-\brief Tutorial about writing a basic chat client using Qt Labs Controls.
-\ingroup qtlabscontrols-examples
+\title Qt Quick Controls 2 - Chat Tutorial
+\brief Tutorial about writing a basic chat client using Qt Quick Controls 2.
+\ingroup qtquickcontrols2-examples
 
-This tutorial shows how to write a basic chat application using Qt Labs
-Controls. It will also explain how to integrate an SQL database into a Qt
+This tutorial shows how to write a basic chat application using Qt Quick
+Controls 2. It will also explain how to integrate an SQL database into a Qt
 application.
 
 \section1 Chapter 1: Setting Up
@@ -74,7 +74,7 @@ arguments provided by the user.
 Next, the QML engine is created. \l QQmlApplicationEngine is a convenient
 wrapper over QQmlEngine, providing the \l {QQmlApplicationEngine::load}{load()}
 function to easily load QML for an application. It also adds some convenience
-for using \l {Using File Selectors with Qt Labs Controls}{file selectors}.
+for using \l {Using File Selectors with Qt Quick Controls 2}{file selectors}.
 
 Once we've set up things in C++, we can move on to the user interface in QML.
 
@@ -89,7 +89,7 @@ access to graphical primitives such as \l Item, \l Rectangle, \l Text, and so
 on.
 For the full list of types, see the \l {Qt Quick QML Types} documentation.
 
-Next, we import the Qt Labs Controls module. Amongst other things, this
+Next, we import the Qt Quick Controls 2 module. Amongst other things, this
 makes \l ApplicationWindow available:
 
 \skipto ApplicationWindow
@@ -127,7 +127,7 @@ how to navigate between several pages.
 
 Now that we have a Page, we can assign a \l Label to its \l {Page::}{header}
 property. Label extends the primitive \l Text item from the Qt Quick module by
-adding \l {Styling Qt Labs Controls}{styling} and \l {Control::}{font}
+adding \l {Styling Qt Quick Controls 2}{styling} and \l {Control::}{font}
 inheritance. This means that a Label can look different depending on which
 style is in use, and can also propagate its pixel size to its children.
 
@@ -196,7 +196,7 @@ In this chapter, we'll explain how to create a list of interactive items using
 
 ListView comes from the Qt Quick module, and displays a list of items
 populated from a \l {Models and Views in Qt Quick}{model}. ItemDelegate comes from
-the Qt Labs Controls module, and provides a standard view item for use in views
+the Qt Quick Controls 2 module, and provides a standard view item for use in views
 and controls such as ListView and \l ComboBox. For example, each ItemDelegate
 can display text, be checked on and off, and react to mouse clicks.
 
@@ -708,7 +708,7 @@ text field to make way for future input.
 
 \section1 Chapter 5: Styling
 
-Styles in Qt Labs Controls are designed to work on any platform. In this
+Styles in Qt Quick Controls 2 are designed to work on any platform. In this
 chapter, we'll do some minor visual tweaks to make sure our application
 looks good when run with the \l {Default Style}{Default},
 \l {Material Style}{Material}, and \l {Universal Style}{Universal} styles.
@@ -746,8 +746,8 @@ Material style plugin \e must be deployed with the application, even if the
 target device doesn't use it, otherwise the QML engine will fail to find the
 import.
 
-Instead, it is better to rely on Qt Labs Controls' built-in support for
-\l {Using File Selectors with Qt Labs Controls}{style-based file selectors}.
+Instead, it is better to rely on Qt Quick Controls 2's built-in support for
+\l {Using File Selectors with Qt Quick Controls 2}{style-based file selectors}.
 To do this, we must move the ToolBar out into its own file. We'll call it
 \c ChatToolBar.qml. This will be the \e "default" version of the file, which
 means that it will be used when the \l {Default Style}{Default style} is in
@@ -758,7 +758,7 @@ use. Here's the new file:
 \printuntil }
 
 As we only use the ToolBar type within this file, we only need the
-Qt Labs Controls import. The code itself has not changed from how it was
+Qt Quick Controls 2 import. The code itself has not changed from how it was
 in \c ContactPage.qml, which is how it should be; for the default version
 of the file, nothing needs to be different.
 
@@ -835,7 +835,7 @@ After building and running the application, you should see these results:
 \section1 Summary
 
 In this tutorial, we've taken you through the following steps of writing a
-basic application using Qt Labs Controls:
+basic application using Qt Quick Controls 2:
 
 \list
 \li Creating a new project using Qt Creator.
diff --git a/examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc b/examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc
index 2b667f63..b1420101 100644
--- a/examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc
+++ b/examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc
@@ -27,8 +27,8 @@
 
 /*!
     \example gallery
-    \title Qt Labs Controls - Gallery
-    \ingroup qtlabscontrols-examples
+    \title Qt Quick Controls 2 - Gallery
+    \ingroup qtquickcontrols2-examples
     \brief A gallery of controls
 
     \raw HTML
@@ -53,7 +53,7 @@
     \endraw
 
     The gallery example is a simple application with a drawer menu that contains
-    all the \l {Qt Labs Controls}. Each menu item opens a page that shows the
+    all the \l {Qt Quick Controls 2}. Each menu item opens a page that shows the
     graphical appearance of a control, allows you to interact with the control,
     and explains in which circumstances it is handy to use this control.
 
diff --git a/examples/controls/gallery/gallery.qml b/examples/controls/gallery/gallery.qml
index cb549475..ed6fd201 100644
--- a/examples/controls/gallery/gallery.qml
+++ b/examples/controls/gallery/gallery.qml
@@ -50,7 +50,7 @@ ApplicationWindow {
     width: 360
     height: 520
     visible: true
-    title: "Qt Labs Controls"
+    title: "Qt Quick Controls 2"
 
     Settings {
         id: settings
@@ -186,7 +186,7 @@ ApplicationWindow {
 
             Label {
                 color: "#26282a"
-                text: "Qt Labs Controls provides a set of controls that can be used to build complete interfaces in Qt Quick."
+                text: "Qt Quick Controls 2 provides a set of controls that can be used to build complete interfaces in Qt Quick."
                 anchors.margins: 20
                 anchors.top: logo.bottom
                 anchors.left: parent.left
@@ -302,7 +302,7 @@ ApplicationWindow {
 
             Label {
                 width: aboutDialog.availableWidth
-                text: "The Qt Labs Controls module is a technology preview of the next generation user interface controls based on Qt Quick."
+                text: "The Qt Quick Controls 2 module is a technology preview of the next generation user interface controls based on Qt Quick."
                 wrapMode: Label.Wrap
                 font.pixelSize: 12
             }
diff --git a/src/controls/qquickstyle.cpp b/src/controls/qquickstyle.cpp
index d6a966ea..917907c6 100644
--- a/src/controls/qquickstyle.cpp
+++ b/src/controls/qquickstyle.cpp
@@ -158,7 +158,7 @@ QString QQuickStyle::path()
 void QQuickStyle::setStyle(const QString &style)
 {
     if (QQmlMetaType::isModule(QStringLiteral("Qt.labs.controls"), 1, 0)) {
-        qWarning() << "ERROR: QQuickStyle::setStyle() must be called before loading QML that imports Qt Labs Controls.";
+        qWarning() << "ERROR: QQuickStyle::setStyle() must be called before loading QML that imports Qt Quick Controls 2.";
         return;
     }
 
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index ab369e21..f7714690 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -1,7 +1,7 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
-project                 = QtLabsControls
-description             = Qt Labs Controls Reference Documentation
+project                 = QtQuickControls2
+description             = Qt Quick Controls Reference Documentation
 version                 = $QT_VERSION
 
 qhp.projects            = QtQuickControls2
@@ -45,10 +45,10 @@ sourcedirs += ../../../templates \
 
 imagedirs += images
 
-navigation.landingpage  = "Qt Labs Controls"
-navigation.qmltypespage = "Qt Labs Controls QML Types"
+navigation.landingpage  = "Qt Quick Controls 2"
+navigation.qmltypespage = "Qt Quick Controls 2 QML Types"
 
-tagfile                 = qtlabscontrols.tags
+tagfile                 = qtquickcontrols2.tags
 
 # \styleimport {Qt.labs.controls.universal 1.0}
 macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\"memItemLeft rightAlign topAlign\"> Import Statement:</td><td class=\"memItemRight bottomAlign\"> import \1</td></tr></tbody></table>"
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
index 8bdf1f63..a1a6f2f4 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
@@ -190,84 +190,84 @@
         \li No equivalent; see \l [QtQuick] {Shortcut} instead.
     \row
         \li \l [QtQuickControls] {ApplicationWindow}
-        \li \l [QtLabsControls] {ApplicationWindow}
+        \li \l [QtQuickControls2] {ApplicationWindow}
     \row
         \li \l [QtQuickControls] {BusyIndicator}
-        \li \l [QtLabsControls] {BusyIndicator}
+        \li \l [QtQuickControls2] {BusyIndicator}
     \row
         \li \l [QtQuickControls] {Button}
-        \li \l [QtLabsControls] {Button}
+        \li \l [QtQuickControls2] {Button}
     \row
         \li \l [QtQuickControls] {Calendar}
         \li No equivalent; see \l [QML] {MonthGrid}, \l [QML] {DayOfWeekRow} and \l [QML] {WeekNumberColumn} instead.
     \row
         \li \l [QtQuickControls] {CheckBox}
-        \li \l [QtLabsControls] {CheckBox}
+        \li \l [QtQuickControls2] {CheckBox}
     \row
         \li \l [QtQuickControls] {ComboBox}
-        \li \l [QtLabsControls] {ComboBox}
+        \li \l [QtQuickControls2] {ComboBox}
     \row
         \li \l [QtQuickControls] {ExclusiveGroup}
-        \li \l [QtLabsControls] {ButtonGroup}
+        \li \l [QtQuickControls2] {ButtonGroup}
     \row
         \li \l [QtQuickControls] {GroupBox}
 
-        \li \l [QtLabsControls] {GroupBox}, or \l [QtLabsControls] {Frame}
+        \li \l [QtQuickControls2] {GroupBox}, or \l [QtQuickControls2] {Frame}
             if a title is not required.
 
     \row
         \li \l [QtQuickControls] {Label}
-        \li \l [QtLabsControls] {Label}
+        \li \l [QtQuickControls2] {Label}
     \row
         \li \l [QtQuickControls] {Menu}
-        \li \l [QtLabsControls] {Menu}
+        \li \l [QtQuickControls2] {Menu}
     \row
         \li \l [QtQuickControls] {ProgressBar}
-        \li \l [QtLabsControls] {ProgressBar}
+        \li \l [QtQuickControls2] {ProgressBar}
     \row
         \li \l [QtQuickControls] {RadioButton}
-        \li \l [QtLabsControls] {RadioButton}
+        \li \l [QtQuickControls2] {RadioButton}
     \row
         \li \l [QtQuickControls] {ScrollView}
-        \li \l [QtLabsControls] {ScrollBar},
-            \l [QtLabsControls] {ScrollIndicator}
+        \li \l [QtQuickControls2] {ScrollBar},
+            \l [QtQuickControls2] {ScrollIndicator}
     \row
         \li \l [QtQuickControls] {Slider}
-        \li \l [QtLabsControls] {Slider}
+        \li \l [QtQuickControls2] {Slider}
     \row
         \li \l [QtQuickControls] {SpinBox}
-        \li \l [QtLabsControls] {SpinBox}
+        \li \l [QtQuickControls2] {SpinBox}
     \row
         \li \l [QtQuickControls] {Stack},
             \l [QtQuickControls] {StackView},
             \l [QtQuickControls] {StackViewDelegate}
-        \li \l [QtLabsControls] {StackView}
+        \li \l [QtQuickControls2] {StackView}
     \row
         \li \l [QtQuickControls] {StatusBar}
         \li No equivalent
     \row
         \li \l [QtQuickControls] {Switch}
-        \li \l [QtLabsControls] {Switch}
+        \li \l [QtQuickControls2] {Switch}
     \row
         \li \l [QtQuickControls] {Tab},
             \l [QtQuickControls] {TabView}
-        \li \l [QtLabsControls] {TabBar} in combination with, for example,
-            \l [QtLabsControls] {SwipeView}.
+        \li \l [QtQuickControls2] {TabBar} in combination with, for example,
+            \l [QtQuickControls2] {SwipeView}.
     \row
         \li \l [QtQuickControls] {TableView}
         \li No equivalent
     \row
         \li \l [QtQuickControls] {TextArea}
-        \li \l [QtLabsControls] {TextArea}
+        \li \l [QtQuickControls2] {TextArea}
     \row
         \li \l [QtQuickControls] {TextField}
-        \li \l [QtLabsControls] {TextField}
+        \li \l [QtQuickControls2] {TextField}
     \row
         \li \l [QtQuickControls] {ToolBar}
-        \li \l [QtLabsControls] {ToolBar}
+        \li \l [QtQuickControls2] {ToolBar}
     \row
         \li \l [QtQuickControls] {ToolButton}
-        \li \l [QtLabsControls] {ToolButton}
+        \li \l [QtQuickControls2] {ToolButton}
     \row
         \li \l [QtQuickControls] {TreeView}
         \li No equivalent
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc
index 4a6f8393..1455d98a 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \group qtlabscontrols-examples
+    \group qtquickcontrols2-examples
     \ingroup all-examples
     \title Qt Quick Controls 2 Examples
     \brief A collection of examples for \l {Qt Quick Controls 2}
diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp
index a3f7e100..94c39e48 100644
--- a/src/templates/qquickabstractbutton.cpp
+++ b/src/templates/qquickabstractbutton.cpp
@@ -54,7 +54,7 @@ static const int AUTO_REPEAT_INTERVAL = 100;
     \inherits Control
     \instantiates QQuickAbstractButton
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-buttons
+    \ingroup qtquickcontrols2-buttons
     \brief Base type of all button controls.
 
     AbstractButton provides the interface for controls with button-like
diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp
index 0e85fc2b..caa75a2d 100644
--- a/src/templates/qquickapplicationwindow.cpp
+++ b/src/templates/qquickapplicationwindow.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     \inherits Window
     \instantiates QQuickApplicationWindow
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-containers
     \brief Provides a top-level application window.
 
     ApplicationWindow is a \l Window which makes it convenient to add
diff --git a/src/templates/qquickbusyindicator.cpp b/src/templates/qquickbusyindicator.cpp
index a4bfba88..631101c3 100644
--- a/src/templates/qquickbusyindicator.cpp
+++ b/src/templates/qquickbusyindicator.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickBusyIndicator
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-indicators
+    \ingroup qtquickcontrols2-indicators
     \brief Indicates activity while content is being loaded.
 
     \image qtquickcontrols-busyindicator.gif
diff --git a/src/templates/qquickbutton.cpp b/src/templates/qquickbutton.cpp
index 75bffa2c..eba6395c 100644
--- a/src/templates/qquickbutton.cpp
+++ b/src/templates/qquickbutton.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickButton
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-buttons
+    \ingroup qtquickcontrols2-buttons
     \brief A push-button control that can be clicked by the user.
 
     \image qtquickcontrols-button.gif
diff --git a/src/templates/qquickcheckbox.cpp b/src/templates/qquickcheckbox.cpp
index 6d2fb3d0..8e0b3953 100644
--- a/src/templates/qquickcheckbox.cpp
+++ b/src/templates/qquickcheckbox.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickCheckBox
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-buttons
+    \ingroup qtquickcontrols2-buttons
     \brief An option button that can be checked or unchecked.
 
     CheckBox presents an option button that can be toggled on (checked) or
diff --git a/src/templates/qquickcombobox.cpp b/src/templates/qquickcombobox.cpp
index 109d03b7..8054dff8 100644
--- a/src/templates/qquickcombobox.cpp
+++ b/src/templates/qquickcombobox.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickComboBox
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-input
+    \ingroup qtquickcontrols2-input
     \brief A combined button and popup list taking minimal space.
 
     \image qtquickcontrols-combobox.png
diff --git a/src/templates/qquickcontainer.cpp b/src/templates/qquickcontainer.cpp
index fc754fbf..9d39182f 100644
--- a/src/templates/qquickcontainer.cpp
+++ b/src/templates/qquickcontainer.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickContainer
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-containers
     \brief A container control base type.
 
     Container is the base type of container-like user interface controls.
diff --git a/src/templates/qquickdial.cpp b/src/templates/qquickdial.cpp
index 89baec20..bfc91808 100644
--- a/src/templates/qquickdial.cpp
+++ b/src/templates/qquickdial.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickDial
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-input
+    \ingroup qtquickcontrols2-input
     \brief A circular dial that is rotated to set a value.
 
     The Dial is similar to a traditional dial knob that is found on devices
diff --git a/src/templates/qquickdrawer.cpp b/src/templates/qquickdrawer.cpp
index bb1ad6ff..8d8d2d78 100644
--- a/src/templates/qquickdrawer.cpp
+++ b/src/templates/qquickdrawer.cpp
@@ -52,8 +52,8 @@ QT_BEGIN_NAMESPACE
     \inherits Popup
     \instantiates QQuickDrawer
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-navigation
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-navigation
+    \ingroup qtquickcontrols2-containers
     \brief Provides a swipe-based side panel.
 
     Drawer provides a swipe-based side panel, similar to those often used in
diff --git a/src/templates/qquickframe.cpp b/src/templates/qquickframe.cpp
index 3db53300..265c2ba3 100644
--- a/src/templates/qquickframe.cpp
+++ b/src/templates/qquickframe.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
     \inherits Pane
     \instantiates QQuickFrame
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-containers
     \brief A logical group of controls within a visual frame.
 
     Frame is used to layout a logical group of controls together within a
diff --git a/src/templates/qquickgroupbox.cpp b/src/templates/qquickgroupbox.cpp
index b339078c..6efdb140 100644
--- a/src/templates/qquickgroupbox.cpp
+++ b/src/templates/qquickgroupbox.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Frame
     \instantiates QQuickGroupBox
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-containers
     \brief A frame with a logical group of controls.
 
     GroupBox is used to layout a logical group of controls together, within
diff --git a/src/templates/qquickmenu.cpp b/src/templates/qquickmenu.cpp
index 8a67dc46..b4154dc9 100644
--- a/src/templates/qquickmenu.cpp
+++ b/src/templates/qquickmenu.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \inherits Popup
     \instantiates QQuickMenu
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-menus
+    \ingroup qtquickcontrols2-menus
     \brief A menu control that can be used as a context menu or popup menu.
 
     \image qtquickcontrols-menu.png
diff --git a/src/templates/qquickmenuitem.cpp b/src/templates/qquickmenuitem.cpp
index d784af02..a2b607b5 100644
--- a/src/templates/qquickmenuitem.cpp
+++ b/src/templates/qquickmenuitem.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickMenuItem
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-menus
+    \ingroup qtquickcontrols2-menus
     \brief A menu item within a Menu.
 
     MenuItem is a convenience type that implements the AbstractButton API,
diff --git a/src/templates/qquickpage.cpp b/src/templates/qquickpage.cpp
index edd10e1b..5a14b777 100644
--- a/src/templates/qquickpage.cpp
+++ b/src/templates/qquickpage.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickPage
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-containers
     \brief A control that makes it convenient to add a header and footer to a page.
 
     Page is a container control which makes it convenient to add
diff --git a/src/templates/qquickpageindicator.cpp b/src/templates/qquickpageindicator.cpp
index df5517ea..f49909cc 100644
--- a/src/templates/qquickpageindicator.cpp
+++ b/src/templates/qquickpageindicator.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickPageIndicator
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-indicators
+    \ingroup qtquickcontrols2-indicators
     \brief Indicates the currently active page.
 
     PageIndicator is used to indicate the currently active page
diff --git a/src/templates/qquickpane.cpp b/src/templates/qquickpane.cpp
index 5ebf02a7..f5588d86 100644
--- a/src/templates/qquickpane.cpp
+++ b/src/templates/qquickpane.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickPane
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-containers
     \brief Provides a background matching with the application style and theme.
 
     Pane provides a background color that matches with the application style
diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp
index 2caa91b2..8f4810c5 100644
--- a/src/templates/qquickpopup.cpp
+++ b/src/templates/qquickpopup.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \inherits QtObject
     \instantiates QQuickPopup
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-popups
+    \ingroup qtquickcontrols2-popups
     \brief The base type of popup-like user interface controls.
 
     Popup is the base type of popup-like user interface controls. It can be
diff --git a/src/templates/qquickprogressbar.cpp b/src/templates/qquickprogressbar.cpp
index 2be0a776..779f2468 100644
--- a/src/templates/qquickprogressbar.cpp
+++ b/src/templates/qquickprogressbar.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickProgressBar
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-indicators
+    \ingroup qtquickcontrols2-indicators
     \brief Indicates the progress of an operation.
 
     ProgressBar indicates the progress of an operation. The value should be updated
diff --git a/src/templates/qquickradiobutton.cpp b/src/templates/qquickradiobutton.cpp
index 1a8bac5d..93a3c4a7 100644
--- a/src/templates/qquickradiobutton.cpp
+++ b/src/templates/qquickradiobutton.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickRadioButton
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-buttons
+    \ingroup qtquickcontrols2-buttons
     \brief An option button that can be toggled on or off.
 
     RadioButton presents an option button that can be toggled on (checked) or
diff --git a/src/templates/qquickrangeslider.cpp b/src/templates/qquickrangeslider.cpp
index 3de7106b..19ce5e19 100644
--- a/src/templates/qquickrangeslider.cpp
+++ b/src/templates/qquickrangeslider.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickRangeSlider
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-input
+    \ingroup qtquickcontrols2-input
     \brief A slider control used to select a range of values.
 
     \image qtquickcontrols-rangeslider.gif
diff --git a/src/templates/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp
index d6a15f7e..e1e414c5 100644
--- a/src/templates/qquickscrollbar.cpp
+++ b/src/templates/qquickscrollbar.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickScrollBar
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-indicators
+    \ingroup qtquickcontrols2-indicators
     \brief An interactive scroll bar control.
 
     ScrollBar is an interactive bar that can be used to scroll to a specific
diff --git a/src/templates/qquickscrollindicator.cpp b/src/templates/qquickscrollindicator.cpp
index 64b679a3..619c9b4b 100644
--- a/src/templates/qquickscrollindicator.cpp
+++ b/src/templates/qquickscrollindicator.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickScrollIndicator
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-indicators
+    \ingroup qtquickcontrols2-indicators
     \brief A non-interactive scroll indicator control.
 
     ScrollIndicator is a non-interactive indicator that indicates the current scroll
diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp
index 8f8cd3db..16be7677 100644
--- a/src/templates/qquickslider.cpp
+++ b/src/templates/qquickslider.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickSlider
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-input
+    \ingroup qtquickcontrols2-input
     \brief Selects a value by sliding a handle along a track.
 
     \image qtquickcontrols-slider.gif
diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp
index d1016455..f5d6f5b1 100644
--- a/src/templates/qquickstackview.cpp
+++ b/src/templates/qquickstackview.cpp
@@ -48,8 +48,8 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickStackView
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-navigation
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-navigation
+    \ingroup qtquickcontrols2-containers
     \brief Provides a stack-based navigation model.
 
     \image qtquickcontrols-stackview-wireframe.png
diff --git a/src/templates/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp
index 1aed7ffa..b378e354 100644
--- a/src/templates/qquickswipeview.cpp
+++ b/src/templates/qquickswipeview.cpp
@@ -46,8 +46,8 @@ QT_BEGIN_NAMESPACE
     \inherits Container
     \instantiates QQuickSwipeView
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-navigation
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-navigation
+    \ingroup qtquickcontrols2-containers
     \brief Enables the user to navigate pages by swiping sideways.
 
     SwipeView provides a swipe-based navigation model.
diff --git a/src/templates/qquickswitch.cpp b/src/templates/qquickswitch.cpp
index 1b81606f..8b647d45 100644
--- a/src/templates/qquickswitch.cpp
+++ b/src/templates/qquickswitch.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickSwitch
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-buttons
+    \ingroup qtquickcontrols2-buttons
     \brief An option button that can be toggled on or off.
 
     \image qtquickcontrols-switch.gif
diff --git a/src/templates/qquicktabbar.cpp b/src/templates/qquicktabbar.cpp
index 54ac20e8..8d6a65f8 100644
--- a/src/templates/qquicktabbar.cpp
+++ b/src/templates/qquicktabbar.cpp
@@ -45,8 +45,8 @@ QT_BEGIN_NAMESPACE
     \inherits Container
     \instantiates QQuickTabBar
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-navigation
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-navigation
+    \ingroup qtquickcontrols2-containers
     \brief A bar with icons allowing to switch between different views or subtasks.
 
     TabBar provides a tab-based navigation model.
diff --git a/src/templates/qquicktabbutton.cpp b/src/templates/qquicktabbutton.cpp
index 5ded5539..fc7cb634 100644
--- a/src/templates/qquicktabbutton.cpp
+++ b/src/templates/qquicktabbutton.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickTabButton
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-navigation
+    \ingroup qtquickcontrols2-navigation
     \brief A tab button control that can be found on a TabBar.
 
     \image qtquickcontrols-tabbutton.png
diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp
index d6285419..0f3860c9 100644
--- a/src/templates/qquicktextarea.cpp
+++ b/src/templates/qquicktextarea.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     \inherits TextEdit
     \instantiates QQuickTextArea
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-input
+    \ingroup qtquickcontrols2-input
     \brief A multi line text input control.
 
     TextArea is a multi-line text editor. TextArea extends TextEdit with
diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp
index c2c32eb7..7a8dae0d 100644
--- a/src/templates/qquicktextfield.cpp
+++ b/src/templates/qquicktextfield.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     \inherits TextInput
     \instantiates QQuickTextField
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-input
+    \ingroup qtquickcontrols2-input
     \brief A single line text input control.
 
     TextField is a single line text editor. TextField extends TextInput with
diff --git a/src/templates/qquicktoolbar.cpp b/src/templates/qquicktoolbar.cpp
index c46e534c..541160fd 100644
--- a/src/templates/qquicktoolbar.cpp
+++ b/src/templates/qquicktoolbar.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
     \inherits Frame
     \instantiates QQuickToolBar
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-containers
+    \ingroup qtquickcontrols2-containers
     \brief A container with context-sensitive controls.
 
     ToolBar is a container of application-wide and context sensitive
diff --git a/src/templates/qquicktoolbutton.cpp b/src/templates/qquicktoolbutton.cpp
index d04358f5..410bb556 100644
--- a/src/templates/qquicktoolbutton.cpp
+++ b/src/templates/qquicktoolbutton.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Button
     \instantiates QQuickToolButton
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-buttons
+    \ingroup qtquickcontrols2-buttons
     \brief A button with a layout suitable for a ToolBar.
 
     ToolButton is functionally similar to \l Button, but provides a look that
diff --git a/src/templates/qquicktooltip.cpp b/src/templates/qquicktooltip.cpp
index c62c0431..010a07c5 100644
--- a/src/templates/qquicktooltip.cpp
+++ b/src/templates/qquicktooltip.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \inherits Popup
     \instantiates QQuickToolTip
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-popups
+    \ingroup qtquickcontrols2-popups
     \brief Provides tool tips for any control.
 
     A tool tip is a short piece of text that informs the user of a control's
diff --git a/src/templates/qquicktumbler.cpp b/src/templates/qquicktumbler.cpp
index de0c1be8..42f67d70 100644
--- a/src/templates/qquicktumbler.cpp
+++ b/src/templates/qquicktumbler.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickTumbler
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-input
+    \ingroup qtquickcontrols2-input
     \brief A spinnable wheel of items that can be selected.
 
     \code