diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-15 04:34:46 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-15 05:52:59 (GMT) |
| commit | f4ad1cc44e3a25d0089d39cdf16820d9fbb2e050 (patch) | |
| tree | 1d28d064b23b6591a32cb55dcf55e229e77f0a72 /src/opengl/qwindowsurface_gl.cpp | |
| parent | e49d92f620313c0921ece291548a8a9c6a809586 (diff) | |
| download | Qt-f4ad1cc44e3a25d0089d39cdf16820d9fbb2e050.zip Qt-f4ad1cc44e3a25d0089d39cdf16820d9fbb2e050.tar.gz Qt-f4ad1cc44e3a25d0089d39cdf16820d9fbb2e050.tar.bz2 | |
Centralize all GL paint engine creations into qt_qgl_paint_engine()
The qt_qgl_paint_engine() function was being used by QWS, but there's
no reason why it can't be used by other platforms too. This should
also fix ES 2.0 paint engine support under QWS, which was stubbed out.
Reviewed-by: Sarah Smith
Reviewed-by: Gunnar
Diffstat (limited to 'src/opengl/qwindowsurface_gl.cpp')
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 7f8577a..b341243 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -283,19 +283,9 @@ int QGLWindowSurfaceGLPaintDevice::metric(PaintDeviceMetric m) const return d->q_ptr->window()->metric(m); } -Q_GLOBAL_STATIC(QGL2PaintEngineEx, qt_gl_window_surface_2_engine) - -#if !defined (QT_OPENGL_ES_2) -Q_GLOBAL_STATIC(QOpenGLPaintEngine, qt_gl_window_surface_engine) -#endif - QPaintEngine *QGLWindowSurfaceGLPaintDevice::paintEngine() const { -#if !defined(QT_OPENGL_ES_2) - if (!qt_gl_preferGL2Engine()) - return qt_gl_window_surface_engine(); -#endif - return qt_gl_window_surface_2_engine(); + return qt_qgl_paint_engine(); } QGLWindowSurface::QGLWindowSurface(QWidget *window) |