diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 03:57:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 03:57:09 (GMT) |
| commit | 5c36cc0ba648d5efa7592e86d49b23086cdbb8ff (patch) | |
| tree | 56f2542c565e5fb792ac8cc13446f4bd0ee50b3c /src/gui/image/qpixmap.cpp | |
| parent | 051fd1b23e4d7e45b8600571ab6b80afca6f62d9 (diff) | |
| parent | bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c (diff) | |
| download | Qt-5c36cc0ba648d5efa7592e86d49b23086cdbb8ff.zip Qt-5c36cc0ba648d5efa7592e86d49b23086cdbb8ff.tar.gz Qt-5c36cc0ba648d5efa7592e86d49b23086cdbb8ff.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix unstable qdeclarativeflickable test.
Fix possible bearer management Crash with Panic E32USER-CBase, 69
Update TextEdit's visible selection when only the anchor changes.
Fixed memory leak in GL texture cache with QRuntimePixmapData.
QNetworkCookie: fix quoted values
Fix for QTBUG-17746. Quotes is retained in cookie value
Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
Set correct initial value for TextEdit and TextInput canPaste property
Fixed unescaped backslashes in testcase.prf
Fix `make check' for debug-and-release on Windows.
Move `check' target for autotests into testcase.prf
Revert "Backporting TESTARGS feature from 4.7"
Backporting TESTARGS feature from 4.7
Update copyright year to 2011.
embed copyright information in QtAssistantClient4.dll
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
| -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 021f281..6e13324 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -2010,7 +2010,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; |