diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-02-12 14:59:43 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-04-01 14:32:47 (GMT) |
| commit | e8f91c93de3599309d8fe11fd94318bfdc51d36c (patch) | |
| tree | 2d5b25eec1293e6f1403e3f854a84534ed758ed3 /src/opengl/qwindowsurface_gl.cpp | |
| parent | d2aaca5abc5c2853081b50407fc8ee7756d9ddfa (diff) | |
| download | Qt-e8f91c93de3599309d8fe11fd94318bfdc51d36c.zip Qt-e8f91c93de3599309d8fe11fd94318bfdc51d36c.tar.gz Qt-e8f91c93de3599309d8fe11fd94318bfdc51d36c.tar.bz2 | |
Merge branch 'gl2text' of ..\qt-main
Diffstat (limited to 'src/opengl/qwindowsurface_gl.cpp')
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 3dd3064..bb4ffc5 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -69,7 +69,11 @@ #include <private/qglpixelbuffer_p.h> #include <private/qgraphicssystem_gl_p.h> +#if 1 || defined(QT_OPENGL_ES_2) +#include <private/qpaintengineex_opengl2_p.h> +#else #include <private/qpaintengine_opengl_p.h> +#endif #ifndef GLX_ARB_multisample #define GLX_SAMPLE_BUFFERS_ARB 100000 @@ -283,7 +287,9 @@ void QGLWindowSurface::hijackWindow(QWidget *widget) qDebug() << "hijackWindow() context created for" << widget << d_ptr->contexts.size(); } -#if !defined(QT_OPENGL_ES_2) +#if 1 || defined(QT_OPENGL_ES_2) +Q_GLOBAL_STATIC(QGL2PaintEngineEx, qt_gl_window_surface_paintengine) +#else Q_GLOBAL_STATIC(QOpenGLPaintEngine, qt_gl_window_surface_paintengine) #endif |