summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-02-03 01:24:30 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2011-02-03 01:24:30 (GMT)
commit1ee195424a5f1430b08929c79f7f5d118a814212 (patch)
treee784e1bdc24551dfa2d66efbc9e9cf10beb4f884
parente44f8f098c8213e7f2b50c6a9b8c222b3a23b6a9 (diff)
downloadQt-1ee195424a5f1430b08929c79f7f5d118a814212.zip
Qt-1ee195424a5f1430b08929c79f7f5d118a814212.tar.gz
Qt-1ee195424a5f1430b08929c79f7f5d118a814212.tar.bz2
Correct assert
-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));