summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond@trolltech.com>2010-02-02 16:57:19 (GMT)
committerTrond Kjernåsen <trond@trolltech.com>2010-02-02 16:57:19 (GMT)
commitd5d882280fe9577c580d41f1efb5abbd5d57f6dd (patch)
tree72665c2ad3234328f9d23415756b56f6aadc0269 /src
parent85578c6c37d9e4eb0da888937b20ba93a26d8805 (diff)
downloadQt-d5d882280fe9577c580d41f1efb5abbd5d57f6dd.zip
Qt-d5d882280fe9577c580d41f1efb5abbd5d57f6dd.tar.gz
Qt-d5d882280fe9577c580d41f1efb5abbd5d57f6dd.tar.bz2
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
Diffstat (limited to 'src')
-rw-r--r--src/opengl/qgl.cpp1
1 files changed, 0 insertions, 1 deletions
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) {