Prevented leak of keys in QPixmapCache.

Removing a pixmap from the pixmap cache using the new QPixmapCache::Key
API left the keys dangling in the QCache's internal QHash. The problem
is that the Key is invalidated as soon as the QPixmapCacheEntry is
destroyed, thus removing it from the hash failed. Reordering the
destruction of the object and the removal of the key in QHash fixes the
problem.

Reviewed-by: Alexis
Reviewed-by: Thiago

1 files changed, 5 insertions, 0 deletions

diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index b0b7d72..b7b29d7 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -424,6 +424,11 @@ QPixmapCache::KeyData* QPMCache::getKeyData(QPixmapCache::Key *key)
 
 Q_GLOBAL_STATIC(QPMCache, pm_cache)
 
+int Q_AUTOTEST_EXPORT q_QPixmapCache_keyHashSize()
+{
+    return pm_cache()->size();
+}
+
 QPixmapCacheEntry::~QPixmapCacheEntry()
 {
     pm_cache()->releaseKey(key);