From f3fab4423f7d2c3f64f6b424a88420d645f9e7f6 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Date: Tue, 22 Mar 2016 16:14:09 +0100
Subject: [PATCH] Doc: using Qt Labs Controls

- Describe the wizard
- Mention Labs Controls besides older Controls

Change-Id: Ib9182c5ebc9c8ee4478018dd5ef29841284eb3de
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
---
 doc/src/projects/creator-projects-creating.qdoc |  6 +++++-
 doc/src/qtquick/qtquick-components.qdoc         |  6 ++++++
 doc/src/qtquick/qtquick-creating.qdoc           | 14 ++++++++++----
 doc/src/qtquick/qtquick-screens.qdoc            |  6 ++++++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index c7512b421e5..3e72cf5abd0 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -119,7 +119,11 @@
 
             \li Qt Quick Controls Application
 
-                Create a Qt Quick application using Qt Quick Controls
+                Create a Qt Quick application using
+                \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}
 
             \li Qt Canvas 3D Application
 
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index 3d77297b89d..facf9375643 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -84,6 +84,12 @@
     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
+    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.
+
     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 ed2108a2fde..8d8adad80fe 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -50,8 +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} is like
-            \uicontrol {Qt Quick Application}, but using Qt Quick Controls.
+        \li \uicontrol {Qt Quick Controls Application} and
+            \uicontrol {Qt Labs Controls Application} are like
+            \uicontrol {Qt Quick Application}, but using
+            \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}
 
         \li \uicontrol {Qt Canvas 3D Application} creates a Qt Quick application
             that imports the Qt Canvas 3D module and, optionally, includes
@@ -80,8 +85,9 @@
     \list 1
 
         \li Select \uicontrol File > \uicontrol {New File or Project} >
-            \uicontrol Application > \uicontrol {Qt Quick Application} or
-            \uicontrol {Qt Quick Controls Application} > \uicontrol Choose.
+            \uicontrol Application > \uicontrol {Qt Quick Application},
+            \uicontrol {Qt Quick Controls Application}, or
+            \uicontrol {Qt Labs Controls Application} > \uicontrol Choose.
 
         \li In the \uicontrol {Minimal required Qt version} field, select the Qt
             version to develop with. The Qt version determines the Qt Quick
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index 69086514a72..e45beeaf189 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -51,6 +51,12 @@
     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
+    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.
+
     \section1 Adding Components to Screens
 
     \list 1