Doc: remove Qt Labs Controls advices

It was just a testballoon and they are living as
Qt Quick Controls 2 in newer Qt versions.

Change-Id: Ic65a7af0866be5e1427e3165ab588ee28c2db051
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

4 files changed, 12 insertions, 22 deletions

diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index 85ce180319..472cd41660 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -121,11 +121,9 @@
 
                 Create a Qt Quick application using
                 \l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html}
-                {Qt Quick Controls 2} (requires Qt 5.7 or later),
+                {Qt Quick Controls 2} (requires Qt 5.7 or later) or
                 \l{http://doc.qt.io/qt-5/qtquickcontrols-index.html}
-                {Qt Quick Controls}, or
-                \l{http://doc.qt.io/qt-5/qtlabscontrols-index.html}
-                {Qt Labs Controls} (only for Qt 5.6)
+                {Qt Quick Controls}.
 
             \li Qt Canvas 3D Application
 
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index dbc41d57f8..264a3640f5 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -84,15 +84,13 @@
     creating classic desktop-style user interfaces using Qt Quick 2.1. You can
     use the Qt Quick Controls Styles to customize Qt Quick Controls.
 
-    Since Qt 5.6, Qt Labs Controls provide lightweight QML types for creating
+    Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
+    Qt Labs Controls. These Controls provide lightweight QML types for creating
     performant user interfaces for embedded and mobile devices. These controls
     achieve improved efficiency by employing a simplified styling architecture
     when compared to Qt Quick Controls, on which the module is based. These
     types work in conjunction with Qt Quick and Qt Quick Layouts.
 
-    Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
-    Qt Labs Controls.
-
     Some ready-made controls, such as a gauge, dial, status indicator, and
     tumbler, are provided by the \l {Qt Quick Extras} module.
 
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index 66cea7817e..0cd1984f27 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -50,16 +50,13 @@
             a QQuickView. You can build the application and deploy it to desktop,
             embedded, and mobile target platforms.
 
-        \li \uicontrol {Qt Quick Controls Application},
-            \uicontrol {Qt Quick Controls 2 Application}, and
-            \uicontrol {Qt Labs Controls Application} are like
+        \li \uicontrol {Qt Quick Controls 2 Application} and
+            \uicontrol {Qt Quick Controls Application} are like
             \uicontrol {Qt Quick Application}, but using
             \l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html}
-            {Qt Quick Controls 2} (requires Qt 5.7 or later),
+            {Qt Quick Controls 2} (requires Qt 5.7 or later) or
             \l{http://doc.qt.io/qt-5/qtquickcontrols-index.html}
-            {Qt Quick Controls}, or
-            \l{http://doc.qt.io/qt-5/qtlabscontrols-index.html}
-            {Qt Labs Controls} (only for Qt 5.6)
+            {Qt Quick Controls}.
 
         \li \uicontrol {Qt Canvas 3D Application} creates a Qt Quick application
             that imports the Qt Canvas 3D module and, optionally, includes
@@ -88,9 +85,8 @@
     \list 1
 
         \li Select \uicontrol File > \uicontrol {New File or Project} >
-            \uicontrol Application > \uicontrol {Qt Quick Application},
-            \uicontrol {Qt Quick Controls Application}, or
-            \uicontrol {Qt Labs Controls Application} > \uicontrol Choose.
+            \uicontrol Application > \uicontrol {Qt Quick Application} or
+            \uicontrol {Qt Quick Controls Application} > \uicontrol Choose.
 
         \li For some Qt Quick applications, you must select the Qt version to
             develop with in the \uicontrol {Minimal required Qt version} field.
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index cc76d9f2f2..726f3179ec 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -51,15 +51,13 @@
     creating classic desktop-style user interfaces using Qt Quick 2.1. You can
     use the Qt Quick Controls Styles to customize Qt Quick Controls.
 
-    Since Qt 5.6, Qt Labs Controls provide lightweight QML types for creating
+    Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
+    Qt Labs Controls. These controls provide lightweight QML types for creating
     performant user interfaces for embedded and mobile devices. These controls
     achieve improved efficiency by employing a simplified styling architecture
     when compared to Qt Quick Controls, on which the module is based. These
     types work in conjunction with Qt Quick and Qt Quick Layouts.
 
-    Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
-    Qt Labs Controls.
-
     \section1 Adding Components to Screens
 
     \list 1