From 355649ce9d4f320ed4ebb0a31d86427ade43f2ce Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 31 Jul 2009 12:31:45 +1000
Subject: Manual sync with master

---
 src/corelib/kernel/qmetaobject.cpp | 5 +----
 src/tools/moc/generator.cpp        | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 06af451..9ff0bc1 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -161,10 +161,7 @@ enum PropertyFlags  {
     ResolveEditable = 0x00080000,
     User = 0x00100000,
     ResolveUser = 0x00200000,
-    Notify = 0x00400000,
-    Dynamic = 0x00800000,
-    Constant = 0x00000400,
-    Final = 0x00000800
+    Notify = 0x00400000
 };
 
 enum MethodFlags  {
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 8c5c4d3..e3ce2ec 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -68,10 +68,7 @@ enum PropertyFlags  {
     ResolveEditable = 0x00080000,
     User = 0x00100000,
     ResolveUser = 0x00200000,
-    Notify = 0x00400000,
-    Dynamic = 0x00800000,
-    Constant = 0x00000400,
-    Final = 0x00000800
+    Notify = 0x00400000
 };
 
 enum MethodFlags {
-- 
cgit v0.12