Allow importing protected modules with different major versions

This allows QtQuick.Controls 1.x and 2.x imports to co-exist even
if they are two different plugins with the same module directive.

Change-Id: Idee302439e3c2fd6813ba2f41b69144fbae7902c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
index 0a8090ab07..6f4382f871 100644
--- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
@@ -508,6 +508,27 @@ void tst_qqmlmoduleplugin::importStrictModule_data()
         << QString()
         << QString();
 
+    QTest::newRow("two strict modules with different major version")
+        << "import org.qtproject.StrictModule 1.0\n"
+           "import org.qtproject.StrictModule 2.0\n"
+           "MyPluginType {}"
+        << QString()
+        << QString();
+
+    QTest::newRow("old namespaced strict module")
+        << "import org.qtproject.StrictModule 1.0 as Old\n"
+           "import org.qtproject.StrictModule 2.0 as New\n"
+           "Old.MyPluginType {}"
+        << QString()
+        << QString();
+
+    QTest::newRow("new namespaced strict modules")
+        << "import org.qtproject.StrictModule 1.0 as Old\n"
+           "import org.qtproject.StrictModule 2.0 as New\n"
+           "New.MyPluginType {}"
+        << QString()
+        << QString();
+
     QTest::newRow("wrong target")
         << "import org.qtproject.InvalidStrictModule 1.0\n"
            "MyPluginType {}"