From 19b12ac9c21f4dd079e482c4ed926f51c1776e52 Mon Sep 17 00:00:00 2001 From: BogDan Vatra 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 Reviewed-by: Mårten Nordheim --- src/corelib/kernel/qmetaobject_p.h | 4 +++- src/corelib/kernel/qmetaobjectbuilder_p.h | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/corelib') 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 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) -- cgit v1.2.3