diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-30 06:06:18 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-30 06:06:18 (GMT) |
| commit | 2df6a9a02a43d88d2ddb73c08c02ad29712a8fbc (patch) | |
| tree | cea85c3e3334f80b19f420a275dbe1e5b4c6aefa /doc/src | |
| parent | ff983ee8257b79143911ca58ebedc49b1660a0c4 (diff) | |
| parent | 2661be1bacdd83d1b3e6207c519c2699edfdc1d0 (diff) | |
| download | Qt-2df6a9a02a43d88d2ddb73c08c02ad29712a8fbc.zip Qt-2df6a9a02a43d88d2ddb73c08c02ad29712a8fbc.tar.gz Qt-2df6a9a02a43d88d2ddb73c08c02ad29712a8fbc.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 | 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 |