aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-11-07 14:39:56 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-09 09:55:01 +0100
commitcc8f0227a4330ea154cd4fa9ada13bf6282475fc (patch)
treebd868963976e2f08cc8b335fe7dba1211e4d2c91 /src
parent3226ae7f0f4edc7e2bcebd0c56a3d63f8f76ac08 (diff)
QDeclarativePixmapCache: Add missing enumeration values and break.
Change-Id: Ia83a4932d50133aaae5d488d7be0df99a75be576 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qtquick1/util/qdeclarativepixmapcache.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/qtquick1/util/qdeclarativepixmapcache.cpp b/src/qtquick1/util/qdeclarativepixmapcache.cpp
index 0b2e16c2ff..f4420cb3af 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