diff options
author | Chris Adams <christopher.adams@nokia.com> | 2012-07-26 15:45:45 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-30 09:15:37 +0200 |
commit | e7b90ea3107996fb4a1b410631e0650d2d704912 (patch) | |
tree | 9a103f8aca8f1ed392aa197fb93be4450df071bd /src/qml/doc/src/qtqml.qdoc | |
parent | 1b3d4a94fdd578786529f51b4d25b560696fb610 (diff) |
Improve QML basic types documentation
Basic types are provided either by the language (int, string, bool,
real, double, date, url, var, variant) or by modules (value types).
In 5.1 we would like modules to be able to provide more basic types,
and thus a cleaner separation of the documentation makes sense.
This patch also improves linking of the term QtQml so that a clear
distinction is made between the QtQml QML module and the QtQml C++
Qt Module (the QtQml QML module links now point to the QtQml type
reference page).
Change-Id: Ibe3ad33e4616c5f29ea38dadc27e13938aedb9d7
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/qml/doc/src/qtqml.qdoc')
-rw-r--r-- | src/qml/doc/src/qtqml.qdoc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc index 8a5813fe91..4482822c01 100644 --- a/src/qml/doc/src/qtqml.qdoc +++ b/src/qml/doc/src/qtqml.qdoc @@ -107,14 +107,19 @@ types, animation classes, and canvas integration) for the QML language. \li \l{qtqml-documents-definetypes.html#defining-an-object-type-with-a-qml-file}{Defining an Object Type with a QML File} \li \l{qtqml-documents-definetypes.html#accessible-attributes-of-custom-types}{Accessible Attributes of Custom Types} \endlist - \li \l{qtqml-documents-networktransparency.html}{Resource Loading and Network Transparency} - \li \l{qtqml-documents-scope.html}{Scope and Naming Resolution} + \li \l{qtqml-documents-networktransparency.html}{Resource Loading and Network Transparency} + \li \l{qtqml-documents-scope.html}{Scope and Naming Resolution} \endlist - \li \l{qtqml-typereference-topic.html}{QML Types Provided by the Qt QML Module} + \li \l{qtqml-typereference-topic.html}{QML Types Provided by the QtQml Module} \list - \li \l{qtqml-typereference-topic.html#qtobject}{QtObject} - \li \l{qtqml-typereference-topic.html#component}{Component} + \li \l{qtqml-typereference-topic.html#importing-qtqml}{Importing QtQml} + \li \l{qtqml-typereference-topic.html#basic-types}{Basic Types} + \li \l{qtqml-typereference-topic.html#object-types}{Object Types} + \list + \li \l{qtqml-typereference-topic.html#qtobject}{QtObject} + \li \l{qtqml-typereference-topic.html#component}{Component} + \endlist \endlist \li \l{qtqml-javascript-topic.html}{Integrating QML and JavaScript} |