Doc: Update info about Qt Quick Controls 2 support and styling

Replace duplicate information in the "Creating Screens" topic with a
link that poinst to the new "Using Qt Quick Controls" section in the
"Creating Components" topic.

Add information about selecting styles on the toolbar.

Change-Id: I6c79b8781c216355427920a38542017f0dbf9929
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

2 files changed, 24 insertions, 26 deletions

diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index 1b9be02297..4f7bdab5d5 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -78,28 +78,37 @@
 
     \endlist
 
-    You can also use ready-made Qt Quick 1 Components (for Qt 4) to create
+    \section1 Using Qt Quick Controls
+
+    In Qt 4, ready-made Qt Quick 1 Components were provided for creating
     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.
+    In Qt 5.1, Qt Quick Controls, Dialogs, and Layouts were added for
+    creating classic desktop-style user interfaces using Qt Quick 2.1. The
+    Qt Quick Controls Styles could be used to customize Qt Quick Controls.
 
     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.
+    Qt Labs Controls. They provide lightweight QML types for creating performant
+    user interfaces for embedded and mobile devices.
 
-    Some ready-made controls, such as a gauge, dial, status indicator, and
-    tumbler, are provided by the \l {Qt Quick Extras} module.
+    Qt Quick Controls 2 achieve improved efficiency by employing a simplified
+    \l {Styling Qt Quick Controls 2}{styling architecture} when compared to
+    Qt Quick Controls, on which the module is based. \QMLD reads the
+    \c qtquickcontrols2.conf file that specifies the preferred style and some
+    style-specific arguments. To change the style, select another style from
+    the list on the toolbar. This enables you to check how your UI looks when
+    using the available styles.
+
+    Qt Quick Controls 2 work in conjunction with Qt Quick and Qt Quick Layouts.
 
     The \QC project wizards create Qt Quick applications that use Qt Quick
-    Components or Controls.
+    2 types or Qt Quick Controls 2 types.
 
-    Even if you use the Qt Quick Components, you can still write cross-platform
+    Even if you use Qt Quick Controls 2, you can still write cross-platform
     applications, by using different sets of QML files for each platform.
 
+    Some ready-made controls, such as a gauge, dial, status indicator, and
+    tumbler, are provided by the \l {Qt Quick Extras} module.
+
     \section1 Creating Components in Qt Quick Designer
 
     \list 1
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index 77d00151bc..2beb1c4a35 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -45,19 +45,6 @@
     The QML files in the project folder are displayed in \uicontrol {QML Components}
     in the \uicontrol Library.
 
-    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.
-
-    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.
-
     \section1 Adding Components to Screens
 
     \list 1
@@ -72,6 +59,8 @@
 
     \endlist
 
+    For more information about the ready-made components available, see
+    \l {Using Qt Quick Controls}.
 
     \section1 Using Data Models