diff options
author | Topi Reinio <topi.reinio@digia.com> | 2013-05-14 12:41:32 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-15 09:32:58 +0200 |
commit | ebbb0257e65b762ac6c3cf2baa19bbb5d581d071 (patch) | |
tree | 57f4b9df9881043b34a57e0718c9d28a0e7ba3f7 /src/qml/doc/src/cppintegration/data.qdoc | |
parent | 56da72fb219356d2948e9adae3f3a17553fc7add (diff) |
Doc: Define Qt global object as a QML type and fix referring docs
This change adds the Qt global object as a QML type in the Qt QML module
and fixes links to it in documentation.
Task-number: QTBUG-29353
Change-Id: I1690224091a79a3309fac7a78aa0c0c734449e4f
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration/data.qdoc')
-rw-r--r-- | src/qml/doc/src/cppintegration/data.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc index dc1b4cae9c..74a93436f5 100644 --- a/src/qml/doc/src/cppintegration/data.qdoc +++ b/src/qml/doc/src/cppintegration/data.qdoc @@ -124,7 +124,7 @@ QQuaternion and QMatrix4x4, are only available from QML when the \l {Qt Quick} module is included. As a convenience, many of these types can be specified in QML by string values, -or by a related method provided by the \l {QML:Qt} object. For example, the \l +or by a related method provided by the \l {QtQml2::Qt} object. For example, the \l {Image::sourceSize} property is of type \l size (which automatically translates to the QSize type) and can be specified by a string value formatted as "width\c{x}height", or by the Qt.size() function: |