Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (681 commits)
  Be consistent in conversion from string (eg. color, int rounding).
  Simplify code to make next change clearer.
  Stop warnings.
  Improve error messages when tests fail.
  Stop highlight animators for highlightFollowsCurrentItem: false
  Ensure valuetype enums can be assigned from JS
  Improve testcase
  Rename Component::errorsString() -> errorString() (and also for
  Fixes for docs, example code
  Make test more stable
  Autotest (XFAIL) for QTBUG-10822
  Add return value for resolveTypeInNamespace
  Fix test
  Fix test. Missed files.
  Missing break
  Create overview page for examples for Extending QML in C++
  Added default countries for Mongolian and Nepali.
  Updated tst_qlocale autotest.
  Updated the 4.7.0 change log with my changes.
  Freetype is not used on symbian, don't use it.
  ...

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml
new file mode 100644
index 0000000..2215ee4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml
@@ -0,0 +1,24 @@
+import Qt 4.7
+
+Rectangle {
+    id: myRect
+    width: 400
+    height: 400
+
+    states: [
+        State {
+            name: "state1"
+            PropertyChanges {
+                target: myRect
+                onHeightChanged: console.log("Hello World")
+                color: "green"
+            }
+        },
+        State {
+            name: "state2"; extend: "state1"
+            PropertyChanges {
+                target: myRect
+                color: "red"
+        }
+    }]
+}