diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 06:50:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 06:50:48 (GMT) |
| commit | 3ac354b885dcaf7186cf8bafdfc2bdc0c6d8dbd0 (patch) | |
| tree | 2e7decae370a45b8c9123a2b48b47e3bb0ca232d /doc/src | |
| parent | c4f59859a589b76419e9133110eda850223f03dd (diff) | |
| parent | b9b305f6c7bc960101bfd883ca6e3df889483481 (diff) | |
| download | Qt-3ac354b885dcaf7186cf8bafdfc2bdc0c6d8dbd0.zip Qt-3ac354b885dcaf7186cf8bafdfc2bdc0c6d8dbd0.tar.gz Qt-3ac354b885dcaf7186cf8bafdfc2bdc0c6d8dbd0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Correctly construct boolean JSValue's
Update QmlChanges for SmoothedAnimation
WorkerScript was receiving events after deletion and trying to process
Make qmlpixmapcache thread shutdown cleaner
Make visual tests run on windows
Fixes PathView compile warnings
Finished file rename of qdeclarative easefollow to smoothedanimation
Change and rename qml EaseFollow to SmoothedAnimation
Fix parenting after 6f88388db4e8e202780d789e66664ff824691948.
Fix viewer resizing on reload and File->open
Don't emit onPositionChanged before onPressed
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 |