summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativepropertycache_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-01-05 03:57:17 (GMT)
committerMartin Jones <martin.jones@nokia.com>2011-01-05 03:57:17 (GMT)
commitffd499eb6ff64df1833625f64dbbf92e0e0746d4 (patch)
treecb1dcd382fe2e76638cf853c96cf0316cce65636 /src/declarative/qml/qdeclarativepropertycache_p.h
parent3f80a24c5d375dd173d18c2a4227301f1afba2e3 (diff)
downloadQt-ffd499eb6ff64df1833625f64dbbf92e0e0746d4.zip
Qt-ffd499eb6ff64df1833625f64dbbf92e0e0746d4.tar.gz
Qt-ffd499eb6ff64df1833625f64dbbf92e0e0746d4.tar.bz2
Support property/method versions in QML
Use metaobject revisioning to exclude properties/revisions added in later versions from interfering with earlier versions. Task-number: QTBUG-13451 Reviewed-by: Aaron Kennedy
Diffstat (limited to 'src/declarative/qml/qdeclarativepropertycache_p.h')
-rw-r--r--src/declarative/qml/qdeclarativepropertycache_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h
index f7c5daa..3f7f9ef 100644
--- a/src/declarative/qml/qdeclarativepropertycache_p.h
+++ b/src/declarative/qml/qdeclarativepropertycache_p.h
@@ -110,6 +110,7 @@ public:
int notifyIndex; // When !IsFunction
int relatedIndex; // When IsFunction
};
+ int revision;
static Flags flagsForProperty(const QMetaProperty &, QDeclarativeEngine *engine = 0);
void load(const QMetaProperty &, QDeclarativeEngine *engine = 0);
@@ -176,7 +177,8 @@ bool QDeclarativePropertyCache::Data::operator==(const QDeclarativePropertyCache
return flags == other.flags &&
propType == other.propType &&
coreIndex == other.coreIndex &&
- notifyIndex == other.notifyIndex;
+ notifyIndex == other.notifyIndex &&
+ revision == other.revision;
}
QDeclarativePropertyCache::Data *