diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-17 12:11:08 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-25 18:07:35 (GMT) |
| commit | fd28a6ab14fc3c54c443718d405eeb9f98c7dd27 (patch) | |
| tree | b2634742b948e263e4a17af8b8ac9739b58a3c60 /src/opengl | |
| parent | 9787509be13bfe9e05c4e6f7ab76150edecf133f (diff) | |
| download | Qt-fd28a6ab14fc3c54c443718d405eeb9f98c7dd27.zip Qt-fd28a6ab14fc3c54c443718d405eeb9f98c7dd27.tar.gz Qt-fd28a6ab14fc3c54c443718d405eeb9f98c7dd27.tar.bz2 | |
Remove Lighthouse specific code from QGLWindowSurface
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 6185ff8..ea5e9a7 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -401,11 +401,6 @@ void QGLWindowSurface::hijackWindow(QWidget *widget) if (widgetPrivate->extraData()->glContext) return; -#ifdef Q_WS_QPA - QGLContext *ctx = QGLContext::fromPlatformGLContext(widget->platformWindow()->glContext()); - if (!d_ptr->fbo && d_ptr->tried_fbo) - d_ptr->ctx = ctx; -#else QGLContext *ctx = NULL; // For translucent top-level widgets we need alpha in the format. @@ -418,8 +413,7 @@ void QGLWindowSurface::hijackWindow(QWidget *widget) } else ctx = new QGLContext(surfaceFormat, widget); - ctx->create(qt_gl_share_widget()->context()); -#endif + ctx->create(qt_gl_share_context()); #ifndef QT_NO_EGL static bool checkedForNOKSwapRegion = false; |