summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-03-07 15:06:49 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-03-07 15:11:19 (GMT)
commit67685447509302a4e5f3a008f0ec564d169c737b (patch)
tree5722440e543bcbdb523e523dd9235be704a968b9
parentd55aa14630bbb4130017f38177b20c850d556371 (diff)
downloadQt-67685447509302a4e5f3a008f0ec564d169c737b.zip
Qt-67685447509302a4e5f3a008f0ec564d169c737b.tar.gz
Qt-67685447509302a4e5f3a008f0ec564d169c737b.tar.bz2
Fixed memory leak in GL texture cache with QRuntimePixmapData.
The cached texture is associated with the QRuntimePixmapData, not to the proxied QPixmapData. Task-number: QT-4655 Reviewed-by: Gunnar Sletta
-rw-r--r--src/gui/image/qpixmap.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 0aefafb..1a83318 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1997,7 +1997,7 @@ void QPixmap::detach()
}
if (data->is_cached && data->ref == 1)
- QImagePixmapCleanupHooks::executePixmapDataModificationHooks(pd);
+ QImagePixmapCleanupHooks::executePixmapDataModificationHooks(data.data());
#if defined(Q_WS_MAC)
QMacPixmapData *macData = id == QPixmapData::MacClass ? static_cast<QMacPixmapData*>(pd) : 0;