diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2009-08-28 11:28:43 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond@trolltech.com> | 2009-08-28 13:47:02 (GMT) |
| commit | 033725f5947d4a4e0c21f426664851b42b164d08 (patch) | |
| tree | cec7e8b079de65251ce5ac099304068b95f32103 /src/opengl/qglframebufferobject.cpp | |
| parent | df66f388bb135d7f22632d7d98ffa0e4d8a417f3 (diff) | |
| download | Qt-033725f5947d4a4e0c21f426664851b42b164d08.zip Qt-033725f5947d4a4e0c21f426664851b42b164d08.tar.gz Qt-033725f5947d4a4e0c21f426664851b42b164d08.tar.bz2 | |
Fixed QGLWidget::renderText() when using the GL 2 paint engine.
QGLWidget::renderText() needs to respect the current depth and scissor
tests that the user has set. Therefore we needs some special casing in
the GL 2 paint engine to handle the custom depth testing. The private
setRenderTextActive() has been added for this purpose.
Reviewed-by: Samuel
Diffstat (limited to 'src/opengl/qglframebufferobject.cpp')
| -rw-r--r-- | src/opengl/qglframebufferobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index 0db5659..2b38e3d 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -896,7 +896,7 @@ QPaintEngine *QGLFramebufferObject::paintEngine() const return qt_buffer_2_engine(); #else Q_D(const QGLFramebufferObject); - if (d->ctx->d_func()->internal_context || qt_gl_preferGL2Engine()) + if (qt_gl_preferGL2Engine()) return qt_buffer_2_engine(); else return qt_buffer_engine(); |