summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl.cpp
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2010-04-27 09:16:10 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2010-04-27 11:45:59 (GMT)
commit939fdb8f03b998996e532cb89c8e522565c1aecc (patch)
tree0565fdf1f64b6bef2366039832a83863431ba456 /src/opengl/qgl.cpp
parent62f952daa97d7a85d62f839bef2a3d015e7bb9e0 (diff)
downloadQt-939fdb8f03b998996e532cb89c8e522565c1aecc.zip
Qt-939fdb8f03b998996e532cb89c8e522565c1aecc.tar.gz
Qt-939fdb8f03b998996e532cb89c8e522565c1aecc.tar.bz2
Fix crash when using opengl graphicssystem on desktop
Reviewed-By: Eskil Task-number: QTBUG-10225
Diffstat (limited to 'src/opengl/qgl.cpp')
-rw-r--r--src/opengl/qgl.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 72ed6be..52efea5 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2774,8 +2774,8 @@ void QGLContext::drawTexture(const QRectF &target, GLuint textureId, GLenum text
if (!eng->isNativePaintingActive()) {
QRectF src(0, 0, target.width(), target.height());
QSize size(target.width(), target.height());
- eng->drawTexture(target, textureId, size, src);
- return;
+ if (eng->drawTexture(target, textureId, size, src))
+ return;
}
}
@@ -2850,8 +2850,8 @@ void QGLContext::drawTexture(const QPointF &point, GLuint textureId, GLenum text
QRectF dest(point, QSizeF(textureWidth, textureHeight));
QRectF src(0, 0, textureWidth, textureHeight);
QSize size(textureWidth, textureHeight);
- eng->drawTexture(dest, textureId, size, src);
- return;
+ if (eng->drawTexture(dest, textureId, size, src))
+ return;
}
}