Fix gcc compiler warnings.

Change-Id: I22d0a45bdcf68c454af0aab9fa62dd2d126d63c2
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h
index 3f5de5a..d5d7095 100644 (file)
--- 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 57b3521..4d7c92a 100644 (file)
--- 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