4 files changed, 88 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
index 1149f4373e..69d1217544 100644
--- a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
+++ b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
@@ -235,6 +235,7 @@ set(qml_files
     revisions.qml
     scopeIdLookup.qml
     scopeVsObject.qml
+    scopedEnum.qml
     script.js
     script.mjs
     sequenceToIterable.qml
diff --git a/tests/auto/qml/qmlcppcodegen/data/enumproblems.h b/tests/auto/qml/qmlcppcodegen/data/enumproblems.h
index f640b1fc1c..36f97bec5a 100644
--- a/tests/auto/qml/qmlcppcodegen/data/enumproblems.h
+++ b/tests/auto/qml/qmlcppcodegen/data/enumproblems.h
@@ -82,4 +82,38 @@ public:
     Q_FLAG(Option)
 };
 
+class ScopedEnum : public QObject {
+    Q_OBJECT
+    QML_NAMED_ELEMENT(Data)
+    Q_CLASSINFO("RegisterEnumClassesUnscoped", "false")
+
+public:
+    enum class DType {
+        A = 27, B
+    };
+    Q_ENUM(DType)
+
+    enum EType {
+        C = 7, D
+    };
+    Q_ENUM(EType)
+};
+
+class UnscopedEnum : public QObject {
+    Q_OBJECT
+    QML_NAMED_ELEMENT(Data2)
+    Q_CLASSINFO("RegisterEnumClassesUnscoped", "true")
+
+public:
+    enum class DType {
+        A = 26, B
+    };
+    Q_ENUM(DType)
+
+    enum EType {
+        C = 6, D
+    };
+    Q_ENUM(EType)
+};
+
 #endif // ENUMPROBLEMS_H
diff --git a/tests/auto/qml/qmlcppcodegen/data/scopedEnum.qml b/tests/auto/qml/qmlcppcodegen/data/scopedEnum.qml
new file mode 100644
index 0000000000..8b9f161b06
--- /dev/null
+++ b/tests/auto/qml/qmlcppcodegen/data/scopedEnum.qml
@@ -0,0 +1,19 @@
+import QtQml
+import TestTypes
+
+QtObject {
+    property int good: Data.DType.A
+    property int bad: Data.A
+
+    property int wrong: Data.EType.C
+    property int right: Data.C
+
+    property int notgood: Data2.DType.A
+    property int notbad: Data2.A
+
+    property int notwrong: Data2.EType.C
+    property int notright: Data2.C
+
+    property int passable: Enums.AppState.Blue
+    property int wild: Enums.Green
+}
diff --git a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
index 9363172a0e..da8652acf5 100644
--- a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
+++ b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
@@ -203,6 +203,7 @@ private slots:
     void scopeIdLookup();
     void scopeObjectDestruction();
     void scopeVsObject();
+    void scopedEnum();
     void sequenceToIterable();
     void setLookupConversion();
     void setLookupOriginalScope();
@@ -4125,6 +4126,39 @@ void tst_QmlCppCodegen::scopeVsObject()
     QCOMPARE(object->property("objectName").toString(), u"foobar"_s);
 }
 
+void tst_QmlCppCodegen::scopedEnum()
+{
+    QQmlEngine engine;
+    const QString url = u"qrc:/qt/qml/TestTypes/scopedEnum.qml"_s;
+    QQmlComponent component(&engine, QUrl(url));
+    QVERIFY2(!component.isError(), component.errorString().toUtf8());
+
+    QTest::ignoreMessage(
+            QtWarningMsg,
+            qPrintable(url + u":6:5: Unable to assign [undefined] to int"_s));
+    QTest::ignoreMessage(
+            QtWarningMsg,
+            qPrintable(url + u":8: TypeError: Cannot read property 'C' of undefined"_s));
+    QTest::ignoreMessage(
+            QtWarningMsg,
+            qPrintable(url + u":14: TypeError: Cannot read property 'C' of undefined"_s));
+
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(!object.isNull());
+    QCOMPARE(object->property("good").toInt(), 27);
+    QCOMPARE(object->property("bad").toInt(), 0);
+    QCOMPARE(object->property("wrong").toInt(), 0);
+    QCOMPARE(object->property("right").toInt(), 7);
+
+    QCOMPARE(object->property("notgood").toInt(), 26);
+    QCOMPARE(object->property("notbad").toInt(), 26);
+    QCOMPARE(object->property("notwrong").toInt(), 0);
+    QCOMPARE(object->property("notright").toInt(), 6);
+
+    QCOMPARE(object->property("passable").toInt(), 2);
+    QCOMPARE(object->property("wild").toInt(), 1);
+}
+
 void tst_QmlCppCodegen::sequenceToIterable()
 {
     QQmlEngine engine;