Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I0127f2c16de1d930bdd8cbccd42ec6785f31ab96

18 files changed, 209 insertions, 3 deletions

diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/data/encodeQmlScope.qml b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/data/encodeQmlScope.qml
new file mode 100644
index 0000000000..7ea048044f
--- /dev/null
+++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/data/encodeQmlScope.qml
@@ -0,0 +1,19 @@
+import QtQuick 2.0
+
+Item {
+    property int a: 0
+    property int b: 0
+    onAChanged: console.log("inline")
+    onBChanged: {
+        console.log("extra braces");
+    }
+
+    Timer {
+        interval: 10
+        running: true
+        onTriggered: {
+            parent.a += 10;
+            parent.b -= 10;
+        }
+    }
+}
diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/qqmldebugjs.pro b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/qqmldebugjs.pro
index 90623c75a6..52d70bd1b1 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/qqmldebugjs.pro
+++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/qqmldebugjs.pro
@@ -20,4 +20,5 @@ OTHER_FILES += data/test.qml data/test.js \
     data/changeBreakpoint.qml \
     data/stepAction.qml \
     data/breakpointRelocation.qml \
-    data/createComponent.qml
+    data/createComponent.qml \
+    data/encodeQmlScope.qml
diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
index 37d4ef1160..b36e576320 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
+++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
@@ -124,6 +124,7 @@ const char *QUIT_QMLFILE = "quit.qml";
 const char *CHANGEBREAKPOINT_QMLFILE = "changeBreakpoint.qml";
 const char *STEPACTION_QMLFILE = "stepAction.qml";
 const char *BREAKPOINTRELOCATION_QMLFILE = "breakpointRelocation.qml";
+const char *ENCODEQMLSCOPE_QMLFILE = "encodeQmlScope.qml";
 
 #define VARIANTMAPINIT \
     QString obj("{}"); \
@@ -217,6 +218,8 @@ private slots:
     void getScripts_data() { targetData(); }
     void getScripts();
 
+    void encodeQmlScope();
+
 private:
     ConnectResult init(bool qmlscene, const QString &qmlFile = QString(TEST_QMLFILE),
                     bool blockMode = true, bool restrictServices = false);
@@ -1457,6 +1460,70 @@ void tst_QQmlDebugJS::getScripts()
     QVERIFY(scripts.first().toMap()[QStringLiteral("name")].toString().endsWith(QStringLiteral("data/test.qml")));
 }
 
+void tst_QQmlDebugJS::encodeQmlScope()
+{
+    QString file(ENCODEQMLSCOPE_QMLFILE);
+    QCOMPARE(init(true, file), ConnectSuccess);
+
+    int numFrames = 0;
+    int numExpectedScopes = 0;
+    int numReceivedScopes = 0;
+    bool isStopped = false;
+    bool scopesFailed = false;
+
+    QObject::connect(m_client, &QJSDebugClient::failure, this, [&]() {
+        qWarning() << "received failure" << m_client->response;
+        scopesFailed = true;
+        m_process->stop();
+        numFrames = 2;
+        isStopped = false;
+    });
+
+    QObject::connect(m_client, &QJSDebugClient::stopped, this, [&]() {
+        m_client->frame();
+        isStopped = true;
+    });
+
+    QObject::connect(m_client, &QJSDebugClient::result, this, [&]() {
+        const QVariantMap value = m_client->parser.call(
+                    QJSValueList() << QJSValue(QString(m_client->response))).toVariant().toMap();
+
+        const QMap<QString, QVariant> body = value.value("body").toMap();
+        const QString command = value.value("command").toString();
+
+        if (command == QString("scope")) {
+            // If the scope commands fail we get a failure() signal above.
+            if (++numReceivedScopes == numExpectedScopes) {
+                m_client->continueDebugging(QJSDebugClient::Continue);
+                isStopped = false;
+            }
+        } else if (command == QString("frame")) {
+
+            // We want at least a global scope and some kind of local scope here.
+            const QList<QVariant> scopes = body.value("scopes").toList();
+            if (scopes.length() < 2)
+                scopesFailed = true;
+
+            for (const QVariant &scope : scopes) {
+                ++numExpectedScopes;
+                m_client->scope(scope.toMap().value("index").toInt());
+            }
+
+            ++numFrames;
+        }
+    });
+
+    m_client->setBreakpoint(file, 6);
+    m_client->setBreakpoint(file, 8);
+    m_client->connect();
+
+    QTRY_COMPARE(numFrames, 2);
+    QVERIFY(numExpectedScopes > 3);
+    QVERIFY(!scopesFailed);
+    QTRY_VERIFY(!isStopped);
+    QCOMPARE(numReceivedScopes, numExpectedScopes);
+}
+
 QList<QQmlDebugClient *> tst_QQmlDebugJS::createClients()
 {
     m_client = new QJSDebugClient(m_connection);
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index 911da1b20c..e4bf2ff1aa 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -215,6 +215,8 @@ private slots:
     void functionToString_data();
     void functionToString();
 
+    void protoChanges_QTBUG68369();
+
 signals:
     void testSignal();
 };
