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

4 files changed, 752 insertions, 6 deletions

diff --git a/tests/auto/quick/qquickloader/data/TestComponent.2.qml b/tests/auto/quick/qquickloader/data/TestComponent.2.qml
new file mode 100644
index 0000000000..d6e99028b5
--- /dev/null
+++ b/tests/auto/quick/qquickloader/data/TestComponent.2.qml
@@ -0,0 +1,592 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+    objectName: "root"
+    property int zero: 0
+
+    Item {
+        id: c1
+        objectName: "c1"
+        property int one: zero + 1
+
+        Item {
+            id: c1c1
+            objectName: "c1c1"
+            property bool two: c2c1c1.two
+        }
+
+        Item {
+            id: c1c2
+            objectName: "c1c2"
+            property string three: "three"
+
+            Rectangle {
+                id: c1c2c3
+                objectName: "c1c2c3"
+                property alias othercolor: c2c1.color
+                color: if (c2c1.color == Qt.rgba(0,0,1)) Qt.rgba(1,0,0); else Qt.rgba(0,1,0);
+            }
+        }
+    }
+
+    Item {
+        id: c2
+        objectName: "c2"
+        property string two: "two"
+
+        Rectangle {
+            id: c2c1
+            objectName: "c2c1"
+            property string three: "2" + c1c2.three
+            color: "blue"
+
+            MouseArea {
+                id: c2c1c1
+                objectName: "c2c1c1"
+                property bool two: false
+                onClicked: two = !two
+            }
+
+            Item {
+                id: c2c1c2
+                objectName: "c2c1c2"
+                property string three: "1" + parent.three
+            }
+        }
+    }
+
+    Item {
+        id: c3
+        objectName: "c3"
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+        Item {}
+    }
+
+    property alias c1one: c1.one
+    property bool success: true
+    Component.onCompleted: {
+        // test state after initial bindings evaluation
+        if (zero != 0) success = false;
+        if (c1.one != 1) success = false;
+        if (c1c1.two != false) success = false;
+        if (c1c2.three != "three") success = false;
+        if (c1c2c3.color != Qt.rgba(1,0,0)) success = false;
+        if (c2.two != "two") success = false;
+        if (c2c1.three != "2three") success = false;
+        if (c2c1.color != Qt.rgba(0,0,1)) success = false;
+        if (c2c1c1.two != false) success = false;
+        if (c2c1c2.three != "12three") success = false;
+        if (c3.children.length != 500) success = false;
+
+        // now retrigger bindings evaluation
+        root.zero = 5;
+        if (c1.one != 6) success = false;
+        c2c1c1.two = true;
+        if (c1c1.two != true) success = false;
+        c1c2.three = "3";
+        if (c2c1.three != "23") success = false;
+        if (c2c1c2.three != "123") success = false;
+        c2c1.color = Qt.rgba(1,0,0);
+        if (c1c2c3.color != Qt.rgba(0,1,0)) success = false;
+        if (c1c2c3.othercolor != Qt.rgba(1,0,0)) success = false;
+    }
+}
diff --git a/tests/auto/quick/qquickloader/data/TestComponent.qml b/tests/auto/quick/qquickloader/data/TestComponent.qml
new file mode 100644
index 0000000000..81ea07cb88
--- /dev/null
+++ b/tests/auto/quick/qquickloader/data/TestComponent.qml
@@ -0,0 +1,89 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+    objectName: "root"
+    property int zero: 0
+    property int one: 1
+
+    Item {
+        id: c1
+        objectName: "c1"
+        property int one: zero + parent.one
+
+        Item {
+            id: c1c1
+            objectName: "c1c1"
+            property bool two: c2c1c1.two
+        }
+
+        Item {
+            id: c1c2
+            objectName: "c1c2"
+            property string three: "three"
+
+            Rectangle {
+                id: c1c2c3
+                objectName: "c1c2c3"
+                property alias othercolor: c2c1.color
+                color: if (c2c1.color == Qt.rgba(0,0,1)) Qt.rgba(1,0,0); else Qt.rgba(0,1,0);
+            }
+        }
+    }
+
+    Item {
+        id: c2
+        objectName: "c2"
+        property string two: "two"
+
+        Rectangle {
+            id: c2c1
+            objectName: "c2c1"
+            property string three: "2" + c1c2.three
+            color: "blue"
+
+            MouseArea {
+                id: c2c1c1
+                objectName: "c2c1c1"
+                property bool two: false
+                onClicked: two = !two
+            }
+
+            Item {
+                id: c2c1c2
+                objectName: "c2c1c2"
+                property string three: "1" + parent.three
+            }
+        }
+    }
+
+    property alias c1one: c1.one
+    property bool success: true
+    Component.onCompleted: {
+        // test state after initial bindings evaluation
+        if (zero != 0) success = false;
+        if (c1.one != 1) success = false;
+        if (c1c1.two != false) success = false;
+        if (c1c2.three != "three") success = false;
+        if (c1c2c3.color != Qt.rgba(1,0,0)) success = false;
+        if (c2.two != "two") success = false;
+        if (c2c1.three != "2three") success = false;
+        if (c2c1.color != Qt.rgba(0,0,1)) success = false;
+        if (c2c1c1.two != false) success = false;
+        if (c2c1c2.three != "12three") success = false;
+
+        // now retrigger bindings evaluation
+        root.zero = 5;
+        if (c1.one != 6) success = false;
+        root.one = 50;
+        if (c1.one != 55) success = false;
+        c2c1c1.two = true;
+        if (c1c1.two != true) success = false;
+        c1c2.three = "3";
+        if (c2c1.three != "23") success = false;
+        if (c2c1c2.three != "123") success = false;
+        c2c1.color = Qt.rgba(1,0,0);
+        if (c1c2c3.color != Qt.rgba(0,1,0)) success = false;
+        if (c1c2c3.othercolor != Qt.rgba(1,0,0)) success = false;
+    }
+}
diff --git a/tests/auto/quick/qquickloader/data/simultaneous.qml b/tests/auto/quick/qquickloader/data/simultaneous.qml
new file mode 100644
index 0000000000..cab6498863
--- /dev/null
+++ b/tests/auto/quick/qquickloader/data/simultaneous.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 400; height: 400
+
+    function loadComponents() {
+        asyncLoader.source = "TestComponent.2.qml"
+        syncLoader.source = "TestComponent.qml"
+    }
+
+    Loader {
+        id: asyncLoader
+        objectName: "asyncLoader"
+        asynchronous: true
+    }
+
+    Loader {
+        id: syncLoader
+        objectName: "syncLoader"
+        asynchronous: false
+    }
+}
diff --git a/tests/auto/quick/qquickloader/tst_qquickloader.cpp b/tests/auto/quick/qquickloader/tst_qquickloader.cpp
index 77d0c29220..bdf47fa9e9 100644
--- a/tests/auto/quick/qquickloader/tst_qquickloader.cpp
+++ b/tests/auto/quick/qquickloader/tst_qquickloader.cpp
@@ -56,13 +56,21 @@ class PeriodicIncubationController : public QObject,
 {
 public:
     PeriodicIncubationController() {
+        incubated = false;
         startTimer(16);
     }
 
+    bool incubated;
+
 protected:
     virtual void timerEvent(QTimerEvent *) {
         incubateFor(15);
     }
+
+    virtual void incubatingObjectCountChanged(int count) {
+        if (count)
+            incubated = true;
+    }
 };
 
 class tst_QQuickLoader : public QQmlDataTest
