Add Qt Quick Controls to the documentation

Add documentation and links to Qt Quick Controls to make
the new module visible.

Change-Id: Ia7e65f7013043e92d6c6d071c4eab9601c48397a
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

3 files changed, 23 insertions, 11 deletions

diff --git a/doc/config/qtdoc-project.qdocconf b/doc/config/qtdoc-project.qdocconf
index c3e1cffd2..24445e15b 100644
--- a/doc/config/qtdoc-project.qdocconf
+++ b/doc/config/qtdoc-project.qdocconf
@@ -29,6 +29,7 @@ depends += \
     qtpublishsubscribe \
     qtqml \
     qtquick \
+    qtquickcontrols \
     qtscript \
     qtscripttools \
     qtsensors \
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 5153ad842..3f62a08f0 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -75,6 +75,10 @@
         \li A declarative framework for building highly dynamic applications
             with custom user interfaces.
     \row
+        \li \l{Qt Quick Controls}
+        \li Reusable Qt Quick based UI controls to create classic desktop-style
+            user interfaces
+    \row
         \li \l{Qt SQL}
         \li Classes for database integration using SQL.
     \row
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index 401290755..20f43e445 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -66,6 +66,11 @@ supplemented through specialised components for particle and shader effects. The
 \li \l{qtquick-internationalization.html}{Internationalization and Localization}
 \endlist
 
+\note The \l{Qt Quick Controls} module is new in Qt 5.1 and provides a
+set of UI elements to create classic desktop-style user interfaces using \l{Qt Quick} 2.
+While the module is not mature yet, it already offers useable featured controls
+styled for the desktop. See \l{Qt Quick Controls} for more information.
+
 \section1 Qt Widgets
 
 \l {Qt Widgets} are traditional user interface elements that are typically found
@@ -115,7 +120,7 @@ choose the best suited tool for the job.
 \table
     \header
         \li
-        \li Qt Quick
+        \li Qt Quick / Qt Quick Controls
         \li Qt Widgets
         \li Qt WebKit
         \li Comments
@@ -127,11 +132,11 @@ choose the best suited tool for the job.
         \li
     \row
         \li Native look'n'feel
-        \li
+        \li X
         \li X
         \li
-        \li Qt Widgets integrate well to the underlying platform
-            providing native look'n'feel on Windows, Linux and Mac OSX.
+        \li Qt Widgets and Qt Quick Controls integrate well to the underlying
+            platform, providing a native look'n'feel on Windows, Linux, and Mac OS X.
     \row
         \li Custom look'n'feel
         \li X
@@ -170,11 +175,12 @@ choose the best suited tool for the job.
             interact with web content.
     \row
         \li Model/View programming
-        \li X
+        \li (X)
         \li X
         \li
-        \li Though some MVC like concepts exist in Qt WebKit, Qt Quick
-            and Qt Widgets provide more convenient and complete frameworks.
+        \li Some MVC like concepts exist in Qt WebKit, Qt Quick provides convenient
+            views, but Qt Widgets provide more convenient and complete frameworks.
+            In addition to Qt Quick views, Qt Quick Controls provide a TableView.
     \row
         \li Rapid UI development
         \li X
@@ -201,12 +207,13 @@ choose the best suited tool for the job.
             in Qt WebKit. Qt Widgets offer very little in this area.
     \row
         \li Rich text processing
-        \li
+        \li X
         \li X
         \li
-        \li Even though Qt's rich text document classes can be utilized in
-            Qt Quick, Qt Widgets currently provide the most comprehensive
-            base for implementing text editors.
+        \li Qt Widgets currently provide the most comprehensive base for implementing
+            text editors. Qt's rich text document classes can also be utilized in
+            Qt Quick and Qt Quick Controls' TextArea, but may require some C++
+            implementation.
     \row
         \li Existing web content
         \li