Fix tst_qqmlecmascript::functionAssignment_fromJS

Make the test-case compile with strict mode, where function declarations
are not allowed within blocks. An alternative would be to use function
expressions here.

Change-Id: If7e1cc23ef4a0c6a83e4ba8ae03dc9c6b678730d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml b/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml
index 3d8fd85..943d34c 100644 (file)
--- a/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml
+++ b/tests/auto/qml/qqmlecmascript/data/functionAssignment.2.qml
@@ -19,11 +19,11 @@ MyQmlObject {
     property bool assignWrongType: false
     property bool assignWrongTypeToValueType: false
 
+    function myFunction() {
+        return aNumber * 10;
+    }
 
     onAssignToPropertyChanged: {
-        function myFunction() {
-            return aNumber * 10;
-        }
         a = Qt.binding(myFunction);
     }
 
@@ -54,17 +54,17 @@ MyQmlObject {
 
     // detecting errors:
 
+    function myEmptyFunction() {
+    }
     onAssignFuncWithoutReturnChanged: {
-        function myFunction() {
-        }
-        a = Qt.binding(myFunction);
+        a = Qt.binding(myEmptyFunction);
     }
 
+    function myStringFunction() {
+        return 'a string';
+    }
     onAssignWrongTypeChanged: {
-        function myFunction() {
-            return 'a string';
-        }
-        aNumber = Qt.binding(myFunction);
+        aNumber = Qt.binding(myStringFunction);
     }
 
     onAssignWrongTypeToValueTypeChanged: {