Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

8 files changed, 91 insertions, 4 deletions

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
index 72b59ae..2337e44 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
@@ -19,7 +19,7 @@ QtObject {
 
         myObject.deleteOnSet = 1;
 
-        test3 = myObject.value == undefined;
-        test4 = obj.value == undefined;
+        test3 = myObject == null
+        test4 = obj == null
     }
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
index 3047e9b..7b132e1 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
@@ -11,7 +11,7 @@ MyQmlObject{
     function createTwo()
     {
         var component = Qt.createComponent('dynamicCreation.helper.qml');
-        obj.objectProperty = component.createObject();
+        obj.objectProperty = component.createObject(obj);
     }
 
     function createThree()
@@ -22,6 +22,6 @@ MyQmlObject{
     function dontCrash()
     {
         var component = Qt.createComponent('file-doesnt-exist.qml');
-        obj.objectProperty = component.createObject();
+        obj.objectProperty = component.createObject(obj);
     }
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml b/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml
new file mode 100644
index 0000000..bc2df98
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/eval.qml
@@ -0,0 +1,23 @@
+import Qt 4.7
+
+QtObject {
+    property bool test1: false;        
+    property bool test2: false;        
+    property bool test3: false;        
+    property bool test4: false;        
+    property bool test5: false;        
+
+
+    property int a: 7
+    property int b: 8
+
+    Component.onCompleted: {
+        var b = 9;
+
+        test1 = (eval("a") == 7);
+        test2 = (eval("b") == 9);
+        test3 = (eval("c") == undefined);
+        test4 = (eval("console") == console);
+        test5 = (eval("Qt") == Qt);
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/function.qml b/tests/auto/declarative/qdeclarativeecmascript/data/function.qml
new file mode 100644
index 0000000..b435f58
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/function.qml
@@ -0,0 +1,19 @@
+import Qt 4.7
+
+QtObject {
+    property bool test1: false;
+    property bool test2: false;
+    property bool test3: false;
+
+    Component.onCompleted: {
+        var a = 10;
+
+        var func1 = new Function("a", "return a + 7");
+        var func2 = new Function("a", "return Qt.atob(a)");
+        var func3 = new Function("return a");
+
+        test1 = (func1(4) == 11);
+        test2 = (func2("Hello World!") == Qt.atob("Hello World!"));
+        test3 = (func3() == undefined);
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.1.qml
new file mode 100644
index 0000000..09540f1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.1.qml
@@ -0,0 +1,5 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property variant a: function myFunction() { return 2; }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml
new file mode 100644
index 0000000..948b39c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml
@@ -0,0 +1,13 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property variant a
+    property bool runTest: false
+    onRunTestChanged: {
+        function myFunction() {
+            console.log("hello world");
+        }
+        a = myFunction;
+    }
+
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml
new file mode 100644
index 0000000..b6d31d5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml
@@ -0,0 +1,13 @@
+import Qt 4.7
+
+QtObject {
+    id: root
+    property QtObject object: QtObject {
+        id: nested
+        property QtObject nestedObject
+    }
+
+    Component.onCompleted: {
+        nested.nestedObject = root;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml
new file mode 100644
index 0000000..a36b4c0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml
@@ -0,0 +1,14 @@
+import Qt 4.7
+
+QtObject {
+    id: root
+
+    property variant a: 10
+    property int x: 10
+    property int test: a.x
+
+    Component.onCompleted: {
+        a = 11;
+        a = root;
+    }
+}