aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-02-20 17:05:26 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-21 01:21:41 +0100
commit17307fcf18e34e6fce55c17d54c425beaac78f0d (patch)
treeb4527ef8b075e91d8c9bcd581ea08f1cd8687232 /src
parent2cbb17a0535a099ae33b125bc6a81d2f2932563d (diff)
Fix gcc compiler warnings.
Change-Id: I22d0a45bdcf68c454af0aab9fa62dd2d126d63c2 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativepropertycache_p.h2
-rw-r--r--src/quick/items/qquickitemview.cpp3
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