Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
	src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp

1 files changed, 40 insertions, 0 deletions

diff --git a/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml b/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml
new file mode 100644
index 0000000..eabba73
--- /dev/null
+++ b/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml
@@ -0,0 +1,40 @@
+import Qt 4.6
+
+Rectangle {
+    color: "blue"
+    width: 320
+    height: 240
+    id: Page
+    Rectangle {
+        id: MyRectangle
+        width: 100
+        height: 100
+        color: "red"
+        x: 10
+    }
+    states: [
+        State {
+            name: "hello"
+            PropertyChanges {
+                target: MyRectangle
+                x: 100
+            }
+            PropertyChanges {
+                target: MyMouseRegion
+                onClicked: Page.state = ''
+            }
+        }
+    ]
+    transitions: [
+        Transition {
+            NumberAnimation {
+                matchProperties: "x"
+            }
+        }
+    ]
+    MouseRegion {
+        id: MyMouseRegion
+        anchors.fill: parent
+        onClicked: { Page.state= 'hello' }
+    }
+}