diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-17 12:03:24 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-17 12:15:31 +0200 |
| commit | a957a88542ada1c960b2f1b17284c7d813284fc1 (patch) | |
| tree | 512f6485f4093159aefde08c4cb42b0d13358d76 /src/opengl/qgl.cpp | |
| parent | 78056064cc4e99162d1c4d82db36b5102d524f55 (diff) | |
compile after removal of OpenGL 1 paint engine
Change-Id: Idf030ef627329f940e8a1e0a2b98d49b11e8446c
Reviewed-on: http://codereview.qt.nokia.com/3087
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 25adf0bade..8ef1fc38e5 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -4394,9 +4394,6 @@ void QGLWidget::renderText(int x, int y, const QString &str, const QFont &font, return; } - // this changes what paintEngine() returns - qgl_engine_selector()->setPreferredPaintEngine(QPaintEngine::OpenGL); - engine = paintEngine(); QPainter *p; bool reuse_painter = false; if (engine->isActive()) { @@ -4495,9 +4492,6 @@ void QGLWidget::renderText(double x, double y, double z, const QString &str, con return; } - // this changes what paintEngine() returns - qgl_engine_selector()->setPreferredPaintEngine(QPaintEngine::OpenGL); - engine = paintEngine(); QPainter *p; bool reuse_painter = false; bool use_depth_testing = glIsEnabled(GL_DEPTH_TEST); |