diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-07 04:24:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-07 04:24:44 (GMT) |
| commit | 9bc81769eb6ebc9bd62fe3c1d86e67ddccbed8b6 (patch) | |
| tree | dff935d34574a362415c61c5000d019113ee08ec /doc | |
| parent | e56ae7fb7b269afe36a3bd2f4de0c10f8c2a6924 (diff) | |
| parent | 89e22c539702fbac311b3626e9407e2693579e72 (diff) | |
| download | Qt-9bc81769eb6ebc9bd62fe3c1d86e67ddccbed8b6.zip Qt-9bc81769eb6ebc9bd62fe3c1d86e67ddccbed8b6.tar.gz Qt-9bc81769eb6ebc9bd62fe3c1d86e67ddccbed8b6.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: (25 commits)
optimize dynamic call-by-name away
Add support for QtScript connect/disconnect syntax in QML
Minor perf improvement when running QML script blocks
Fix qdeclarative{audio,video} tests.
Don't assume documents are in UTF-8.
Add basic support for explicit newParent in ParentAnimation.
Delete uninspiring example.
Fix compiler warning on RVCT
Use new enum syntax for value types.
Expect fail in currentIndex test for now.
Allow unquoted enum syntax for value types
More declarative examples cleanup.
Improve declarative tabs example.
Fix test leaks
Use _data() for some tests
Add missing NOTIFYs to timer, xmllistmodel, xmlrole
Document new ParentChange properties.
declarative examples cleanup
Fix test
Update QmlChanges.txt
...
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 6cca39b..67aadcf 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -71,9 +71,11 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l PropertyAnimation \o \l NumberAnimation \o \l ColorAnimation +\o \l RotationAnimation \o \l SequentialAnimation \o \l ParallelAnimation \o \l PauseAnimation +\o \l ParentAnimation \o \l PropertyAction \o \l ParentAction \o \l ScriptAction @@ -92,8 +94,6 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l Package \o \l XmlListModel and XmlRole \o \l WorkerListModel -\o \l DateTimeFormatter -\o \l NumberFormatter \endlist \o |