Merge master into api_changes

Conflicts:
	src/qml/debugger/qqmlenginedebugservice.cpp
	src/qml/qml/v8/qv8qobjectwrapper.cpp
	src/quick/util/qquickimageprovider.cpp
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp

Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlqt/data/createComponent.qml b/tests/auto/qml/qqmlqt/data/createComponent.qml
index 3ebc9f14f8..01b6490419 100644
--- a/tests/auto/qml/qqmlqt/data/createComponent.qml
+++ b/tests/auto/qml/qqmlqt/data/createComponent.qml
@@ -9,6 +9,14 @@ QtObject {
     property QtObject incorectArgCount1: Qt.createComponent()
     property QtObject incorectArgCount2: Qt.createComponent("main.qml", 10)
 
+    property bool asyncResult: false
+    property var asyncComponent
+
+    function asyncStatusChanged() {
+        if (asyncComponent.status == Component.Ready)
+            asyncResult = true;
+    }
+
     Component.onCompleted: {
         emptyArg = (Qt.createComponent("") == null);
         var r = Qt.createComponent("createComponentData.qml");
@@ -16,5 +24,10 @@ QtObject {
 
         var a = Qt.createComponent("http://www.example.com/test.qml");
         absoluteUrl = a.url;
+
+        asyncComponent = Qt.createComponent("TestComponent.qml", Component.Asynchronous);
+        if (asyncComponent.status != Component.Loading)
+            return;
+        asyncComponent.statusChanged.connect(asyncStatusChanged);
     }
 }