From fd28a6ab14fc3c54c443718d405eeb9f98c7dd27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Mon, 17 Jan 2011 13:11:08 +0100 Subject: Remove Lighthouse specific code from QGLWindowSurface --- src/opengl/qwindowsurface_gl.cpp | 8 +------- 1 file changed, 1 insertion(+), 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; -- cgit v0.12