From bb3ae9779730b6d4a0442ea5553b0dfab1a3da2b Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 24 Jun 2010 10:31:41 +1000
Subject: Ensure sourcesize is in pixmap cache key.

Task-number: QTBUG-11645
---
 src/declarative/util/qdeclarativepixmapcache.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index a4ddf46..0a14462 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -510,6 +510,12 @@ bool QDeclarativePixmapReply::event(QEvent *event)
             else
                 d->errorString =  de->errorString;
             QByteArray key = d->url.toEncoded(QUrl::FormattingOption(0x100));
+            if (d->forced_width > 0 || d->forced_height > 0) {
+                key += ':';
+                key += QByteArray::number(d->forced_width);
+                key += 'x';
+                key += QByteArray::number(d->forced_height);
+            }
             QString strKey = QString::fromLatin1(key.constData(), key.count());
             QPixmapCache::insert(strKey, d->pixmap); // note: may fail (returns false)
             emit finished();
-- 
cgit v0.12