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

 Conflicts:
	src/qml/qml/qqmltypeloader.cpp
	src/qml/qml/qqmltypeloader_p.h

Done-with: Simon Hausmann <simon.hausmann@qt.io>
Task-number: QTBUG-68091
Change-Id: I7c0ab3c9446ac50da07b58f54e24eb4587f7f28c

11 files changed, 89 insertions, 8 deletions

diff --git a/tests/auto/qml/qqmlengine/data/qrcurls.js b/tests/auto/qml/qqmlengine/data/qrcurls.js
new file mode 100644
index 0000000000..15a4d5a70c
--- /dev/null
+++ b/tests/auto/qml/qqmlengine/data/qrcurls.js
@@ -0,0 +1 @@
+function someFunction() {}
diff --git a/tests/auto/qml/qqmlengine/data/qrcurls.qml b/tests/auto/qml/qqmlengine/data/qrcurls.qml
new file mode 100644
index 0000000000..e879577e10
--- /dev/null
+++ b/tests/auto/qml/qqmlengine/data/qrcurls.qml
@@ -0,0 +1,4 @@
+import QtQml 2.0
+
+QtObject {
+}
diff --git a/tests/auto/qml/qqmlengine/qqmlengine.pro b/tests/auto/qml/qqmlengine/qqmlengine.pro
index 8d1e149d62..d2eb92bfd5 100644
--- a/tests/auto/qml/qqmlengine/qqmlengine.pro
+++ b/tests/auto/qml/qqmlengine/qqmlengine.pro
@@ -12,3 +12,7 @@ boot2qt: {
     # GC corruption test is too heavy for qemu-arm
     DEFINES += SKIP_GCCORRUPTION_TEST
 }
+
+RESOURCES += \
+    data/qrcurls.qml \
+    data/qrcurls.js
diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
index 9509db9379..09480a8e1a 100644
--- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
+++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
@@ -77,6 +77,7 @@ private slots:
     void testGCCorruption();
     void testGroupedPropertyRevisions();
     void componentFromEval();
+    void qrcUrls();
 
 public slots:
     QObject *createAQObjectForOwnershipTest ()
@@ -897,6 +898,28 @@ void tst_qqmlengine::componentFromEval()
     QVERIFY(!item.isNull());
 }
 
+void tst_qqmlengine::qrcUrls()
+{
+    QQmlEngine engine;
+    QQmlEnginePrivate *pEngine = QQmlEnginePrivate::get(&engine);
+
+    {
+        QQmlRefPointer<QQmlTypeData> oneQml(pEngine->typeLoader.getType(QUrl("qrc:/qrcurls.qml")));
+        QVERIFY(oneQml.data() != nullptr);
+        QQmlRefPointer<QQmlTypeData> twoQml(pEngine->typeLoader.getType(QUrl("qrc:///qrcurls.qml")));
+        QVERIFY(twoQml.data() != nullptr);
+        QCOMPARE(oneQml.data(), twoQml.data());
+    }
+
+    {
+        QQmlRefPointer<QQmlTypeData> oneJS(pEngine->typeLoader.getType(QUrl("qrc:/qrcurls.js")));
+        QVERIFY(oneJS.data() != nullptr);
+        QQmlRefPointer<QQmlTypeData> twoJS(pEngine->typeLoader.getType(QUrl("qrc:///qrcurls.js")));
+        QVERIFY(twoJS.data() != nullptr);
+        QCOMPARE(oneJS.data(), twoJS.data());
+    }
+}
+
 QTEST_MAIN(tst_qqmlengine)
 
 #include "tst_qqmlengine.moc"
diff --git a/tests/auto/qml/qqmlinfo/data/Component.qml b/tests/auto/qml/qqmlinfo/data/Component.qml
new file mode 100644
index 0000000000..fefbbfae76
--- /dev/null
+++ b/tests/auto/qml/qqmlinfo/data/Component.qml
@@ -0,0 +1,8 @@
+import QtQml 2.0
+
+QtObject {
+    property Component delegate: Component {
+        QtObject {
+        }
+    }
+}
diff --git a/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp b/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp
index ada3f9e37b..5ff72de0a0 100644
--- a/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp
+++ b/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp
@@ -50,6 +50,7 @@ private slots:
     void types();
     void chaining();
     void messageTypes();
+    void component();
 
 private:
     QQmlEngine engine;
@@ -216,6 +217,19 @@ void tst_qqmlinfo::messageTypes()
     qmlWarning(nullptr) << QLatin1String("warning");
 }
 
+void tst_qqmlinfo::component()
+{
+    QQmlComponent component(&engine, testFileUrl("Component.qml"));
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(object != nullptr);
+    QQmlComponent *delegate = qobject_cast<QQmlComponent*>(object->property("delegate").value<QObject*>());
+    QVERIFY(delegate);
+
+    QString message = component.url().toString() + ":4:34: QML Component: Delegate error";
+    QTest::ignoreMessage(QtInfoMsg, qPrintable(message));
+    qmlInfo(delegate) << "Delegate error";
+}
+
 QTEST_MAIN(tst_qqmlinfo)
 
 #include "tst_qqmlinfo.moc"
