diff options
| author | Martin Smith <martin.smith@digia.com> | 2013-10-01 13:03:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 14:40:01 +0200 |
| commit | 4706b1ceff9af9141044ed3cf020ce5624bfa40f (patch) | |
| tree | 43672217a945512ddd1704468d1fd4b6e9c153c7 /src/qml/doc/src/cppintegration | |
| parent | 4f50ab594aa2fb1d38981127beca634ad3396489 (diff) | |
qdoc: no longer recognizes the version nr in QML refs
All QML references of the form
<QML-module-name><QML-module-version>::<QML-type>::<member-name> have
had the <QML-module-version> removed i.
Task-number: QTBUG-33776
Change-Id: Idde279e0f254cd24ea44f9841662dd81a2c5bbc6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration')
| -rw-r--r-- | src/qml/doc/src/cppintegration/contextproperties.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/cppintegration/data.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/src/cppintegration/contextproperties.qdoc b/src/qml/doc/src/cppintegration/contextproperties.qdoc index e0d5091f2f..abdc18981a 100644 --- a/src/qml/doc/src/cppintegration/contextproperties.qdoc +++ b/src/qml/doc/src/cppintegration/contextproperties.qdoc @@ -74,7 +74,7 @@ QML code invokes a method on the object instance: \endtable (Note that date/time values returned from C++ to QML can be formatted through -\l{QtQml2::Qt::formatDateTime}{Qt.formatDateTime()} and associated functions.) +\l{QtQml::Qt::formatDateTime}{Qt.formatDateTime()} and associated functions.) If the QML item needs to receive signals from the context property, it can connect to them using the \l Connections type. For example, if \c ApplicationData has a signal named \c diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc index 74a93436f5..8bad77ebab 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 {QtQml2::Qt} object. For example, the \l +or by a related method provided by the \l {QtQml::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: |