diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-17 06:37:15 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-17 06:37:15 (GMT) |
| commit | 2f9017c7736b3f8db721f6605e6131ab376cb864 (patch) | |
| tree | e2a5c7fdacdc19e2ebddcb6dcf628255d81d78f2 /doc/src | |
| parent | 0c2e40683007c9405b8fc9f7efbd728ef519d78f (diff) | |
| parent | 8caff8b4be02a2f28c9a2a50d3b5ef274138021e (diff) | |
| download | Qt-2f9017c7736b3f8db721f6605e6131ab376cb864.zip Qt-2f9017c7736b3f8db721f6605e6131ab376cb864.tar.gz Qt-2f9017c7736b3f8db721f6605e6131ab376cb864.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 |