Merge branch '4.7' into qmldocs

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml b/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml
new file mode 100644
index 0000000..e9dc36e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml
@@ -0,0 +1,30 @@
+import Qt 4.7
+
+Rectangle {
+    id: root
+    width: 200
+    height: 200
+
+    Rectangle {
+        id: mover
+        objectName: "mover"
+    }
+
+    states: [
+        State {
+            name: "free"
+        },
+        State {
+            name: "left"
+            PropertyChanges {
+                restoreEntryValues: false
+                target: mover
+                x: 0
+            }
+        }
+    ]
+
+    transitions: Transition {
+        PropertyAnimation { properties: "x"; duration: 50 }
+    }
+}