5 files changed, 10 insertions, 16 deletions
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h
index d205034d77..74136c3f6f 100644
--- a/src/corelib/kernel/qmetaobject_p.h
+++ b/src/corelib/kernel/qmetaobject_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Copyright (C) 2014 Olivier Goffart <ogoffart@woboq.com>
 ** Contact: https://www.qt.io/licensing/
 **
@@ -102,11 +102,13 @@ enum MethodFlags  {
     MethodRevisioned = 0x80
 };
 
-enum MetaObjectFlags { // keep it in sync with QMetaObjectBuilder::MetaObjectFlag enum
+enum MetaObjectFlag {
     DynamicMetaObject = 0x01,
     RequiresVariantMetaObject = 0x02,
     PropertyAccessInStaticMetaCall = 0x04 // since Qt 5.5, property code is in the static metacall
 };
+Q_DECLARE_FLAGS(MetaObjectFlags, MetaObjectFlag)
+Q_DECLARE_OPERATORS_FOR_FLAGS(MetaObjectFlags)
 
 enum MetaDataFlags {
     IsUnresolvedType = 0x80000000,
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp
index c4ea31c215..b8238a3df8 100644
--- a/src/corelib/kernel/qmetaobjectbuilder.cpp
+++ b/src/corelib/kernel/qmetaobjectbuilder.cpp
@@ -321,9 +321,9 @@ void QMetaObjectBuilder::setSuperClass(const QMetaObject *meta)
 
     \sa setFlags()
 */
-QMetaObjectBuilder::MetaObjectFlags QMetaObjectBuilder::flags() const
+MetaObjectFlags QMetaObjectBuilder::flags() const
 {
-    return (QMetaObjectBuilder::MetaObjectFlags)d->flags;
+    return MetaObjectFlags(d->flags);
 }
 
 /*!
diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/corelib/kernel/qmetaobjectbuilder_p.h
index d7fcf30f53..d0d4867d8b 100644
--- a/src/corelib/kernel/qmetaobjectbuilder_p.h
+++ b/src/corelib/kernel/qmetaobjectbuilder_p.h
@@ -58,6 +58,7 @@
 #include <QtCore/qhash.h>
 #include <QtCore/qmap.h>
 
+#include <private/qmetaobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -93,14 +94,6 @@ public:
     };
     Q_DECLARE_FLAGS(AddMembers, AddMember)
 
-    // ### TODO Qt6: remove me and use the MetaObjectFlags enum from qmetaobject_p.h
-    enum MetaObjectFlag { // keep it in sync with enum MetaObjectFlags from qmetaobject_p.h
-        DynamicMetaObject = 0x01,
-        RequiresVariantMetaObject = 0x02,
-        PropertyAccessInStaticMetaCall = 0x04 // since Qt 5.5, property code is in the static metacall
-    };
-    Q_DECLARE_FLAGS(MetaObjectFlags, MetaObjectFlag)
-
     QMetaObjectBuilder();
     explicit QMetaObjectBuilder(const QMetaObject *prototype, QMetaObjectBuilder::AddMembers members = AllMembers);
     virtual ~QMetaObjectBuilder();
@@ -350,7 +343,6 @@ private:
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QMetaObjectBuilder::AddMembers)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QMetaObjectBuilder::MetaObjectFlags)
 
 QT_END_NAMESPACE
 
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index 2a26f5c4c2..33daaea759 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -193,8 +193,8 @@ void tst_QMetaObjectBuilder::flags()
     QCOMPARE(builder.flags(), 0);
 
     // Set flags
-    builder.setFlags(QMetaObjectBuilder::DynamicMetaObject);
-    QCOMPARE(builder.flags(), QMetaObjectBuilder::DynamicMetaObject);
+    builder.setFlags(DynamicMetaObject);
+    QCOMPARE(builder.flags(), DynamicMetaObject);
 }
 
 void tst_QMetaObjectBuilder::method()
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index caef716656..f9c7636435 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -399,7 +399,7 @@ void tst_QMetaType::registerGadget(const char *name, const QList<GadgetPropertyT
 {
     QMetaObjectBuilder gadgetBuilder;
     gadgetBuilder.setClassName(name);
-    QMetaObjectBuilder::MetaObjectFlags metaObjectflags = QMetaObjectBuilder::DynamicMetaObject | QMetaObjectBuilder::PropertyAccessInStaticMetaCall;
+    MetaObjectFlags metaObjectflags = DynamicMetaObject | PropertyAccessInStaticMetaCall;
     gadgetBuilder.setFlags(metaObjectflags);
     auto dynamicGadgetProperties = std::make_shared<GenericGadgetType>();
     for (const auto &prop : gadgetProperties) {