diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-10 15:50:55 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-10 15:50:55 (GMT) |
| commit | 1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed (patch) | |
| tree | c22f6a63c2911d52ecc11aec8662d2f682d6afda /src/opengl/qgl_p.h | |
| parent | 492f1f4267074525e33fb8571c12d520e92163a6 (diff) | |
| parent | b7af368e86874d71ffc9071c9ef009814d6a3467 (diff) | |
| download | Qt-1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed.zip Qt-1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed.tar.gz Qt-1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index d17db3a..18fc9c2 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -520,7 +520,7 @@ public: QSize bindCompressedTexturePVR(const char *buf, int len); }; -class QGLTextureCache { +class Q_AUTOTEST_EXPORT QGLTextureCache { public: QGLTextureCache(); ~QGLTextureCache(); @@ -537,11 +537,8 @@ public: static QGLTextureCache *instance(); static void deleteIfEmpty(); static void imageCleanupHook(qint64 cacheKey); - static void cleanupTextures(QPixmap* pixmap); -#ifdef Q_WS_X11 - // X11 needs to catch pixmap data destruction to delete EGL/GLX pixmap surfaces - static void cleanupPixmapSurfaces(QPixmap* pixmap); -#endif + static void cleanupTextures(QPixmapData* pixmap); + static void cleanupBeforePixmapDestruction(QPixmapData* pixmap); private: QCache<qint64, QGLTexture> m_cache; |