Merge remote-tracking branch 'origin/dev' into wip/cmake

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

1 files changed, 16 insertions, 1 deletions

diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
index 82aa265465..f15d53d022 100644
--- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
@@ -82,6 +82,7 @@ private slots:
     void importsChildPlugin2();
     void importsChildPlugin21();
     void parallelPluginImport();
+    void multiSingleton();
 
 private:
     QString m_importsDirectory;
@@ -627,7 +628,7 @@ void tst_qqmlmoduleplugin::importStrictModule_data()
         << "import org.qtproject.NonstrictModule 1.0\n"
            "MyPluginType {}"
         << "Module 'org.qtproject.NonstrictModule' does not contain a module identifier directive - it cannot be protected from external registrations."
-        << ":1:1: plugin cannot be loaded for module \"org.qtproject.NonstrictModule\": Cannot install element 'MyPluginType' into protected namespace 'org.qtproject.StrictModule'";
+        << ":1:1: plugin cannot be loaded for module \"org.qtproject.NonstrictModule\": Cannot install element 'MyPluginType' into protected module 'org.qtproject.StrictModule' version '1'";
 
     QTest::newRow("non-strict preemption")
         << "import org.qtproject.PreemptiveModule 1.0\n"
@@ -791,6 +792,20 @@ void tst_qqmlmoduleplugin::parallelPluginImport()
     worker.wait();
 }
 
+void tst_qqmlmoduleplugin::multiSingleton()
+{
+    QQmlEngine engine;
+    QObject obj;
+    qmlRegisterSingletonInstance("Test", 1, 0, "Tracker", &obj);
+    engine.addImportPath(m_importsDirectory);
+    QQmlComponent component(&engine, testFileUrl("multiSingleton.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != nullptr);
+    QCOMPARE(obj.objectName(), QLatin1String("first"));
+    delete object;
+}
+
+
 QTEST_MAIN(tst_qqmlmoduleplugin)
 
 #include "tst_qqmlmoduleplugin.moc"