diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 05:03:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 05:03:07 (GMT) |
| commit | 29a6377c6539840ca901bdcb045a42b7832ac98a (patch) | |
| tree | a4eace12b0263723f5c76ca660a1747f8b5e3a28 /src/declarative/qml/qdeclarativeengine.cpp | |
| parent | 5929062996c9d0d90f19198064953a0086be7741 (diff) | |
| parent | 6c7ed006b0a1f006e11fd5f78dd996d65114fc98 (diff) | |
| download | Qt-29a6377c6539840ca901bdcb045a42b7832ac98a.zip Qt-29a6377c6539840ca901bdcb045a42b7832ac98a.tar.gz Qt-29a6377c6539840ca901bdcb045a42b7832ac98a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Document that animations have to be started/stopped as a group
various doc fixes
Document 'this' as undefined in QML
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index e3ebca3..e313c97 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -228,7 +228,7 @@ There are also string based constructors for these types. See \l{qdeclarativebas \section1 Date/Time Formatters -The Qt object contains several functions for formatting dates and times. +The Qt object contains several functions for formatting QDateTime, QDate and QTime values. \list \o \l{QML:Qt::formatDateTime}{string Qt.formatDateTime(datetime date, variant format)} |