Doc: add info about Qt Quick Dialogs and Layouts

Task-number: QTCREATORBUG-12721
Change-Id: Ib6ff3e53806be26f714378d4ffcd3b54a36a6e8f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

5 files changed, 25 insertions, 24 deletions

diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc
index 307d22c29e..c54a065498 100644
--- a/doc/src/qtquick/qtquick-app-development.qdoc
+++ b/doc/src/qtquick/qtquick-app-development.qdoc
@@ -43,14 +43,14 @@
 
         \li \l {Creating Components}
 
-            You can use predefined QML types to create components or use a set
-            of Qt Quick Controls for creating classic desktop-style user
-            interfaces using Qt Quick 2.1 (available since Qt 5.1).
+            You can use basic QML types to create your own components that you
+            can combine with ready-made Qt Quick Controls and Layouts
+            (available since Qt 5.1).
         \li \l {Creating Screens}
 
-            You can use predefined QML types, Qt Quick Controls, and your own
-            components to create screens. You can use states and transitions to
-            navigate between screens.
+            You can combine basic QML types with ready-made Qt Quick Controls,
+            Dialogs, and Layouts (available since Qt 5.1) to create screens. You
+            can use states and transitions to navigate between screens.
         \li \l {Exporting Designs from Graphics Software}
 
             You can export designs from graphics software, such as Adobe
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index 4980510261..07fb88aeb5 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -71,14 +71,11 @@
 
     \endlist
 
-    QML types allow you to write cross-platform applications with custom look
-    and feel. You can also use ready-made Qt Quick Components (for Qt 4) to
-    create screens with a native look and feel for a particular target platform.
-    Since Qt 5.1, a set of Qt Quick Controls is available for creating classic
-    desktop-style user interfaces using Qt Quick 2.1.
-
-    Qt Quick 1 Components are a part of Qt 4, whereas Qt Quick Controls were
-    added to Qt 5.1.
+    You can also use ready-made Qt Quick 1 Components (for Qt 4) to create
+    screens with a native look and feel for a particular target platform.
+    Since Qt 5.1, Qt Quick Controls, Dialogs, and Layouts are available for
+    creating classic desktop-style user interfaces using Qt Quick 2.1. You can
+    use the Qt Quick Controls Styles to customize Qt Quick Controls.
 
     The \QC project wizards create Qt Quick applications that use Qt Quick
     Components or Controls.
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index 8c0117a25b..8870e7c1ad 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -68,10 +68,10 @@
             \gui {Qt Quick UI} > \gui Choose.
 
         \li In the \gui {Qt Quick component set} field, select the component set
-            to use for the project. The Qt Quick imports enable you to create
-            cross-platform applications with a custom look and feel, whereas the
-            Qt Quick Controls provide the look and feel for a particular
-            platform:
+            to use for the project. The Qt Quick imports enable you to use the
+            basic QML types to create user interfaces, whereas the Qt Quick
+            Controls provide a set of ready-made controls that you can customize
+            by using Qt Quick Controls Styles:
 
         \list
 
@@ -85,6 +85,10 @@
 
         \endlist
 
+        You can add imports later to combine Qt Quick basic types with Qt Quick
+        Controls, Qt Quick Dialogs, and Qt Quick Layouts (available since
+        Qt 5.1).
+
     \endlist
 
     \QC creates the following files:
diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc
index c6b22bb80a..cc8b45025e 100644
--- a/doc/src/qtquick/qtquick-designer.qdoc
+++ b/doc/src/qtquick/qtquick-designer.qdoc
@@ -143,9 +143,9 @@
     components, basic types, layouts, positioner types, and views.
 
     Sets of UI components with the look and feel of a particular mobile device
-    platform have been defined for Qt Quick 1. Since Qt 5.1, a set of Qt Quick
-    Controls is available for creating classic desktop-style user interfaces
-    using Qt Quick 2.1. The Qt Quick Components and Controls are based on
+    platform have been defined for Qt Quick 1. Since Qt 5.1, ready-made Qt
+    Quick Controls, Dialogs, and Layouts are available for creating user
+    interfaces using Qt Quick 2.1. The components and controls are based on
     standard QML types. To view the components and controls in the
     \gui {Library} pane, import the component sets in the \gui Imports pane.
 
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index 283fcc9f4f..e5fcee617e 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -40,9 +40,9 @@
 
     You can also use ready-made Qt Quick 1 Components (for Qt 4) to create
     screens with a native look and feel for a particular target platform.
-    Since Qt 5.1, a set of Qt Quick Controls is available for creating classic
-    desktop-style user interfaces using Qt Quick 2.1. Qt Quick 1 Components are
-    a part of Qt 4, whereas Qt Quick Controls were added to Qt 5.1.
+    Since Qt 5.1, Qt Quick Controls, Dialogs, and Layouts are available for
+    creating classic desktop-style user interfaces using Qt Quick 2.1. You can
+    use the Qt Quick Controls Styles to customize Qt Quick Controls.
 
     \section1 Adding Components to Screens