@@ -102,6 +110,7 @@ private slots:
     void asynchronous_data();
     void asynchronous();
     void asynchronous_clear();
+    void simultaneousSyncAsync();
 
     void parented();
     void sizeBound();
@@ -481,7 +490,7 @@ void tst_QQuickLoader::failNetworkRequest()
     QTRY_VERIFY(loader->status() == QQuickLoader::Error);
 
     QVERIFY(loader->item() == 0);
-    QCOMPARE(loader->progress(), 0.0);
+    QCOMPARE(loader->progress(), 1.0);
     QCOMPARE(loader->property("did_load").toInt(), 123);
     QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 0);
 
@@ -644,7 +653,7 @@ void tst_QQuickLoader::initialPropertyValues_data()
             << (QVariantList() << 2 << 0);
 
     QTest::newRow("set source with initial property values specified, active = false") << testFileUrl("initialPropertyValues.3.qml")
-            << (QStringList() << QString(QLatin1String("file://") + testFileUrl("initialPropertyValues.3.qml").toLocalFile() + QLatin1String(":16: TypeError: Cannot read property 'canary' of null")))
+            << (QStringList() << QString(testFileUrl("initialPropertyValues.3.qml").toString() + QLatin1String(":16: TypeError: Cannot read property 'canary' of null")))
             << (QStringList())
             << (QVariantList());
 
