diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-30 14:10:37 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-30 14:10:37 (GMT) |
| commit | af0185c11da338c9907ee7ac33266fb474680358 (patch) | |
| tree | 30c7e854a2f975a5e73ee2c27e8fab90b15eb3f6 /doc | |
| parent | 3becb116bbbd9f87764cebe6813a254abc291c04 (diff) | |
| parent | 1441db525dd0f5a3b2f45549cfa4173adac1a877 (diff) | |
| download | Qt-af0185c11da338c9907ee7ac33266fb474680358.zip Qt-af0185c11da338c9907ee7ac33266fb474680358.tar.gz Qt-af0185c11da338c9907ee7ac33266fb474680358.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 8091f95..fcfc7d6 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -77,11 +77,11 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l PauseAnimation \o \l ParentAnimation \o \l AnchorAnimation +\o \l SmoothedAnimation \o \l PropertyAction \o \l ScriptAction \o \l Transition \o \l SpringFollow -\o \l EaseFollow \o \l Behavior \endlist |