fix tst_qqmllanguage:multiVersionSingletons

multiVersionSingletons expects some special type registration, which got
overridden by "overrideSingleton", and therefore failed when running
after the overrideSingleton test. Let multiVersionSingletons register
its own type into a different module, to avoid clashes with other tests.
Amends 4cdf0643b442a57b0cf0dcef104e71c0196dba06.

Change-Id: Ieb8ff61666af296ef2a0e29cef4fcaa736dafc1f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

2 files changed, 6 insertions, 4 deletions

diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp
index 8491d67520..b233903ca2 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.cpp
+++ b/tests/auto/qml/qqmllanguage/testtypes.cpp
@@ -98,8 +98,8 @@ void registerTypes()
     qmlRegisterType<ImmediateProperties>("Test", 1, 0, "ImmediateProperties");
 
     qmlRegisterTypesAndRevisions<Extended, Foreign, ForeignExtended>("Test", 1);
-    qmlRegisterTypesAndRevisions<BareSingleton>("Test", 11);
-    qmlRegisterTypesAndRevisions<UncreatableSingleton>("Test", 11);
+    qmlRegisterTypesAndRevisions<BareSingleton>("Test", 1);
+    qmlRegisterTypesAndRevisions<UncreatableSingleton>("Test", 1);
 
     // Metatype/namespace variation one: Register namespace first
 
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 9d2de837df..acbb21f2d6 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -8271,11 +8271,13 @@ void tst_qqmllanguage::callMethodOfAttachedDerived()
 
 void tst_qqmllanguage::multiVersionSingletons()
 {
+    qmlRegisterTypesAndRevisions<BareSingleton>("MultiVersionSingletons", 11);
+    qmlRegisterTypesAndRevisions<UncreatableSingleton>("MultiVersionSingletons", 11);
     QQmlEngine engine;
 
     for (const char *name : { "BareSingleton", "UncreatableSingleton"}) {
-        const int id1 = qmlTypeId("Test", 1, 0, name);
-        const int id2 = qmlTypeId("Test", 11, 0, name);
+        const int id1 = qmlTypeId("MultiVersionSingletons", 1, 0, name);
+        const int id2 = qmlTypeId("MultiVersionSingletons", 11, 0, name);
         QVERIFY(id1 != id2);
         const QJSValue value1 = engine.singletonInstance<QJSValue>(id1);
         const QJSValue value2 = engine.singletonInstance<QJSValue>(id2);