2 files changed, 60 insertions, 0 deletions
diff --git a/tests/auto/tools/moc/cxx-attributes.h b/tests/auto/tools/moc/cxx-attributes.h
index 719f31e23c..eff6a3ec41 100644
--- a/tests/auto/tools/moc/cxx-attributes.h
+++ b/tests/auto/tools/moc/cxx-attributes.h
@@ -57,4 +57,47 @@ public slots:
 #endif
 };
 
+#ifdef Q_MOC_RUN
+#  define TEST_COMPILER_DEPRECATION [[deprecated]]
+#  define TEST_COMPILER_DEPRECATION_X(x) [[deprecated(x)]]
+#else
+#  define TEST_COMPILER_DEPRECATION Q_DECL_ENUMERATOR_DEPRECATED
+#  define TEST_COMPILER_DEPRECATION_X(x) Q_DECL_ENUMERATOR_DEPRECATED_X(x)
+#endif
+
+namespace TestQNamespaceDeprecated {
+    Q_NAMESPACE
+    enum class TestEnum1 {
+        Key1 = 11,
+        Key2 TEST_COMPILER_DEPRECATION,
+        Key3 TEST_COMPILER_DEPRECATION_X("reason"),
+        Key4 TEST_COMPILER_DEPRECATION_X("reason["),
+        Key5 TEST_COMPILER_DEPRECATION_X("reason[["),
+        Key6 TEST_COMPILER_DEPRECATION_X("reason]"),
+        Key7 TEST_COMPILER_DEPRECATION_X("reason]]"),
+    };
+    Q_ENUM_NS(TestEnum1)
+
+    // try to dizzy moc by adding a struct in between
+    struct TestGadget {
+        Q_GADGET
+    public:
+        enum class TestGEnum1 {
+            Key1 = 13,
+            Key2 TEST_COMPILER_DEPRECATION,
+            Key3 TEST_COMPILER_DEPRECATION_X("reason")
+        };
+        Q_ENUM(TestGEnum1)
+    };
+
+    enum class TestFlag1 {
+        None = 0,
+        Flag1 = 1,
+        Flag2 TEST_COMPILER_DEPRECATION = 2,
+        Flag3 TEST_COMPILER_DEPRECATION_X("reason") = 3,
+        Any = Flag1 | Flag2 | Flag3
+    };
+    Q_FLAG_NS(TestFlag1)
+}
+
 #endif // CXXATTRIBUTE_H
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 4e5d902aa2..f12df578f4 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -3926,6 +3926,23 @@ void tst_Moc::cxxAttributes()
                   }) {
         QVERIFY(so.indexOfSlot(a) != 1);
     }
+
+    QCOMPARE(TestQNamespaceDeprecated::staticMetaObject.enumeratorCount(), 2);
+    checkEnum(TestQNamespaceDeprecated::staticMetaObject.enumerator(0), "TestEnum1",
+                {{"Key1", 11}, {"Key2", 12}, {"Key3", 13}, {"Key4", 14}, {"Key5", 15}, {"Key6", 16},
+                 {"Key7", 17}});
+    checkEnum(TestQNamespaceDeprecated::staticMetaObject.enumerator(1), "TestFlag1",
+                {{"None", 0}, {"Flag1", 1}, {"Flag2", 2}, {"Flag3", 3}, {"Any", 1 | 2 | 3}});
+
+    QCOMPARE(TestQNamespaceDeprecated::TestGadget::staticMetaObject.enumeratorCount(), 1);
+    checkEnum(TestQNamespaceDeprecated::TestGadget::staticMetaObject.enumerator(0), "TestGEnum1",
+                {{"Key1", 13}, {"Key2", 14}, {"Key3", 15}});
+
+    QMetaEnum meta = QMetaEnum::fromType<TestQNamespaceDeprecated::TestEnum1>();
+    QVERIFY(meta.isValid());
+    QCOMPARE(meta.name(), "TestEnum1");
+    QCOMPARE(meta.enclosingMetaObject(), &TestQNamespaceDeprecated::staticMetaObject);
+    QCOMPARE(meta.keyCount(), 7);
 }
 
 QTEST_MAIN(tst_Moc)