diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-05 06:16:04 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-05 06:16:04 (GMT) |
| commit | fb5e2e78746965d2c73ab8d757662573b4312fb7 (patch) | |
| tree | ff2c31c95318fb9e86359b4a447b38c70a683598 /doc/src | |
| parent | 769a11719ca85e9cdac4c0f1d0fcffe6145d6972 (diff) | |
| parent | cb486319b599eccbc40166d0b3d057d11d92759c (diff) | |
| download | Qt-fb5e2e78746965d2c73ab8d757662573b4312fb7.zip Qt-fb5e2e78746965d2c73ab8d757662573b4312fb7.tar.gz Qt-fb5e2e78746965d2c73ab8d757662573b4312fb7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src')
| -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 |