diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:59:56 +0100 |
---|---|---|
committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:02:08 +0100 |
commit | 47c45bb1e487b3823281683c1110d9269f144582 (patch) | |
tree | 4c687d46d9aa7d90f064a25e6c7f0241ae28e16d /src/quick/doc/src/qtquick.qdoc | |
parent | 677be9a27770ff48dd771ec4fc1c66139aac4aa8 (diff) | |
parent | 7d94fa8e074ba816751c60bd0ad3c63b3c0b0a27 (diff) |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs
Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
Diffstat (limited to 'src/quick/doc/src/qtquick.qdoc')
-rw-r--r-- | src/quick/doc/src/qtquick.qdoc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc index 5ce289c9e9..1d24e33cc4 100644 --- a/src/quick/doc/src/qtquick.qdoc +++ b/src/quick/doc/src/qtquick.qdoc @@ -39,7 +39,7 @@ visual components, receiving user input, creating data models and views and delayed object instantiation. The Qt Quick module provides both the \c QtQuick QML module, which supplies -\l{QML Types Provided by Qt Quick}{a set of QML types} for creating user +\l{Qt Quick QML Types}{a set of QML types} for creating user interfaces with the QML language, and the \c QtQuick C++ module, which supplies \l{Qt Quick Module - C++ Classes}{a set of C++ APIs} for integrating with user interfaces and applications built with QML and the \c QtQuick QML module. @@ -113,7 +113,7 @@ Additional Qt Quick information: \list \li \l{Qt Quick Module - C++ Classes} - the C++ API provided by the Qt Quick module -\li \l{QML Types Provided by Qt Quick} - a list of QML types provided by the +\li \l{Qt Quick QML Types} - a list of QML types provided by the \c{QtQuick} import \list \li \l{QML Module QtQuick.XmlListModel 2.0}{XML List Model} - contains types @@ -137,4 +137,3 @@ Further information for writing QML applications: Qt QML module, which provides the QML engine and language infrastructure \endlist */ - |