diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-11 03:05:39 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-11 03:05:39 (GMT) |
| commit | 16b28550f03ec69cee8481d93c3ba2c8830e53f5 (patch) | |
| tree | 0cbad134d25e137fb424590365eefe4e44a836ac /doc | |
| parent | 09dc1b3386eb60d7d9f2d644fe114c1daa595049 (diff) | |
| parent | 14fd2f8cd7ffb0092fbcad24724851122fcfdbd7 (diff) | |
| download | Qt-16b28550f03ec69cee8481d93c3ba2c8830e53f5.zip Qt-16b28550f03ec69cee8481d93c3ba2c8830e53f5.tar.gz Qt-16b28550f03ec69cee8481d93c3ba2c8830e53f5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 67aadcf..0d7fe3b 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -76,6 +76,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l ParallelAnimation \o \l PauseAnimation \o \l ParentAnimation +\o \l AnchorAnimation \o \l PropertyAction \o \l ParentAction \o \l ScriptAction |