diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-09 16:04:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-09 16:04:21 (GMT) |
| commit | bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c (patch) | |
| tree | 063b724a9b17c814c49b2ead876d795e0f559db7 /src/gui/image | |
| parent | 1e9b107b082282d4aadcffedcd67cb7e5e56aef8 (diff) | |
| parent | dc6b5702e0c488bf51ca029290eb65604bfb1dd5 (diff) | |
| download | Qt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.zip Qt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.tar.gz Qt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/image')
| -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 f896572..d9344ce 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -2012,7 +2012,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; |