From 19b12ac9c21f4dd079e482c4ed926f51c1776e52 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Fri, 24 Aug 2018 11:23:47 +0300
Subject: Update QMetaObjectBuilder::MetaObjectFlag enum
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Synced QMetaObjectBuilder::MetaObjectFlag with the MetaObjectFlags enum
from qmetaobject_p.h. Also added a few comments for Qt 6.

Change-Id: Ieccd5cf8d512a6bf7256b2f4db88d45662774536
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/kernel/qmetaobject_p.h                    | 4 +++-
 src/corelib/kernel/qmetaobjectbuilder_p.h             | 7 +++++--
 tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 +---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h
index 4df9a8de77..522bd78e42 100644
--- a/src/corelib/kernel/qmetaobject_p.h
+++ b/src/corelib/kernel/qmetaobject_p.h
@@ -60,6 +60,8 @@
 #include <QtCore/qvarlengtharray.h>
 
 QT_BEGIN_NAMESPACE
+// ### TODO Qt6: add a proper namespace with Q_NAMESPACE and use scoped enums
+// A namespace and scoped are needed to avoid enum clashes
 
 enum PropertyFlags  {
     Invalid = 0x00000000,
@@ -103,7 +105,7 @@ enum MethodFlags  {
     MethodRevisioned = 0x80
 };
 
-enum MetaObjectFlags {
+enum MetaObjectFlags { // keep it in sync with QMetaObjectBuilder::MetaObjectFlag enum
     DynamicMetaObject = 0x01,
     RequiresVariantMetaObject = 0x02,
     PropertyAccessInStaticMetaCall = 0x04 // since Qt 5.5, property code is in the static metacall
diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/corelib/kernel/qmetaobjectbuilder_p.h
index 781d206e0b..115ec835aa 100644
--- a/src/corelib/kernel/qmetaobjectbuilder_p.h
+++ b/src/corelib/kernel/qmetaobjectbuilder_p.h
@@ -93,8 +93,11 @@ public:
     };
     Q_DECLARE_FLAGS(AddMembers, AddMember)
 
-    enum MetaObjectFlag {
-        DynamicMetaObject = 0x01
+    // ### 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)
 
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index fdf3bb541e..5d9b5ca95c 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -29,7 +29,6 @@
 
 #include <QtCore>
 #include <QtTest/QtTest>
-#include <QtCore/private/qmetaobject_p.h>
 #include <QtCore/private/qmetaobjectbuilder_p.h>
 
 #include "tst_qmetatype.h"
@@ -286,8 +285,7 @@ void tst_QMetaType::registerGadget(const char *name, const QVector<GadgetPropert
 {
     QMetaObjectBuilder gadgetBuilder;
     gadgetBuilder.setClassName(name);
-    QMetaObjectBuilder::MetaObjectFlags metaObjectflags = QMetaObjectBuilder::DynamicMetaObject;
-    metaObjectflags |= QMetaObjectBuilder::MetaObjectFlags(PropertyAccessInStaticMetaCall);
+    QMetaObjectBuilder::MetaObjectFlags metaObjectflags = QMetaObjectBuilder::DynamicMetaObject | QMetaObjectBuilder::PropertyAccessInStaticMetaCall;
     gadgetBuilder.setFlags(metaObjectflags);
     auto dynamicGadgetProperties = std::make_shared<GenericGadgetType>();
     for (const auto &prop : gadgetProperties) {
-- 
cgit v1.2.3