summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-02-03 03:13:45 (GMT)
committerMartin Jones <martin.jones@nokia.com>2011-02-03 03:13:45 (GMT)
commitbcf8fd776778823715f2bc479374b8728f9230c0 (patch)
tree24e8a579325e28b4a47621e2390d4b7842ae0e0f /src
parent20af4d6777f827eb347ee6c167f67cc2d5dad0a5 (diff)
parent1ee195424a5f1430b08929c79f7f5d118a814212 (diff)
downloadQt-bcf8fd776778823715f2bc479374b8728f9230c0.zip
Qt-bcf8fd776778823715f2bc479374b8728f9230c0.tar.gz
Qt-bcf8fd776778823715f2bc479374b8728f9230c0.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativeengine_p.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 1cc9dc5..88b4e80 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -374,9 +374,8 @@ The returned cache is not referenced, so if it is to be stored, call addref().
QDeclarativePropertyCache *QDeclarativeEnginePrivate::cache(QDeclarativeType *type, int minorVersion, QDeclarativeError &error)
{
Q_ASSERT(type);
- Q_ASSERT(minorVersion >= 0);
- if (!type->containsRevisionedAttributes())
+ if (minorVersion == -1 || !type->containsRevisionedAttributes())
return cache(type->metaObject());
QDeclarativePropertyCache *rv = typePropertyCache.value(qMakePair(type, minorVersion));