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

Conflicts:
	tests/auto/qlineedit/tst_qlineedit.cpp

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmlanimations/data/dotproperty.qml b/tests/auto/declarative/qmlanimations/data/dotproperty.qml
new file mode 100644
index 0000000..369491f
--- /dev/null
+++ b/tests/auto/declarative/qmlanimations/data/dotproperty.qml
@@ -0,0 +1,24 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 240
+    height: 320
+    Rectangle {
+        id: myRect
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        MouseRegion {
+            anchors.fill: parent
+            onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
+        }
+    }
+    states: State {
+        name: "state1"
+        PropertyChanges { target: myRect; border.color: "blue" }
+    }
+    transitions: Transition {
+        ColorAnimation { matchProperties: "border.color"; duration: 1000 }
+    }
+}