diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-04-24 03:25:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-04-24 03:25:13 (GMT) |
| commit | 6ef6a8184ebb969f951a7c55127e9445eba64d35 (patch) | |
| tree | 0bb0d3e549573c3e5769896ae655e7743c78de09 /doc/src/declarative/elements.qdoc | |
| parent | ce1d3e9118494e535fb3c1b4e34d8feced7afdd1 (diff) | |
| parent | 53fd3ca280c85572d5f38e0f2809e7601578d41e (diff) | |
| download | Qt-6ef6a8184ebb969f951a7c55127e9445eba64d35.zip Qt-6ef6a8184ebb969f951a7c55127e9445eba64d35.tar.gz Qt-6ef6a8184ebb969f951a7c55127e9445eba64d35.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/declarative/elements.qdoc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 1191970..8fff472 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -32,6 +32,7 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \l SequentialAnimation \o \l ParallelAnimation \o \l SetPropertyAction +\o \l ParentChangeAction \o \l Transition \o \l Behaviour \o \l Follow @@ -67,6 +68,7 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \l MouseRegion \o \l KeyActions \o \l AnimatedImage +\o \l BlendedImage \endlist \o |