Merge commit 'qt/4.7' into 4.7

Conflicts:
	tests/benchmarks/declarative/binding/binding.pro
	tests/benchmarks/declarative/creation/creation.pro
	tests/benchmarks/declarative/creation/tst_creation.cpp
	tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
	tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
	tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js
new file mode 100644
index 0000000..e6a4676
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js
@@ -0,0 +1,26 @@
+var myvar = 10;
+
+function go()
+{
+    var a = Qt.include("http://127.0.0.1:8111/remote_file.js", 
+                       function(o) { 
+                            test2 = o.status == o.OK
+                            test3 = a.status == a.OK
+                            test4 = myvar == 13
+
+                            done = true;
+                       });
+    test1 = a.status == a.LOADING
+
+
+    var b = Qt.include("http://127.0.0.1:8111/exception.js", 
+                       function(o) { 
+                            test7 = o.status == o.EXCEPTION
+                            test8 = b.status == a.EXCEPTION
+                            test9 = b.exception.toString() == "Whoops!";
+                            test10 = o.exception.toString() == "Whoops!";
+
+                            done2 = true;
+                       });
+    test6 = b.status == b.LOADING
+}