diff options
| author | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-05-12 15:10:58 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-05-12 15:10:58 (GMT) |
| commit | 0fd9d9ca457aa3e400188214f79830cd853e6348 (patch) | |
| tree | 0da5fd2205b79a778525788f6ff56c261a83ea30 /src/opengl | |
| parent | 812f78e55aa3db4d51ec8617320358d80c4a71d5 (diff) | |
| download | Qt-0fd9d9ca457aa3e400188214f79830cd853e6348.zip Qt-0fd9d9ca457aa3e400188214f79830cd853e6348.tar.gz Qt-0fd9d9ca457aa3e400188214f79830cd853e6348.tar.bz2 | |
Remove an unnecessary assert.
Reviewed-by: Kim
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index a3c1bac..7c457de 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1723,7 +1723,6 @@ QGLTextureCache::QGLTextureCache() QGLTextureCache::~QGLTextureCache() { - Q_ASSERT(size() == 0); QImagePixmapCleanupHooks::instance()->removePixmapDataModificationHook(cleanupTexturesForPixampData); QImagePixmapCleanupHooks::instance()->removePixmapDataDestructionHook(cleanupBeforePixmapDestruction); QImagePixmapCleanupHooks::instance()->removeImageHook(cleanupTexturesForCacheKey); @@ -2888,7 +2887,7 @@ void QGLContext::drawTexture(const QPointF &point, GLuint textureId, GLenum text glGetTexLevelParameteriv(textureTarget, 0, GL_TEXTURE_WIDTH, &textureWidth); glGetTexLevelParameteriv(textureTarget, 0, GL_TEXTURE_HEIGHT, &textureHeight); - if (d_ptr->active_engine && + if (d_ptr->active_engine && d_ptr->active_engine->type() == QPaintEngine::OpenGL2) { QGL2PaintEngineEx *eng = static_cast<QGL2PaintEngineEx*>(d_ptr->active_engine); if (!eng->isNativePaintingActive()) { |