From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 7 Nov 2011 13:39:56 +0000 (+0100)
Subject: QDeclarativePixmapCache: Add missing enumeration values and break.
X-Git-Tag: qt-v5.0.0-alpha1~1191
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc8f0227a4330ea154cd4fa9ada13bf6282475fc;p=profile%2Fivi%2Fqtdeclarative.git

QDeclarativePixmapCache: Add missing enumeration values and break.

Change-Id: Ia83a4932d50133aaae5d488d7be0df99a75be576
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---

diff --git a/src/qtquick1/util/qdeclarativepixmapcache.cpp b/src/qtquick1/util/qdeclarativepixmapcache.cpp
index 0b2e16c..f4420cb 100644
--- a/src/qtquick1/util/qdeclarativepixmapcache.cpp
+++ b/src/qtquick1/util/qdeclarativepixmapcache.cpp
@@ -602,7 +602,8 @@ private:
     int m_unreferencedCost;
     int m_timerId;
 };
-Q_GLOBAL_STATIC(QDeclarative1PixmapStore, pixmapStore);
+
+Q_GLOBAL_STATIC(QDeclarative1PixmapStore, pixmapStore)
 
 QDeclarative1PixmapStore::QDeclarative1PixmapStore()
 : m_unreferencedPixmaps(0), m_lastUnreferencedPixmap(0), m_unreferencedCost(0), m_timerId(-1)
@@ -790,6 +791,7 @@ static QDeclarative1PixmapData* createPixmapDataSync(QDeclarativeEngine *engine,
                     return new QDeclarative1PixmapData(url, QPixmap::fromImage(image), readSize, requestSize);
                 }
             }
+            break;
             case QDeclarativeImageProvider::Pixmap:
             {
                 QPixmap pixmap = ep->getPixmapFromProvider(url, &readSize, requestSize);
@@ -798,6 +800,10 @@ static QDeclarative1PixmapData* createPixmapDataSync(QDeclarativeEngine *engine,
                     return new QDeclarative1PixmapData(url, pixmap, readSize, requestSize);
                 }
             }
+            break;
+        case QDeclarativeImageProvider::Texture:
+        case QDeclarativeImageProvider::Invalid:
+            break;
         }
 
         // no matching provider, or provider has bad image type, or provider returned null image