@@ -4247,6 +4249,22 @@ void tst_QJSEngine::functionToString()
     QCOMPARE(evaluationResult.toString(), expectedString);
 }
 
+void tst_QJSEngine::protoChanges_QTBUG68369()
+{
+    QJSEngine engine;
+    QJSValue ok = engine.evaluate(
+    "var o = { x: true };"
+    "var p1 = {};"
+    "var p2 = {};"
+    "o.__proto__ = p1;"
+    "o.__proto__ = p2;"
+    "o.__proto__ = p1;"
+    "p1.y = true;"
+    "o.y"
+    );
+    QVERIFY(ok.toBool() == true);
+}
+
 QTEST_MAIN(tst_QJSEngine)
 
 #include "tst_qjsengine.moc"
diff --git a/tests/auto/qml/qmlcachegen/Enums.qml b/tests/auto/qml/qmlcachegen/Enums.qml
new file mode 100644
index 0000000000..830babb73e
--- /dev/null
+++ b/tests/auto/qml/qmlcachegen/Enums.qml
@@ -0,0 +1,9 @@
+import QtQml 2.0
+QtObject {
+    enum Test {
+        First = 100,
+        Second = 200
+    }
+    property int value: 0
+    Component.onCompleted: value = Enums.Second
+}
diff --git a/tests/auto/qml/qmlcachegen/qmlcachegen.pro b/tests/auto/qml/qmlcachegen/qmlcachegen.pro
index f62b950844..40de4548a7 100644
--- a/tests/auto/qml/qmlcachegen/qmlcachegen.pro
+++ b/tests/auto/qml/qmlcachegen/qmlcachegen.pro
@@ -14,4 +14,6 @@ RESOURCES += trickypaths.qrc
 
 RESOURCES += jsimport.qml script.js library.js
 
+RESOURCES += Enums.qml
+
 QT += core-private qml-private testlib
diff --git a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
index c95a5a5d25..3b7d268f7b 100644
--- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
+++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
@@ -56,6 +56,8 @@ private slots:
     void trickyPaths();
 
     void scriptImport();
+
+    void enums();
 };
 
 // A wrapper around QQmlComponent to ensure the temporary reference counts
@@ -427,6 +429,15 @@ void tst_qmlcachegen::scriptImport()
     QTRY_COMPARE(obj->property("value").toInt(), 42);
 }
 
+void tst_qmlcachegen::enums()
+{
+    QQmlEngine engine;
+    CleanlyLoadingComponent component(&engine, QUrl("qrc:///Enums.qml"));
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(!obj.isNull());
+    QTRY_COMPARE(obj->property("value").toInt(), 200);
+}
+
 QTEST_GUILESS_MAIN(tst_qmlcachegen)
 
 #include "tst_qmlcachegen.moc"
diff --git a/tests/auto/qml/qqmlcomponent/data/InitialPropertyTest.qml b/tests/auto/qml/qqmlcomponent/data/InitialPropertyTest.qml
new file mode 100644
index 0000000000..7de276f2d8
--- /dev/null
+++ b/tests/auto/qml/qqmlcomponent/data/InitialPropertyTest.qml
@@ -0,0 +1,4 @@
+import QtQml 2.0
+QtObject {
+    property bool ok: false
+}
diff --git a/tests/auto/qml/qqmlcomponent/data/nonExistentInitialProperty.qml b/tests/auto/qml/qqmlcomponent/data/nonExistentInitialProperty.qml
new file mode 100644
index 0000000000..ef89e46088
--- /dev/null
+++ b/tests/auto/qml/qqmlcomponent/data/nonExistentInitialProperty.qml
@@ -0,0 +1,9 @@
+import QtQml 2.0
+QtObject {
+    property Component factory: Qt.createComponent(Qt.resolvedUrl("InitialPropertyTest.qml"), Component.PreferSynchronous)
+    property var incubator
+    function startIncubation()
+    {
+        incubator = factory.incubateObject(null, { ok: true, nonExistent: 42 }, Qt.Asynchronous)
+    }
+}
diff --git a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
index 0263115db8..efd5bb571b 100644
--- a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
+++ b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
@@ -118,6 +118,7 @@ private slots:
     void recursionContinuation();
     void partialComponentCreation();
     void callingContextForInitialProperties();
+    void setNonExistentInitialProperty();
     void relativeUrl_data();
     void relativeUrl();
 
@@ -607,6 +608,23 @@ void tst_qqmlcomponent::callingContextForInitialProperties()
     QVERIFY(checker->scopeObject->metaObject()->indexOfProperty("incubatedObject") != -1);
 }
 
