Cache reset'ability

2 files changed, 12 insertions, 9 deletions

diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp
index 77a3a47..51753b8 100644
--- a/src/declarative/qml/qmlpropertycache.cpp
+++ b/src/declarative/qml/qmlpropertycache.cpp
@@ -61,6 +61,8 @@ void QmlPropertyCache::Data::load(const QMetaProperty &p, QmlEngine *engine)
         flags |= Data::IsConstant;
     if (p.isWritable())
         flags |= Data::IsWritable;
+    if (p.isResettable())
+        flags |= Data::IsResettable;
 
     if (propType == qMetaTypeId<QmlBinding *>()) {
         flags |= Data::IsQmlBinding;
diff --git a/src/declarative/qml/qmlpropertycache_p.h b/src/declarative/qml/qmlpropertycache_p.h
index 8c3b75e..8d54e35 100644
--- a/src/declarative/qml/qmlpropertycache_p.h
+++ b/src/declarative/qml/qmlpropertycache_p.h
@@ -80,19 +80,20 @@ public:
                     // Can apply to all properties, except IsFunction
                     IsConstant        = 0x00000001,
                     IsWritable        = 0x00000002,
+                    IsResettable      = 0x00000004,
 
                     // These are mutualy exclusive
-                    IsFunction        = 0x00000004,
-                    IsQObjectDerived  = 0x00000008,
-                    IsEnumType        = 0x00000010,
-                    IsQmlList         = 0x00000020,
-                    IsQList           = 0x00000040,
-                    IsQmlBinding      = 0x00000080,
-                    IsQScriptValue    = 0x00000100,
+                    IsFunction        = 0x00000008,
+                    IsQObjectDerived  = 0x00000010,
+                    IsEnumType        = 0x00000020,
+                    IsQmlList         = 0x00000040,
+                    IsQList           = 0x00000080,
+                    IsQmlBinding      = 0x00000100,
+                    IsQScriptValue    = 0x00000200,
 
                     // Apply only to IsFunctions
-                    IsVMEFunction     = 0x00000200,
-                    HasArguments      = 0x00000400
+                    IsVMEFunction     = 0x00000400,
+                    HasArguments      = 0x00000800
 
         };
         Q_DECLARE_FLAGS(Flags, Flag)