diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2013-03-22 11:03:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-11 10:12:41 +0200 |
| commit | 818b6af3a643dcbfc7bb2c5a40eae8f5cb6900b6 (patch) | |
| tree | 59e44e1421080228f2be3df575f3a7422fbdecb4 | |
| parent | 1a1ce4326c55f0af9acb3d3b42d70040bbe45673 (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>
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 2 | ||||
| -rw-r--r-- | src/quick/doc/src/qtquick.qdoc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index d9b4e03818..37ace7b0db 100644 --- 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 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 |