summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativepixmapcache.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-03-28 22:57:03 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-03-28 22:57:03 (GMT)
commita3868307c0e1584a1f694efc4a7b980b54c6e2b1 (patch)
tree54a19c5b8a357d057a8c9697b8429aed90973f60 /src/declarative/util/qdeclarativepixmapcache.cpp
parent6b619af035a995cf16d977439995cf7c1c0d366e (diff)
downloadQt-a3868307c0e1584a1f694efc4a7b980b54c6e2b1.zip
Qt-a3868307c0e1584a1f694efc4a7b980b54c6e2b1.tar.gz
Qt-a3868307c0e1584a1f694efc4a7b980b54c6e2b1.tar.bz2
Source resizing for QDeclarativeImageProvider too.
(fixes test too)
Diffstat (limited to 'src/declarative/util/qdeclarativepixmapcache.cpp')
-rw-r--r--src/declarative/util/qdeclarativepixmapcache.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index 54dccce..1d90bf8 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -255,7 +255,9 @@ bool QDeclarativeImageRequestHandler::event(QEvent *event)
// fetch
if (url.scheme() == QLatin1String("image")) {
// Use QmlImageProvider
- QImage image = QDeclarativeEnginePrivate::get(engine)->getImageFromProvider(url);
+ QSize read_impsize;
+ QImage image = QDeclarativeEnginePrivate::get(engine)->getImageFromProvider(url, &read_impsize, QSize(runningJob->forcedWidth(),runningJob->forcedHeight()));
+ qmlOriginalSizes()->insert(url, read_impsize);
QDeclarativeImageReaderEvent::ReadError errorCode = QDeclarativeImageReaderEvent::NoError;
QString errorStr;
if (image.isNull()) {