diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 00:34:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 00:34:21 +0100 |
| commit | 0076c44d3993f377ad6417d3bb08109b608dfbd2 (patch) | |
| tree | 498a1f3d0997da8e3959e6a1d47071d56a6ce900 /src/qml/doc | |
| parent | 5f0eab2df3c82a71f70ea5a6535541fa786c6a78 (diff) | |
| parent | 9aed949bb99b9bf328322457a02ad1a9fb330f2d (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quick/util/qquickutilmodule.cpp
tools/qmllint/main.cpp
Change-Id: Ic2283f88c293ca7fc776de3e83eb4c7812309d8a
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/qmltypereference.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc index f32574fcc1..b2bb9ebd18 100644 --- a/src/qml/doc/src/qmltypereference.qdoc +++ b/src/qml/doc/src/qmltypereference.qdoc @@ -89,7 +89,7 @@ provided: \ingroup qtquickbasictypes \brief a date value. -The \c date type refers to a date value. +The \c date type refers to a date value, including the time of the day. To create a \c date value, specify it as a "YYYY-MM-DD" string: @@ -100,7 +100,7 @@ MyDatePicker { minDate: "2000-01-01"; maxDate: "2020-12-31" } To read a date value returned from a C++ extension class, use \l{QtQml::Qt::formatDate()}{Qt.formatDate()} and \l{QtQml::Qt::formatDateTime()}{Qt.formatDateTime()}. -When integrating with C++, note that any QDate value +When integrating with C++, note that any QDate or QDateTime value \l{qtqml-cppintegration-data.html}{passed into QML from C++} is automatically converted into a \c date value, and vice-versa. |