diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2018-08-24 11:23:47 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2018-08-30 05:12:01 +0000 |
| commit | 19b12ac9c21f4dd079e482c4ed926f51c1776e52 (patch) | |
| tree | 21096a8befe47c8492b65a58bf9642d2b019e895 /src/corelib/kernel/qmetaobjectbuilder_p.h | |
| parent | c2165f891c1a4380fdbf3bbf7af4696dc863cb99 (diff) | |
Update QMetaObjectBuilder::MetaObjectFlag enum
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>
Diffstat (limited to 'src/corelib/kernel/qmetaobjectbuilder_p.h')
| -rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
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) |