From 61c6f64872a363cbde209e6f9a7cd05e79713c93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Tue, 26 Apr 2011 17:32:02 +0200
Subject: Dont call QPlatformGLContext::makeCurrent from subclass (cherry
 picked from commit fc0a6ab220ab97b8f6acf90bf04b46de513a4d96)

---
 src/plugins/platforms/xcb/qdri2context.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/plugins/platforms/xcb/qdri2context.cpp')

diff --git a/src/plugins/platforms/xcb/qdri2context.cpp b/src/plugins/platforms/xcb/qdri2context.cpp
index dbbfa67d8f..e208769336 100644
--- a/src/plugins/platforms/xcb/qdri2context.cpp
+++ b/src/plugins/platforms/xcb/qdri2context.cpp
@@ -146,7 +146,6 @@ QDri2Context::~QDri2Context()
 
 void QDri2Context::makeCurrent()
 {
-    QPlatformGLContext::makeCurrent();
     Q_D(QDri2Context);
 
     eglMakeCurrent(EGL_DISPLAY_FROM_XCB(d->qXcbWindow),EGL_NO_SURFACE,EGL_NO_SURFACE,d->eglContext);
@@ -156,7 +155,6 @@ void QDri2Context::makeCurrent()
 
 void QDri2Context::doneCurrent()
 {
-    QPlatformGLContext::doneCurrent();
     Q_D(QDri2Context);
     eglMakeCurrent(EGL_DISPLAY_FROM_XCB(d->qXcbWindow),EGL_NO_SURFACE,EGL_NO_SURFACE,EGL_NO_CONTEXT);
 }
-- 
cgit v1.2.3


From 9474f82f8a4ca4abfc349c17debd84f26148fc20 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 7 May 2011 22:25:30 +0200
Subject: QTDIR/src compiles again

---
 src/plugins/platforms/xcb/qdri2context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/plugins/platforms/xcb/qdri2context.cpp')

diff --git a/src/plugins/platforms/xcb/qdri2context.cpp b/src/plugins/platforms/xcb/qdri2context.cpp
index e208769336..8d436f1735 100644
--- a/src/plugins/platforms/xcb/qdri2context.cpp
+++ b/src/plugins/platforms/xcb/qdri2context.cpp
@@ -45,7 +45,7 @@
 #include "qxcbconnection.h"
 
 #include <QtCore/QDebug>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 #include <xcb/dri2.h>
 #include <xcb/xfixes.h>
-- 
cgit v1.2.3


From 6e28e8441b698c3397c2c78125c877f2e9867cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 22 Aug 2011 10:49:28 +0200
Subject: Copy core GL functionality to QtGui with QGL -> QOpenGL naming.

Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855
Reviewed-on: http://codereview.qt.nokia.com/3710
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---
 src/plugins/platforms/xcb/qdri2context.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/platforms/xcb/qdri2context.cpp')

diff --git a/src/plugins/platforms/xcb/qdri2context.cpp b/src/plugins/platforms/xcb/qdri2context.cpp
index 8eef1b6111..5f4aff5455 100644
--- a/src/plugins/platforms/xcb/qdri2context.cpp
+++ b/src/plugins/platforms/xcb/qdri2context.cpp
@@ -134,9 +134,9 @@ QDri2Context::QDri2Context(QXcbWindow *window)
     glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERER,d->depth);
 
     //restore the old current context
-    const QPlatformGLContext *currentContext = QPlatformGLContext::currentContext();
+    const QPlatformOpenGLContext *currentContext = QPlatformOpenGLContext::currentContext();
     if (currentContext)
-        const_cast<QPlatformGLContext*>(currentContext)->makeCurrent();
+        const_cast<QPlatformOpenGLContext*>(currentContext)->makeCurrent();
 }
 
 QDri2Context::~QDri2Context()
-- 
cgit v1.2.3