Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

Conflicts:
	src/declarative/qml/qdeclarativeproperty.cpp

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativestates/data/reset.qml b/tests/auto/declarative/qdeclarativestates/data/reset.qml
new file mode 100644
index 0000000..a0a2b8c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/reset.qml
@@ -0,0 +1,20 @@
+import Qt 4.6
+
+Rectangle {
+    width: 640
+    height: 480
+    Text {
+        id: theText
+        width: 50
+        wrap: true
+        text: "a text string that is longer than 50 pixels"
+    }
+
+    states: State {
+        name: "state1"
+        PropertyChanges {
+            target: theText
+            width: undefined
+        }
+    }
+}