diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-08 22:19:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-08 22:19:27 (GMT) |
| commit | 4dd45d7fe3064aa92c6c37f84c1ff0104495f328 (patch) | |
| tree | 1a458ff93a6b29f0a9cb7687e3b33d56d4063a03 | |
| parent | aea684027cb0c0fa75dd3f3f72b1dc88bdf39c2c (diff) | |
| parent | 67685447509302a4e5f3a008f0ec564d169c737b (diff) | |
| download | Qt-4dd45d7fe3064aa92c6c37f84c1ff0104495f328.zip Qt-4dd45d7fe3064aa92c6c37f84c1ff0104495f328.tar.gz Qt-4dd45d7fe3064aa92c6c37f84c1ff0104495f328.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed memory leak in GL texture cache with QRuntimePixmapData.
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 2 |
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; |