diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-02-07 13:33:22 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-20 08:34:28 +0100 |
| commit | d25ff859591c2450606c56cfc2cebd577165e1b6 (patch) | |
| tree | 46bcdae5ccab6b85dc50c60c7cec8fa5bd701ec8 /src/declarative/qml/qdeclarativepropertycache.cpp | |
| parent | 6b775ffda38549bc9d76b6374dd9604115868a18 (diff) | |
Reduce size of QDeclarativePropertyData
Accessors cannot overload properties and are not available on value
types so can be safely union'd together.
Change-Id: Iae34f8b2935d010ca43365238a7514c0e26953f0
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativepropertycache.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativepropertycache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp index fb9beee55a..c8bfd98363 100644 --- a/src/declarative/qml/qdeclarativepropertycache.cpp +++ b/src/declarative/qml/qdeclarativepropertycache.cpp @@ -534,8 +534,8 @@ void QDeclarativePropertyCache::append(QDeclarativeEngine *engine, const QMetaOb QDeclarativeAccessorProperties::Property *accessorProperty = accessorProperties.property(str); - // Fast properties may not be overrides - Q_ASSERT(accessorProperty == 0 || old == 0); + // Fast properties may not be overrides or revisioned + Q_ASSERT(accessorProperty == 0 || (old == 0 && data->revision == 0)); if (accessorProperty) { data->flags |= QDeclarativePropertyData::HasAccessors; |