diff options
Diffstat (limited to 'src/corelib/kernel/qmetaobject_p.h')
| -rw-r--r-- | src/corelib/kernel/qmetaobject_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 434ef84808..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 @@ -171,7 +173,8 @@ class QMutex; struct QMetaObjectPrivate { // revision 7 is Qt 5.0 everything lower is not supported - enum { OutputRevision = 7 }; // Used by moc, qmetaobjectbuilder and qdbus + // revision 8 is Qt 5.12: It adds the enum name to QMetaEnum + enum { OutputRevision = 8 }; // Used by moc, qmetaobjectbuilder and qdbus int revision; int className; |