diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-10-29 13:28:36 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-10-29 14:18:30 (GMT) |
| commit | 4531ffbd8aa2cc0ae656715e449caca1649c18b9 (patch) | |
| tree | 31432fbebde717f08469d77ee88b3de8f97914df /src/opengl/qgl_x11.cpp | |
| parent | 7881773800c05c09f0e85a80c1cbb678981bd6c0 (diff) | |
| download | Qt-4531ffbd8aa2cc0ae656715e449caca1649c18b9.zip Qt-4531ffbd8aa2cc0ae656715e449caca1649c18b9.tar.gz Qt-4531ffbd8aa2cc0ae656715e449caca1649c18b9.tar.bz2 | |
Added QImagePixmapCleanupHooks functions for enabling hooks.
Better than having to befriend QPixmapData and setting is_cached
manually.
Reviewed-by: Tom Cooksey
Diffstat (limited to 'src/opengl/qgl_x11.cpp')
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 86e593d..899047a 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -53,6 +53,7 @@ #include <private/qfontengine_ft_p.h> #include <private/qt_x11_p.h> #include <private/qpixmap_x11_p.h> +#include <private/qimagepixmapcleanuphooks_p.h> #ifdef Q_OS_HPUX // for GLXPBuffer #include <private/qglpixelbuffer_p.h> @@ -1704,7 +1705,7 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmapData *pmd, con pixmapData->gl_surface = (Qt::HANDLE)glxPixmap; // Make sure the cleanup hook gets called so we can delete the glx pixmap - pixmapData->is_cached = true; + QImagePixmapCleanupHooks::enableCleanupHooks(pixmapData); } GLuint textureId; |