diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-23 23:31:31 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-23 23:31:31 (GMT) |
| commit | ec7ac34b4a6b1a330460838acc74a53d29f62a7c (patch) | |
| tree | 5505189d15ce0a1f3b67f4cd65e4c39766080a1d /tests/auto/declarative/visual/animation/propertyAction | |
| parent | 8727985d81c793d52d5e24ed6815e7237ae879f1 (diff) | |
| parent | d19f691a5646725c69b232e2adde8c2f961eb571 (diff) | |
| download | Qt-ec7ac34b4a6b1a330460838acc74a53d29f62a7c.zip Qt-ec7ac34b4a6b1a330460838acc74a53d29f62a7c.tar.gz Qt-ec7ac34b4a6b1a330460838acc74a53d29f62a7c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/util/qmlanimation.cpp
src/declarative/util/qmlxmllistmodel.cpp
Diffstat (limited to 'tests/auto/declarative/visual/animation/propertyAction')
| -rw-r--r-- | tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml index 593f495..e18e770 100644 --- a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml +++ b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml @@ -28,7 +28,7 @@ Rectangle { SequentialAnimation { ColorAnimation {} PropertyAction { properties: "x" } - NumberAnimation { properties: "y"; easing: "InOutQuad" } + NumberAnimation { properties: "y"; easing.type: "InOutQuad" } } } } |