diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-08 11:50:37 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-08 11:50:37 (GMT) |
| commit | a4cb272647cc01b545cc464c85b12aea903146df (patch) | |
| tree | 924b336b7281d082403dd2637d04d3d14a5bef04 /doc/src | |
| parent | f471b125c04a559c6e76bb69b2875bddf01ed2f6 (diff) | |
| parent | 7695e48ed3ff7e2e1157bcdcb27188532dc75d20 (diff) | |
| download | Qt-a4cb272647cc01b545cc464c85b12aea903146df.zip Qt-a4cb272647cc01b545cc464c85b12aea903146df.tar.gz Qt-a4cb272647cc01b545cc464c85b12aea903146df.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 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 |