Merge remote branch 'origin/master' into bearermanagement/integration

Conflicts:
	tests/auto/qlineedit/tst_qlineedit.cpp

1 files changed, 34 insertions, 0 deletions

diff --git a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
new file mode 100644
index 0000000..b670166
--- /dev/null
+++ b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
@@ -0,0 +1,34 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Rectangle {
+        id: myRect
+        width: 100; height: 100
+        color: "red"
+    }
+    MouseRegion {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    states: State {
+        name: "state1"
+        when: clickable.pressed
+        PropertyChanges {
+            target: myRect
+            x: 50; y: 50
+            color: "blue"
+        }
+    }
+
+    transitions: Transition {
+        to: "state1"
+        reversible: true
+        SequentialAnimation {
+            ColorAnimation {}
+            PropertyAction { matchProperties: "x" }
+            NumberAnimation { matchProperties: "y"; easing: "InOutQuad" }
+        }
+    }
+}