diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 09:16:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 09:16:29 (GMT) |
| commit | 0f3fd01523081656c27ebb7b495c4f1a1c927117 (patch) | |
| tree | 8f02caf1d949a8159a985515435fd1159c0792ac /doc | |
| parent | e56ae7fb7b269afe36a3bd2f4de0c10f8c2a6924 (diff) | |
| parent | 9b06c2dd119f3c4442f7b26756728bb9c7fefb4a (diff) | |
| download | Qt-0f3fd01523081656c27ebb7b495c4f1a1c927117.zip Qt-0f3fd01523081656c27ebb7b495c4f1a1c927117.tar.gz Qt-0f3fd01523081656c27ebb7b495c4f1a1c927117.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: (43 commits)
clearFocus() before setParentItem(0) on an item with focus.
Remove expect fail from ListView currentIndex test
fix QDeclarativeItem sceneEvent handling
Make the animation property of Behavior deferred.
Particles optimization and doc fixes.
Add Flipable example.
Fix Qt.tint() algorithm
Disallow upper case property, signal and method names in QML
Remove expected warning
Use a better method for installing declarative demos.
Fixed declarative examples not being installed.
Remove code dupliation in fixupX/Y(), flickX/Y()
Add PathView.isCurrentIndex and PathView.view attached properties
Stop benchmark from crashing.
Optimize Rectangle, Image, and Text creation.
Make compile following QDeclarativeMetaProperty renaming
Fixed declarative demos not being installed.
Make test compile
optimize dynamic call-by-name away
Add support for QtScript connect/disconnect syntax in QML
...
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 |