Merge remote-tracking branch 'origin/5.13' into HEAD

 Conflicts:
	src/qml/compiler/qv4compileddata_p.h
	src/qml/jit/qv4baselinejit.cpp
	src/qml/jit/qv4jithelpers.cpp
	src/qml/jsruntime/qv4lookup.cpp
	src/qml/jsruntime/qv4runtime.cpp
	src/qml/jsruntime/qv4runtimeapi_p.h
	src/qml/jsruntime/qv4vme_moth.cpp
	src/qml/qml/qqmltypemodule_p.h

Change-Id: If28793e9e08418457a11fc2c5832f03cab2fcc76

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
index 70aaa9678e..a3cb68fdcb 100644
--- a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
+++ b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
@@ -28,6 +28,7 @@
 
 #include <QtTest/QtTest>
 #include <QQmlApplicationEngine>
+#include <QQmlAbstractUrlInterceptor>
 #include <QtQuick/qquickview.h>
 #include <QtQuick/qquickitem.h>
 #include <private/qqmlimport_p.h>
@@ -43,6 +44,7 @@ private slots:
     void uiFormatLoading();
     void completeQmldirPaths_data();
     void completeQmldirPaths();
+    void interceptQmldir();
     void cleanup();
 };
 
@@ -185,6 +187,32 @@ void tst_QQmlImport::completeQmldirPaths()
     QCOMPARE(QQmlImports::completeQmldirPaths(uri, basePaths, majorVersion, minorVersion), expectedPaths);
 }
 
+class QmldirUrlInterceptor : public QQmlAbstractUrlInterceptor {
+public:
+    QUrl intercept(const QUrl &url, DataType type) override
+    {
+        if (type != UrlString && !url.isEmpty() && url.isValid()) {
+            QString str = url.toString(QUrl::None);
+            return str.replace(QStringLiteral("$(INTERCEPT)"), QStringLiteral("intercepted"));
+        }
+        return url;
+    }
+};
+
+void tst_QQmlImport::interceptQmldir()
+{
+    QQmlEngine engine;
+    QmldirUrlInterceptor interceptor;
+    engine.setUrlInterceptor(&interceptor);
+
+    QQmlComponent component(&engine);
+    component.loadUrl(testFileUrl("interceptQmldir.qml"));
+    QVERIFY(component.isReady());
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(!obj.isNull());
+}
+
+
 QTEST_MAIN(tst_QQmlImport)
 
 #include "tst_qqmlimport.moc"