+void tst_qqmlcomponent::setNonExistentInitialProperty()
+{
+    QQmlIncubationController controller;
+    QQmlEngine engine;
+    engine.setIncubationController(&controller);
+    QQmlComponent component(&engine, testFileUrl("nonExistentInitialProperty.qml"));
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(!obj.isNull());
+    QMetaObject::invokeMethod(obj.data(), "startIncubation");
+    QJSValue incubatorStatus = obj->property("incubator").value<QJSValue>();
+    incubatorStatus.property("forceCompletion").callWithInstance(incubatorStatus);
+    QJSValue objectWrapper = incubatorStatus.property("object");
+    QVERIFY(objectWrapper.isQObject());
+    QPointer<QObject> object(objectWrapper.toQObject());
+    QVERIFY(object->property("ok").toBool());
+}
+
 void tst_qqmlcomponent::relativeUrl_data()
 {
     QTest::addColumn<QUrl>("url");
diff --git a/tests/auto/qml/qqmltypeloader/data/Base.qml b/tests/auto/qml/qqmltypeloader/data/Base.qml
new file mode 100644
index 0000000000..431c659424
--- /dev/null
+++ b/tests/auto/qml/qqmltypeloader/data/Base.qml
@@ -0,0 +1,3 @@
+import QtQml 2.0
+
+QtObject {}
diff --git a/tests/auto/qml/qqmltypeloader/data/Load.qml b/tests/auto/qml/qqmltypeloader/data/Load.qml
new file mode 100644
index 0000000000..0b893bb5cd
--- /dev/null
+++ b/tests/auto/qml/qqmltypeloader/data/Load.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.0
+
+Item {
+    property int xy: loader.xy
+    Loader {
+        id: loader
+        asynchronous: true
+        source: 'Base.qml'
+        property int xy: item.xy
+    }
+}
diff --git a/tests/auto/qml/qqmltypeloader/data/redirected/Imported.qml b/tests/auto/qml/qqmltypeloader/data/redirected/Imported.qml
new file mode 100644
index 0000000000..62954fe1b2
--- /dev/null
+++ b/tests/auto/qml/qqmltypeloader/data/redirected/Imported.qml
@@ -0,0 +1,5 @@
+import QtQml 2.0
+
+QtObject {
+    property int xy: 323232
+}
diff --git a/tests/auto/qml/qqmltypeloader/data/redirected/Redirected.qml b/tests/auto/qml/qqmltypeloader/data/redirected/Redirected.qml
new file mode 100644
index 0000000000..40fec5ed31
--- /dev/null
+++ b/tests/auto/qml/qqmltypeloader/data/redirected/Redirected.qml
@@ -0,0 +1,5 @@
+import QtQml 2.0
+
+Imported {
+
+}
diff --git a/tests/auto/qml/qqmltypeloader/data/redirected/qmldir b/tests/auto/qml/qqmltypeloader/data/redirected/qmldir
new file mode 100644
index 0000000000..8eb1fa5c18
--- /dev/null
+++ b/tests/auto/qml/qqmltypeloader/data/redirected/qmldir
@@ -0,0 +1 @@
+Imported 1.0 Imported.qml
diff --git a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
index 28737ceb2e..cf3bc8b050 100644
--- a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
+++ b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
@@ -33,6 +33,7 @@
 #include <QtQuick/qquickitem.h>
 #include <QtQml/private/qqmlengine_p.h>
 #include <QtQml/private/qqmltypeloader_p.h>
+#include "../../shared/testhttpserver.h"
 #include "../../shared/util.h"
 
 class tst_QQMLTypeLoader : public QQmlDataTest
@@ -48,6 +49,7 @@ private slots:
     void keepSingleton();
     void keepRegistrations();
     void intercept();
+    void redirect();
 };
 
 void tst_QQMLTypeLoader::testLoadComplete()
@@ -410,6 +412,22 @@ void tst_QQMLTypeLoader::intercept()
     QVERIFY(factory.loadedFiles.contains(QLatin1String(QT_TESTCASE_BUILDDIR) + "/Slow/qmldir"));
 }
 
+void tst_QQMLTypeLoader::redirect()
+{
+    TestHTTPServer server;
+    QVERIFY2(server.listen(), qPrintable(server.errorString()));
+    QVERIFY(server.serveDirectory(dataDirectory()));
+    server.addRedirect("Base.qml", server.urlString("/redirected/Redirected.qml"));
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.loadUrl(server.urlString("/Load.qml"), QQmlComponent::Asynchronous);
+    QTRY_VERIFY2(component.isReady(), qPrintable(component.errorString()));
+
+    QObject *object = component.create();
+    QTRY_COMPARE(object->property("xy").toInt(), 323232);
+}
+
 QTEST_MAIN(tst_QQMLTypeLoader)
 
 #include "tst_qqmltypeloader.moc"
diff --git a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro
index 3a20e94741..0352561e03 100644
--- a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro
+++ b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro
@@ -3,7 +3,12 @@ TARGET = tst_qqmltypeloader
 QT += qml testlib qml-private quick
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qqmltypeloader.cpp
+SOURCES += \
+    tst_qqmltypeloader.cpp \
+    ../../shared/testhttpserver.cpp
+
+HEADERS += \
+    ../../shared/testhttpserver.h
 
 include (../../shared/util.pri)
 
diff --git a/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro b/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro
index 81c73be831..85f71bb605 100644
--- a/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro
+++ b/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro
@@ -11,4 +11,4 @@ TESTDATA = data/*
 QT += core-private gui-private qml-private quick-private network testlib
 
 OTHER_FILES += \
-    data/largeAnimation.qml
+    $$files(data/*.qml)