diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-09-17 07:25:09 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-09-17 07:25:09 (GMT) |
| commit | ab1efc682631663a301d479d564d9e16bbc8984b (patch) | |
| tree | a155e87e0722799a19548ee0bd10dcbd3d9fa4e4 /doc/src | |
| parent | 41da7cecce0dec1ef7e8a74dafb1bf03292445d4 (diff) | |
| parent | 2a9bc5163553a05fee61c289d09ec2ba963911bc (diff) | |
| download | Qt-ab1efc682631663a301d479d564d9e16bbc8984b.zip Qt-ab1efc682631663a301d479d564d9e16bbc8984b.tar.gz Qt-ab1efc682631663a301d479d564d9e16bbc8984b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index ca17fda..1fe4892 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -36,7 +36,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l ParentAction \o \l ScriptAction \o \l Transition -\o \l Follow +\o \l SpringFollow \o \l EaseFollow \o \l Behavior \endlist @@ -86,7 +86,6 @@ The following table lists the QML elements provided by the Qt Declarative module \list \o \l MouseRegion \o \l FocusScope -\o \l KeyProxy \endlist \o |