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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (119 commits)
  Add Mac OS X bundle description for qml runtime
  Cleanup
  Disallow writes to read-only value type properties
  Allow undefined to be assigned to QVariant properties
  Add a Qt.isQtObject() method
  Fix crash in QML library imports
  Remove QT_VERSION checks in QML
  List properties aren't read-only
  Small doc fix.
  Make sure WorkerScript thread is stopped on deletion. This also fixes
  Release ListModel's worker agent on deletion.
  Doc fixes
  Fix example
  Example code style improvements
  Enable other wrapping modes.
  TextEdit::wrap changed to TextEdit::wrapMode enumeration
  Remove use of obsolete "Script" element.
  unwarn
  Replace "var" with "variant" in tests
  Fix test after deletion of GraphicsObjectContainer.
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
index dc3b382..df8c851 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
@@ -2,7 +2,7 @@ import Test 1.0
 import Qt 4.6
 
 QtObject {
-    property var child
+    property variant child
     child: QtObject { id: obj }
     property alias objAlias: obj;
 }