From d5d882280fe9577c580d41f1efb5abbd5d57f6dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Tue, 2 Feb 2010 17:57:19 +0100 Subject: Fixed a failure in tst_qgl. The assert wrong, it may be that the texture isn't removed from the cache if it doesn't have the MemoryManaged bind option set. Reviewed-by: Samuel --- src/opengl/qgl.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index dd977cb..fce9fdb 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1683,7 +1683,6 @@ void QGLTextureCache::cleanupBeforePixmapDestruction(QPixmapData* pmd) { // Remove any bound textures first: cleanupTextures(pmd); - Q_ASSERT(instance()->getTexture(pmd->cacheKey()) == 0); #if defined(Q_WS_X11) if (pmd->classId() == QPixmapData::X11Class) { -- cgit v0.12