diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2013-07-23 13:59:43 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-25 10:55:08 +0200 |
| commit | e49151c51a42ad39e1422954724ba98960d178e7 (patch) | |
| tree | 65850a635f3b00971ef8224eece59d0c66572d98 /src | |
| parent | 4ec4ce407cf2c55811ff3876b49254785761e2dd (diff) | |
Doc: Link to QML Qt object in relevant locations
There is no obvious path to find the reference for QML Qt object.
This change adds links to it in Qt QML module index page and QML
Basic Types documentation.
Task-number: QTBUG-31921
Change-Id: I8a4ef1b3e696a0a7dec416d759ae64110e59c6c0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/qtqml.qdoc | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc index 7d2d662e4e..1d24acc31a 100644 --- a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc +++ b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc @@ -70,6 +70,8 @@ QML modules may extend the QML language with more basic types. For example, the basic types provided by the \c QtQuick module are listed below: \annotatedlist qtquickbasictypes +The \l{QtQml::Qt}{Qt} global object provides useful functions for manipulating values of basic types. + Currently only QML modules which are provided by Qt may provide their own basic types, however this may change in future releases of Qt QML. In order to use types provided by a particular QML module, clients diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc index 26e4867bbc..a260a3d785 100644 --- a/src/qml/doc/src/qtqml.qdoc +++ b/src/qml/doc/src/qtqml.qdoc @@ -75,7 +75,7 @@ The Qt QML module contains the QML framework and important QML types used in applications. The constructs of QML are described in the \l{The QML Reference}. In addition to the \l{QML Basic Types}, the module comes with -various QML object types: +the following QML object types: \list \li \l Component \li \l QtObject @@ -84,6 +84,9 @@ various QML object types: \li \l Timer \endlist +The \l{QtQml::Qt}{Qt} global object provides useful enums and functions +for various QML types. + \section2 Lists and Models New in Qt 5.1, the model types are moved to a submodule, \c QtQml.Models. The |