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/qmltypereference.qdoc | |
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/qmltypereference.qdoc')
-rw-r--r-- | src/qml/doc/src/qmltypereference.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc index e927e8ef78..f592a18bb0 100644 --- a/src/qml/doc/src/qmltypereference.qdoc +++ b/src/qml/doc/src/qmltypereference.qdoc @@ -98,16 +98,16 @@ MyDatePicker { minDate: "2000-01-01"; maxDate: "2020-12-31" } \endqml To read a date value returned from a C++ extension class, use -\l{QtQml2::Qt::formatDate()}{Qt.formatDate()} and \l{QtQml2::Qt::formatDateTime()}{Qt.formatDateTime()}. +\l{QtQml::Qt::formatDate()}{Qt.formatDate()} and \l{QtQml::Qt::formatDateTime()}{Qt.formatDateTime()}. When integrating with C++, note that any QDate value \l{qtqml-cppintegration-data.html}{passed into QML from C++} is automatically converted into a \c date value, and vice-versa. This basic type is provided by the QML language. It can be implicitly converted -to a \l{QtQml2::Date}{Date} object. +to a \l{QtQml::Date}{Date} object. -\sa {QtQml2::Date}{QML Date object}, {QML Basic Types} +\sa {QtQml::Date}{QML Date object}, {QML Basic Types} */ /*! @@ -125,7 +125,7 @@ MyTimePicker { time: "14:22:15" } \endqml To read a time value returned from a C++ extension class, use -\l{QtQml2::Qt::formatTime()}{Qt.formatTime()} and \l{QtQml2::Qt::formatDateTime()}{Qt.formatDateTime()}. +\l{QtQml::Qt::formatTime()}{Qt.formatTime()} and \l{QtQml::Qt::formatDateTime()}{Qt.formatDateTime()}. Note that when converting historical times to and from javascript that QDateTime and the JS Date object have different methods of calculating historical daylight savings time application. This can lead to variations of one hour @@ -154,7 +154,7 @@ To create a \c point value, specify it as a "x,y" string: CustomObject { myPointProperty: "0,20" } \endqml -Or use the \l{QtQml2::Qt::point()}{Qt.point()} function: +Or use the \l{QtQml::Qt::point()}{Qt.point()} function: \qml CustomObject { myPointProperty: Qt.point(0, 20) } @@ -192,7 +192,7 @@ To create a \c size value, specify it as a "width x height" string: Image { sourceSize: "150x50" } \endqml -Or use the \l{QtQml2::Qt::size()}{Qt.size()} function: +Or use the \l{QtQml::Qt::size()}{Qt.size()} function: \qml Image { sourceSize: Qt.size(150, 50) } @@ -232,7 +232,7 @@ To create a \c rect value, specify it as a "x, y, width x height" string: CustomObject { myRectProperty: "50,50,100x100" } \endqml -Or use the \l{QtQml2::Qt::rect()}{Qt.rect()} function: +Or use the \l{QtQml::Qt::rect()}{Qt.rect()} function: \qml CustomObject { myRectProperty: Qt.rect(50, 50, 100, 100) } |