From dee897be8d8a9bbb67f654cee89337af6db09872 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 31 Jul 2009 10:58:21 +1000
Subject: Reorder flag values in ascending order
Reviewed-by: Roberto Raggi
---
src/corelib/kernel/qmetaobject.cpp | 8 ++++----
src/tools/moc/generator.cpp | 7 ++++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index fc17e00..fb59b98 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -148,7 +148,9 @@ enum PropertyFlags {
Resettable = 0x00000004,
EnumOrFlag = 0x00000008,
StdCppSet = 0x00000100,
-// Override = 0x00000200,
+// Override = 0x00000200,
+ Constant = 0x00000400,
+ Final = 0x00000800,
Designable = 0x00001000,
ResolveDesignable = 0x00002000,
Scriptable = 0x00004000,
@@ -160,9 +162,7 @@ enum PropertyFlags {
User = 0x00100000,
ResolveUser = 0x00200000,
Notify = 0x00400000,
- Dynamic = 0x00800000,
- Constant = 0x00000400,
- Final = 0x00000800
+ Dynamic = 0x00800000
};
enum MethodFlags {
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 6df762d..dd31336 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -56,6 +56,8 @@ enum PropertyFlags {
EnumOrFlag = 0x00000008,
StdCppSet = 0x00000100,
// Override = 0x00000200,
+ Constant = 0x00000400,
+ Final = 0x00000800,
Designable = 0x00001000,
ResolveDesignable = 0x00002000,
Scriptable = 0x00004000,
@@ -67,10 +69,9 @@ enum PropertyFlags {
User = 0x00100000,
ResolveUser = 0x00200000,
Notify = 0x00400000,
- Dynamic = 0x00800000,
- Constant = 0x00000400,
- Final = 0x00000800
+ Dynamic = 0x00800000
};
+
enum MethodFlags {
AccessPrivate = 0x00,
AccessProtected = 0x01,
--
cgit v0.12