From 0e5b3473cfade52d7a8a28ccef77ff0553b54672 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 5 Jan 2016 17:02:05 +0200 Subject: [PATCH] sync PropertyFlags and MethodFlags Signed-off-by: Ivailo Monev --- src/core/kernel/qmetaobject_p.h | 2 +- src/dbus/qdbusmetaobject.cpp | 15 ++++++++++----- src/declarative/qml/qmetaobjectbuilder.cpp | 9 ++++----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/core/kernel/qmetaobject_p.h b/src/core/kernel/qmetaobject_p.h index f5d80c730..6f3eaf574 100644 --- a/src/core/kernel/qmetaobject_p.h +++ b/src/core/kernel/qmetaobject_p.h @@ -65,7 +65,7 @@ enum PropertyFlags { Resettable = 0x00000004, EnumOrFlag = 0x00000008, StdCppSet = 0x00000100, -// Override = 0x00000200, + // Override = 0x00000200, Constant = 0x00000400, Final = 0x00000800, Designable = 0x00001000, diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 5c3de0918..a742fb02a 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -96,7 +96,9 @@ private: Resettable = 0x00000004, EnumOrFlag = 0x00000008, StdCppSet = 0x00000100, - // Override = 0x00000200, + // Override = 0x00000200, + Constant = 0x00000400, + Final = 0x00000800, Designable = 0x00001000, ResolveDesignable = 0x00002000, Scriptable = 0x00004000, @@ -106,7 +108,9 @@ private: Editable = 0x00040000, ResolveEditable = 0x00080000, User = 0x00100000, - ResolveUser = 0x00200000 + ResolveUser = 0x00200000, + Notify = 0x00400000, + Revisioned = 0x00800000 }; enum MethodFlags { @@ -118,11 +122,12 @@ private: MethodMethod = 0x00, MethodSignal = 0x04, MethodSlot = 0x08, + MethodConstructor = 0x0c, MethodTypeMask = 0x0c, - MethodCompatibility = 0x10, - MethodCloned = 0x20, - MethodScriptable = 0x40 + MethodCloned = 0x10, + MethodScriptable = 0x20, + MethodRevisioned = 0x40 }; QMap methods; diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp index 7c6367a07..cbb4d4b24 100644 --- a/src/declarative/qml/qmetaobjectbuilder.cpp +++ b/src/declarative/qml/qmetaobjectbuilder.cpp @@ -102,7 +102,7 @@ enum PropertyFlags { Resettable = 0x00000004, EnumOrFlag = 0x00000008, StdCppSet = 0x00000100, -// Override = 0x00000200, + // Override = 0x00000200, Constant = 0x00000400, Final = 0x00000800, Designable = 0x00001000, @@ -131,10 +131,9 @@ enum MethodFlags { MethodConstructor = 0x0c, MethodTypeMask = 0x0c, - MethodCompatibility = 0x10, - MethodCloned = 0x20, - MethodScriptable = 0x40, - MethodRevisioned = 0x80 + MethodCloned = 0x10, + MethodScriptable = 0x20, + MethodRevisioned = 0x40 }; struct QMetaObjectPrivate -- 2.11.0