Doc: rename remaining qtlabscontrols groups and links

Change-Id: I40f149be98406b5f9e5d1e59fb2cc359ba864107
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

13 files changed, 13 insertions, 13 deletions

diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
index 33859cc8..47666b8d 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
@@ -31,7 +31,7 @@
 
     Qt Quick Controls 2 offers a selection of button-like controls.
 
-    \annotatedlist qtlabscontrols-buttons
+    \annotatedlist qtquickcontrols2-buttons
 
     Each type of button has its own specific target use case. The following
     sections offer guidelines for choosing the appropriate type of button,
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
index 4e037033..1786a4f1 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
@@ -31,7 +31,7 @@
 
     Qt Quick Controls 2 offers a selection of container-like controls.
 
-    \annotatedlist qtlabscontrols-containers
+    \annotatedlist qtquickcontrols2-containers
 
     Each type of container can be used to group a set of controls together.
     The following sections offer guidelines for choosing the appropriate type
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc
index 6275e6ba..3c8d5ea7 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc
@@ -32,7 +32,7 @@
     Qt Quick Controls 2 offers a selection of controls that are used as
     delegates in views.
 
-    \annotatedlist qtlabscontrols-delegates
+    \annotatedlist qtquickcontrols2-delegates
 
     Each type of delegate has its own specific target use case. The following
     sections offer guidelines for choosing the appropriate type of delegate,
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
index cf1ac057..dcc0ff9e 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
@@ -31,7 +31,7 @@
 
     Qt Quick Controls 2 offers a selection of indicator-like controls.
 
-    \annotatedlist qtlabscontrols-indicators
+    \annotatedlist qtquickcontrols2-indicators
 
     Each type of indicator has its own specific target use case. The following
     sections offer guidelines for choosing the appropriate type of indicator,
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
index 16b14d51..60b2250f 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
@@ -32,7 +32,7 @@
     Qt Quick Controls 2 offers a variety of input controls for both numeric
     and textual input.
 
-    \annotatedlist qtlabscontrols-input
+    \annotatedlist qtquickcontrols2-input
 
     Each type of input control has its own specific target use case. The
     following sections offer guidelines for choosing the appropriate type
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index e9444b23..8f39497f 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -123,7 +123,7 @@
     \endtable
 
     In addition to specifying the attributes in QML, it is also possible to
-    specify them via environment variables or in a \l {qtlabscontrols-conf}
+    specify them via environment variables or in a \l {qtquickcontrols2-conf}
     {configuration file}.
 
     \section3 Environment Variables
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc
index 0eb93fdf..d54b360c 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc
@@ -29,7 +29,7 @@
     \page qtquickcontrols2-menus.html
     \title Menu Controls
 
-    \annotatedlist qtlabscontrols-menus
+    \annotatedlist qtquickcontrols2-menus
 
     Each type of menu control has its own specific target use case. The
     following sections offer guidelines for choosing the appropriate type
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc
index 6eb0c449..8ddc2f3a 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc
@@ -31,7 +31,7 @@
 
     Qt Quick Controls 2 offers a selection of navigation models.
 
-    \annotatedlist qtlabscontrols-navigation
+    \annotatedlist qtquickcontrols2-navigation
 
     The following sections offer guidelines for choosing the appropriate type
     of navigation model, depending on the use case.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
index a701b29b..1939c577 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
@@ -92,7 +92,7 @@
     \endcode
 
     \section2 Configuration file
-    \target qtlabscontrols-conf
+    \target qtquickcontrols2-conf
 
     Qt Quick Controls 2 support a special configuration file, \c :/qtquickcontrols.conf,
     that is built into an application's resources.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
index 00173694..86d53397 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
@@ -123,7 +123,7 @@
     \endtable
 
     In addition to specifying the attributes in QML, it is also possible to
-    specify them via environment variables or in a \l {qtlabscontrols-conf}
+    specify them via environment variables or in a \l {qtquickcontrols2-conf}
     {configuration file}.
 
     \section3 Environment Variables
diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp
index 2a08e702..a6dcd348 100644
--- a/src/quicktemplates2/qquickcheckdelegate.cpp
+++ b/src/quicktemplates2/qquickcheckdelegate.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits ItemDelegate
     \instantiates QQuickCheckDelegate
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-delegates
+    \ingroup qtquickcontrols2-delegates
     \brief An item delegate that can be checked or unchecked.
 
     \image qtquickcontrols2-checkdelegate.gif
diff --git a/src/quicktemplates2/qquickradiodelegate.cpp b/src/quicktemplates2/qquickradiodelegate.cpp
index aff57491..6c0a45dd 100644
--- a/src/quicktemplates2/qquickradiodelegate.cpp
+++ b/src/quicktemplates2/qquickradiodelegate.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits ItemDelegate
     \instantiates QQuickRadioDelegate
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-delegates
+    \ingroup qtquickcontrols2-delegates
     \brief An item delegate that can be checked or unchecked.
 
     \image qtquickcontrols2-radiodelegate.gif
diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp
index 286d253b..3975fe13 100644
--- a/src/quicktemplates2/qquickswitchdelegate.cpp
+++ b/src/quicktemplates2/qquickswitchdelegate.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
     \inherits ItemDelegate
     \instantiates QQuickSwitchDelegate
     \inqmlmodule Qt.labs.controls
-    \ingroup qtlabscontrols-delegates
+    \ingroup qtquickcontrols2-delegates
     \brief An item delegate that can be toggled on or off.
 
     \image qtquickcontrols2-switchdelegate.gif