1 files changed, 37 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 97727c1794..157fd500ad 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -34,6 +34,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qdir.h>
+#include <QtCore/qscopeguard.h>
 #include <QSignalSpy>
 #include <QFont>
 #include <QQmlFileSelector>
@@ -218,6 +219,8 @@ private slots:
     void lowercaseEnumCompileTime_data();
     void lowercaseEnumCompileTime();
     void scopedEnum();
+    void scopedEnumsWithNameClash();
+    void scopedEnumsWithResolvedNameClash();
     void qmlEnums();
     void literals_data();
     void literals();
@@ -3793,6 +3796,40 @@ void tst_qqmllanguage::scopedEnum()
     QCOMPARE(o->property("noScope").toInt(), (int)MyTypeObject::MyScopedEnum::ScopedVal2);
 }
 
+void tst_qqmllanguage::scopedEnumsWithNameClash()
+{
+    auto typeId = qmlRegisterUncreatableType<ScopedEnumsWithNameClash>("ScopedEnumsWithNameClashTest", 1, 0, "ScopedEnum", "Dummy reason");
+    auto registryGuard = qScopeGuard([typeId]() {
+        qmlUnregisterType(typeId);
+    });
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("scopedEnumsWithNameClash.qml"));
+
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, "Previously registered enum will be overwritten due to name clash: ScopedEnumsWithNameClash.ScopedVal1");
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, "Previously registered enum will be overwritten due to name clash: ScopedEnumsWithNameClash.ScopedVal2");
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, "Previously registered enum will be overwritten due to name clash: ScopedEnumsWithNameClash.ScopedVal3");
+
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(obj != nullptr);
+    QVERIFY(obj->property("success").toBool());
+}
+
+void tst_qqmllanguage::scopedEnumsWithResolvedNameClash()
+{
+    auto typeId = qmlRegisterUncreatableType<ScopedEnumsWithResolvedNameClash>("ScopedEnumsWithResolvedNameClashTest", 1, 0, "ScopedEnum", "Dummy reason");
+    auto registryGuard = qScopeGuard([typeId]() {
+        qmlUnregisterType(typeId);
+    });
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("scopedEnumsWithResolvedNameClash.qml"));
+
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(obj != nullptr);
+    QVERIFY(obj->property("success").toBool());
+}
+
 void tst_qqmllanguage::qmlEnums()
 {
     QQmlEngine engine;