1 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 750c32cc3c..39f5082c70 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -263,6 +263,8 @@ private slots:
     void qmlTypeCanBeResolvedByName_data();
     void qmlTypeCanBeResolvedByName();
 
+    void concurrentLoadQmlDir();
+
 private:
     QQmlEngine engine;
     QStringList defaultImportPathList;
@@ -4338,6 +4340,20 @@ void tst_qqmllanguage::qmlTypeCanBeResolvedByName()
     QVERIFY(!o.isNull());
 }
 
+void tst_qqmllanguage::concurrentLoadQmlDir()
+{
+    ThreadedTestHTTPServer server(dataDirectory());
+    QString serverdir = server.urlString("/lib/");
+    engine.setImportPathList(QStringList(defaultImportPathList) << serverdir);
+
+    QQmlComponent component(&engine, testFileUrl("concurrentLoad_main.qml"));
+    QTRY_VERIFY(component.isReady());
+    VERIFY_ERRORS(0);
+    QScopedPointer<QObject> o(component.create());
+    QVERIFY(!o.isNull());
+    engine.setImportPathList(defaultImportPathList);
+}
+
 QTEST_MAIN(tst_qqmllanguage)
 
 #include "tst_qqmllanguage.moc"