1 files changed, 61 insertions, 0 deletions

diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 50321c322b..ec4a44e672 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -71,6 +71,7 @@
 #include "grand-parent-gadget-class.h"
 #include "namespace.h"
 #include "cxx17-namespaces.h"
+#include "cxx-attributes.h"
 
 #ifdef Q_MOC_RUN
 // check that moc can parse these constructs, they are being used in Windows winsock2.h header
@@ -704,6 +705,7 @@ private slots:
     void optionsFileError();
     void testQNamespace();
     void cxx17Namespaces();
+    void cxxAttributes();
 
 signals:
     void sigWithUnsignedArg(unsigned foo);
@@ -1424,6 +1426,16 @@ void tst_Moc::environmentIncludePaths()
 // plugin_metadata.h contains a plugin which we register here. Since we're not building this
 // application as a plugin, we need top copy some of the initializer code found in qplugin.h:
 extern "C" QObject *qt_plugin_instance();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+extern "C" QPluginMetaData qt_plugin_query_metadata();
+class StaticPluginInstance{
+public:
+    StaticPluginInstance() {
+        QStaticPlugin plugin(qt_plugin_instance, qt_plugin_query_metadata);
+        qRegisterStaticPluginFunction(plugin);
+    }
+};
+#else
 extern "C" const char *qt_plugin_query_metadata();
 class StaticPluginInstance{
 public:
@@ -1432,6 +1444,7 @@ public:
         qRegisterStaticPluginFunction(plugin);
     }
 };
+#endif
 static StaticPluginInstance staticInstance;
 
 void tst_Moc::specifyMetaTagsFromCmdline() {
@@ -3848,6 +3861,14 @@ static void checkEnum(const QMetaEnum &enumerator, const QByteArray &name, const
     }
 }
 
+class EnumFromNamespaceClass : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(FooNamespace::Enum1 prop READ prop CONSTANT)
+public:
+    FooNamespace::Enum1 prop() { return FooNamespace::Enum1::Key2; }
+};
+
 void tst_Moc::testQNamespace()
 {
     QCOMPARE(TestQNamespace::staticMetaObject.enumeratorCount(), 4);
@@ -3875,6 +3896,11 @@ void tst_Moc::testQNamespace()
     QCOMPARE(FooNamespace::staticMetaObject.enumeratorCount(), 1);
     QCOMPARE(FooNamespace::FooNestedNamespace::staticMetaObject.enumeratorCount(), 2);
     QCOMPARE(FooNamespace::FooNestedNamespace::FooMoreNestedNamespace::staticMetaObject.enumeratorCount(), 1);
+
+    EnumFromNamespaceClass obj;
+    const QVariant prop = obj.property("prop");
+    QCOMPARE(prop.type(), QMetaType::Int);
+    QCOMPARE(prop.toInt(), int(FooNamespace::Enum1::Key2));
 }
 
 void tst_Moc::cxx17Namespaces()
@@ -3896,6 +3922,41 @@ void tst_Moc::cxx17Namespaces()
     QCOMPARE(QMetaEnum::fromType<CXX17Namespace::A::B::C::D::ClassInNamespace::GadEn>().value(0), 3);
 }
 
+void tst_Moc::cxxAttributes()
+{
+    auto so = CppAttribute::staticMetaObject;
+    QCOMPARE(so.className(), "CppAttribute");
+    QCOMPARE(so.enumeratorCount(), 0);
+    QVERIFY(so.indexOfSignal("deprecatedSignal") != 1);
+    for (auto a: {"deprecatedSlot", "deprecatedSlot2", "deprecatedReason", "deprecatedReasonWithLBRACK",
+                  "deprecatedReasonWith2LBRACK", "deprecatedReasonWithRBRACK", "deprecatedReasonWith2RBRACK",
+                  "slotWithArguments"
+#if !defined(_MSC_VER) || _MSC_VER >= 1912
+                  , "noreturnSlot", "noreturnSlot2", "returnInt", "noreturnDeprecatedSlot",
+                  "noreturnSlot3"
+#endif
+                  }) {
+        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)
 
 // the generated code must compile with QT_NO_KEYWORDS