diff --git a/tests/auto/qml/qqmlinstantiator/stringmodel.h b/tests/auto/qml/qqmlinstantiator/stringmodel.h
index b01817375a..6ae3cbb6ee 100644
--- a/tests/auto/qml/qqmlinstantiator/stringmodel.h
+++ b/tests/auto/qml/qqmlinstantiator/stringmodel.h
@@ -60,7 +60,7 @@ public:
         endInsertRows();
     }
 
-    int rowCount(const QModelIndex &) const
+    int rowCount(const QModelIndex &) const override
     {
         return items.count();
     }
@@ -70,7 +70,7 @@ public:
         return roles;
     }
 
-    virtual int columnCount(const QModelIndex &) const
+    int columnCount(const QModelIndex &) const override
     {
         return 1;
     }
@@ -80,7 +80,7 @@ public:
         return rowCount(QModelIndex()) > 0;
     }
 
-    virtual QModelIndex index(int row, int column, const QModelIndex &parent) const
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override
     {
         Q_UNUSED(column);
         if (row>=0 && row<rowCount(parent))
@@ -89,12 +89,12 @@ public:
             return QModelIndex();
     }
 
-    virtual QModelIndex parent(const QModelIndex &) const
+    QModelIndex parent(const QModelIndex &) const override
     {
         return QModelIndex();
     }
 
-    QVariant data (const QModelIndex & index, int role) const
+    QVariant data (const QModelIndex & index, int role) const override
     {
         int row = index.row();
         if ((row<0) || (row>=items.count()))
diff --git a/tests/auto/quick/qquickitem2/data/mapCoordinates.qml b/tests/auto/quick/qquickitem2/data/mapCoordinates.qml
index b410b445c5..596dedab90 100644
--- a/tests/auto/quick/qquickitem2/data/mapCoordinates.qml
+++ b/tests/auto/quick/qquickitem2/data/mapCoordinates.qml
@@ -39,6 +39,11 @@ Item {
         Item { id: itemB; objectName: "itemB"; x: 100; y: 100 }
     }
 
+    Component {
+        id: itemComponent
+        Item { x: 150; y: 150 }
+    }
+
     function mapAToB(x, y) {
         var pos = itemA.mapToItem(itemB, x, y)
         return Qt.point(pos.x, pos.y)
@@ -69,6 +74,18 @@ Item {
         return Qt.point(pos.x, pos.y)
     }
 
+    function mapOrphanToGlobal(x, y) {
+        var obj = itemComponent.createObject(null);
+        var pos = obj.mapToGlobal(x, y)
+        return Qt.point(pos.x, pos.y)
+    }
+
+    function mapOrphanFromGlobal(x, y) {
+        var obj = itemComponent.createObject(null);
+        var pos = obj.mapFromGlobal(x, y)
+        return Qt.point(pos.x, pos.y)
+    }
+
     function checkMapAToInvalid(x, y) {
         try {
             itemA.mapToItem(1122, x, y)
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index 0f4850d4a7..f0f5873ace 100644
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -2364,6 +2364,16 @@ void tst_QQuickItem::mapCoordinates()
             Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y)));
     QCOMPARE(result.value<QPointF>(), qobject_cast<QQuickItem*>(a)->mapFromGlobal(QPointF(x, y)));
 
+    // for orphans we are primarily testing that we don't crash.
+    // when orphaned the final position is the original position of the item translated by x,y
+    QVERIFY(QMetaObject::invokeMethod(root, "mapOrphanToGlobal",
+            Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y)));
+    QCOMPARE(result.value<QPointF>(), QPointF(150,150) + QPointF(x, y));
+
+    QVERIFY(QMetaObject::invokeMethod(root, "mapOrphanFromGlobal",
+            Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y)));
+    QCOMPARE(result.value<QPointF>(), -QPointF(150,150) + QPointF(x, y));
+
     QString warning1 = testFileUrl("mapCoordinates.qml").toString() + ":35:5: QML Item: mapToItem() given argument \"1122\" which is neither null nor an Item";
     QString warning2 = testFileUrl("mapCoordinates.qml").toString() + ":35:5: QML Item: mapFromItem() given argument \"1122\" which is neither null nor an Item";
 
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 4d3a665255..c1daddb561 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -8692,8 +8692,6 @@ void tst_QQuickListView::QTBUG_34576_velocityZero()
     QQuickView *window = new QQuickView(nullptr);
     window->setGeometry(0,0,240,320);
 
-    QQmlContext *ctxt = window->rootContext();
-
     QString filename(testFile("qtbug34576.qml"));
     window->setSource(QUrl::fromLocalFile(filename));
     window->show();
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 2b896431ed..7a6f302403 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -2470,9 +2470,11 @@ static void verify_offsets(QQuickPathView *pathview, int toidx, qreal fromoffset
     QTest::qWait(100);
     first = pathview->offset();
     while (1) {
+        if (first == 0)
+            first = pathview->offset();
         QTest::qWait(10); // highlightMoveDuration: 1000
         second = pathview->offset();
-        if (!started && second != first) { // animation started
+        if (!started && first != 0 && second != first) { // animation started
             started = true;
             break;
         }