Doc: Add a link to the Qt Quick Controls page

From the Qt Quick main page.

Change-Id: Iaea46afe0f6a795cb33ec53a7b767461ce42d3df
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>

diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index d9b4e03..37ace7b 100644 (file)
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -34,7 +34,7 @@ qhp.QtQuick.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtquick/qtquick.tags
 
-depends += qtcore qtxmlpatterns qtqml qtgui qtlinguist
+depends += qtcore qtxmlpatterns qtqml qtgui qtlinguist qtquickcontrols
 
 headerdirs  += ..
 

diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index 1944129..c570da5 100644 (file)
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -44,11 +44,14 @@ interfaces with the QML language, and the \c QtQuick C++ module, which supplies
 \l{Qt Quick C++ Classes}{a set of C++ APIs} for integrating with user interfaces and
 applications built with QML and the \c QtQuick QML module.
 
+\note From Qt 5.1, a set of Qt Quick based UI controls is available to
+create classic desktop-style user interfaces. Please see \l{Qt Quick Controls}
+for more information.
+
 For those new to QML and Qt Quick, please see
 \l{QML Application Developer Resources}
 for an introduction to writing QML applications.
 
-
 \section1 Important Concepts in Qt Quick
 
 Qt Quick provides everything needed to create a rich application with a fluid