diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-02-08 15:18:58 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-02-08 15:18:58 (GMT) |
| commit | 253fa790177483f7c7e3767f7cc83bc0781f1d18 (patch) | |
| tree | a5fcf37dc1c481d727d8881db9b5113d9eeda9eb | |
| parent | 379fedb59934fae63618f50ea327369c17a214db (diff) | |
| parent | c624935a958783d3314fe6c2f6845e6b51a97f95 (diff) | |
| download | Qt-253fa790177483f7c7e3767f7cc83bc0781f1d18.zip Qt-253fa790177483f7c7e3767f7cc83bc0781f1d18.tar.gz Qt-253fa790177483f7c7e3767f7cc83bc0781f1d18.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
| -rw-r--r-- | src/opengl/qglpixmapfilter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp index 37bb7c0..d5a11d9 100644 --- a/src/opengl/qglpixmapfilter.cpp +++ b/src/opengl/qglpixmapfilter.cpp @@ -394,6 +394,7 @@ void QGLBlurTextureCache::insertBlurTextureInfo(const QPixmap &pixmap, QGLBlurTe static bool hookAdded = false; if (!hookAdded) { QImagePixmapCleanupHooks::instance()->addPixmapDataDestructionHook(pixmapDestroyed); + QImagePixmapCleanupHooks::instance()->addPixmapDataModificationHook(pixmapDestroyed); hookAdded = true; } |