diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-26 04:58:10 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-26 04:58:10 (GMT) |
| commit | 13086523d7181d5628872c74030b460e5f7388a5 (patch) | |
| tree | f5b3317c138fb18d47d8b2e0060bc4a8512da1a1 /doc/src/declarative/elements.qdoc | |
| parent | 3c45c081ce33f05ae200d252ebb5e9e1484bcc6d (diff) | |
| parent | 40a59d973c324e45954481f608e1bfc2b9579300 (diff) | |
| download | Qt-13086523d7181d5628872c74030b460e5f7388a5.zip Qt-13086523d7181d5628872c74030b460e5f7388a5.tar.gz Qt-13086523d7181d5628872c74030b460e5f7388a5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/states/states.qml
examples/declarative/states/transitions.qml
examples/declarative/tutorials/helloworld/t3/tutorial3.qml
src/declarative/util/qmlanimation.cpp
Diffstat (limited to 'doc/src/declarative/elements.qdoc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index d078da0..9edb087 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -25,9 +25,9 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \list -\o \l NumericAnimation +\o \l PropertyAnimation +\o \l NumberAnimation \o \l ColorAnimation -\o \l VariantAnimation \o \l PauseAnimation \o \l SequentialAnimation \o \l ParallelAnimation |