diff options
| -rw-r--r-- | src/declarative/qml/qdeclarativepropertycache_p.h | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickitemview.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h index 3f5de5ada5..d5d7095667 100644 --- a/src/declarative/qml/qdeclarativepropertycache_p.h +++ b/src/declarative/qml/qdeclarativepropertycache_p.h @@ -362,7 +362,7 @@ QDeclarativePropertyCache::overrideData(QDeclarativePropertyData *data) const bool QDeclarativePropertyCache::isAllowedInRevision(QDeclarativePropertyData *data) const { - return (data->hasAccessors() || data->metaObjectOffset == -1 && data->revision == 0) || + return (data->hasAccessors() || (data->metaObjectOffset == -1 && data->revision == 0)) || (allowedRevisionCache[data->metaObjectOffset] >= data->revision); } diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index 57b35214d8..4d7c92ad1c 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -1468,7 +1468,7 @@ bool QQuickItemViewPrivate::canTransition(FxViewItemTransitionManager::Transitio { switch (type) { case FxViewItemTransitionManager::NoTransition: - return false; + break; case FxViewItemTransitionManager::PopulateTransition: return usePopulateTransition && populateTransition && populateTransition->enabled(); @@ -1488,6 +1488,7 @@ bool QQuickItemViewPrivate::canTransition(FxViewItemTransitionManager::Transitio else return removeDisplacedTransition && removeDisplacedTransition->enabled(); } + return false; } bool QQuickItemViewPrivate::hasItemTransitions() const |