@@ -856,7 +865,7 @@ void tst_QQuickLoader::asynchronous_data()
     QTest::newRow("Valid component") << testFileUrl("BigComponent.qml")
             << QStringList();
 
-    QTest::newRow("Non-existant component") << testFileUrl("IDoNotExist.qml")
+    QTest::newRow("Non-existent component") << testFileUrl("IDoNotExist.qml")
             << (QStringList() << QString(testFileUrl("IDoNotExist.qml").toString() + ": File not found"));
 
     QTest::newRow("Invalid component") << testFileUrl("InvalidSourceComponent.qml")
@@ -870,6 +879,8 @@ void tst_QQuickLoader::asynchronous()
 
     if (!engine.incubationController())
         engine.setIncubationController(new PeriodicIncubationController);
+    PeriodicIncubationController *controller = static_cast<PeriodicIncubationController*>(engine.incubationController());
+    controller->incubated = false;
     QQmlComponent component(&engine, testFileUrl("asynchronous.qml"));
     QQuickItem *root = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(root);
@@ -881,19 +892,20 @@ void tst_QQuickLoader::asynchronous()
         QTest::ignoreMessage(QtWarningMsg, warning.toUtf8().constData());
 
     QVERIFY(!loader->item());
+    QCOMPARE(loader->progress(), 0.0);
     root->setProperty("comp", qmlFile.toString());
     QMetaObject::invokeMethod(root, "loadComponent");
     QVERIFY(!loader->item());
 
     if (expectedWarnings.isEmpty()) {
         QCOMPARE(loader->status(), QQuickLoader::Loading);
-        QCOMPARE(engine.incubationController()->incubatingObjectCount(), 1);
-
+        QVERIFY(!controller->incubated); // asynchronous compilation means not immediately compiled/incubating.
+        QTRY_VERIFY(controller->incubated); // but should start incubating once compilation is complete.
         QTRY_VERIFY(loader->item());
         QCOMPARE(loader->progress(), 1.0);
         QCOMPARE(loader->status(), QQuickLoader::Ready);
     } else {
-        QCOMPARE(loader->progress(), 1.0);
+        QTRY_COMPARE(loader->progress(), 1.0);
         QTRY_COMPARE(loader->status(), QQuickLoader::Error);
     }
 
@@ -943,6 +955,37 @@ void tst_QQuickLoader::asynchronous_clear()
     QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 1);
 }
 
+void tst_QQuickLoader::simultaneousSyncAsync()
+{
+    if (!engine.incubationController())
+        engine.setIncubationController(new PeriodicIncubationController);
+    PeriodicIncubationController *controller = static_cast<PeriodicIncubationController*>(engine.incubationController());
+    controller->incubated = false;
+    QQmlComponent component(&engine, testFileUrl("simultaneous.qml"));
+    QQuickItem *root = qobject_cast<QQuickItem*>(component.create());
+    QVERIFY(root);
+
+    QQuickLoader *asyncLoader = root->findChild<QQuickLoader*>("asyncLoader");
+    QQuickLoader *syncLoader = root->findChild<QQuickLoader*>("syncLoader");
+    QVERIFY(asyncLoader);
+    QVERIFY(syncLoader);
+
+    QVERIFY(!asyncLoader->item());
+    QVERIFY(!syncLoader->item());
+    QMetaObject::invokeMethod(root, "loadComponents");
+    QVERIFY(!asyncLoader->item());
+    QVERIFY(syncLoader->item());
+
+    QCOMPARE(asyncLoader->status(), QQuickLoader::Loading);
+    QVERIFY(!controller->incubated); // asynchronous compilation means not immediately compiled/incubating.
+    QTRY_VERIFY(controller->incubated); // but should start incubating once compilation is complete.
+    QTRY_VERIFY(asyncLoader->item());
+    QCOMPARE(asyncLoader->progress(), 1.0);
+    QCOMPARE(asyncLoader->status(), QQuickLoader::Ready);
+
+    delete root;
+}
+
 void tst_QQuickLoader::parented()
 {
     QQmlComponent component(&engine, testFileUrl("parented.qml"));