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: (144 commits)
  Don't crash if Connections::target is changed by one of its signal handlers
  Update visual tests after some painter updates.
  Add missing Q_DISABLE_COPYs.
  Use Q_DECLARE_PRIVATE for private slot.
  Workaround no longer needed.
  Rename QDeclarativeExpression::value() to evaluate().
  Continue to register base type.
  Doc.
  Remove the deprecated wrap property.
  Do not treat images in qml examples differently.
  Replace Flickable overshoot property with boundsBehavior
  Autotests and doc
  Give error on attempt to import types from too-early version number.
  Remove (undocumented) QML bindings for effects.
  De-straighten them lines.
  Doc: fix QStringList model doc (really).
  Doc: fix QStringList model docs
  Change return type to match value().
  Add duration and easing properties to AnchorAnimation.
  Autotest
  ...

1 files changed, 3 insertions, 9 deletions

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml
index fa90918..5681907 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml
@@ -1,22 +1,16 @@
 import Qt.test 1.0
-import Qt 4.6
+import Qt 4.7
+import "scriptConnect.2.js" as Script
 
 MyQmlObject { 
     property bool test: false
 
     id: root
     
-    Script {
-        function testFunction() {
-            if (this.b == 12)
-                test = true;
-        }
-    }
-
     Component.onCompleted: {
         var a = new Object;
         a.b = 12;
-        root.argumentSignal.connect(a, testFunction);
+        root.argumentSignal.connect(a, Script.testFunction);
     }
 }