diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2013-07-19 11:15:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-23 13:43:51 +0200 |
| commit | 7fddd1c5696bb8043bc7df7df2ba233ce65c1254 (patch) | |
| tree | 5ff62a9b86c0f5588fb8c100a071971b7691c962 /src/qml/doc | |
| parent | e443c7ba5552e5c88c331b370cc7a338d8672494 (diff) | |
Link between "QML Basic Type: date" and QML Date object documentation.
The basic date type seems useless if you don't know it can be used as
as JavaScript date (with QML extensions).
Task-number: QTBUG-32492
Change-Id: I14962f4e57522f5515f0e78d484aa59fcd9dff3c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/external-resources.qdoc | 4 | ||||
| -rw-r--r-- | src/qml/doc/src/javascript/date.qdoc | 3 | ||||
| -rw-r--r-- | src/qml/doc/src/qmltypereference.qdoc | 10 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/qml/doc/src/external-resources.qdoc b/src/qml/doc/src/external-resources.qdoc index 0832564660..671246d7ab 100644 --- a/src/qml/doc/src/external-resources.qdoc +++ b/src/qml/doc/src/external-resources.qdoc @@ -35,3 +35,7 @@ \title W3Schools JavaScript Reference */ +/*! + \externalpage https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date + \title Mozilla Developer Network Date Reference +*/
\ No newline at end of file diff --git a/src/qml/doc/src/javascript/date.qdoc b/src/qml/doc/src/javascript/date.qdoc index 7da24d4092..085d988377 100644 --- a/src/qml/doc/src/javascript/date.qdoc +++ b/src/qml/doc/src/javascript/date.qdoc @@ -30,7 +30,8 @@ \inqmlmodule QtQml 2 \brief Provides date functions - The QML Date object extends the JS Date object with + The QML Date object extends the + \l{Mozilla Developer Network Date Reference}{JS Date object} with locale aware functions. Functions that accept a locale format may be either an enumeration diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc index 3def3209cc..0b363d424e 100644 --- a/src/qml/doc/src/qmltypereference.qdoc +++ b/src/qml/doc/src/qmltypereference.qdoc @@ -104,14 +104,10 @@ 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. -Note that the date type has comparison semantics which match -those of the JavaScript Date object. To compare the value -of two date properties, you should compare their "toString()" -values. +This basic type is provided by the QML language. It can be implicitly converted +to a \l{QtQml2::Date}{Date} object. -This basic type is provided by the QML language. - -\sa {QML Basic Types} +\sa {QtQml2::Date}{QML Date object}, {QML Basic Types} */ /*! |