aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc/src/qtquick.qdoc
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-03-22 11:03:46 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-11 10:12:41 +0200
commit818b6af3a643dcbfc7bb2c5a40eae8f5cb6900b6 (patch)
tree59e44e1421080228f2be3df575f3a7422fbdecb4 /src/quick/doc/src/qtquick.qdoc
parent1a1ce4326c55f0af9acb3d3b42d70040bbe45673 (diff)
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>
Diffstat (limited to 'src/quick/doc/src/qtquick.qdoc')
-rw-r--r--src/quick/doc/src/qtquick.qdoc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index 1944129392..c570da531c 100644
--- 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