Changes: use QGLContext instead of QGLWidget in MGLES2Renderer

RevBy: Peter Penz

Details:
With the meego graphicssystem the QGLWidget will be gone. We just
have a QGLContext then. To prepare for this change, avoid code
duplication and as MGLES2Renderer just extracts the QGLContext from
the QGLWidget anyway we directly hand over a QGLContext to the
renderer.

2 files changed, 6 insertions, 3 deletions

diff --git a/benchmarks/pt_mgles2renderer/pt_mgles2renderer.cpp b/benchmarks/pt_mgles2renderer/pt_mgles2renderer.cpp
index bdde9045..086ed779 100644
--- a/benchmarks/pt_mgles2renderer/pt_mgles2renderer.cpp
+++ b/benchmarks/pt_mgles2renderer/pt_mgles2renderer.cpp
@@ -29,6 +29,7 @@
 void Pt_MGLES2Renderer::initTestCase()
 {
     glWidget = new QGLWidget();
+    glContext = const_cast<QGLContext*>(glWidget->context());
     painter = new QPainter();
 }
 
@@ -41,14 +42,14 @@ void Pt_MGLES2Renderer::cleanupTestCase()
 void Pt_MGLES2Renderer::firstInstanceCall()
 {
     MBENCHMARK_ONCE (
-        MGLES2Renderer::instance(glWidget);
+        MGLES2Renderer::instance(glContext);
     )
 }
 
 void Pt_MGLES2Renderer::activate()
 {
     MBENCHMARK_ONCE (
-        MGLES2Renderer::activate(glWidget);
+        MGLES2Renderer::activate(glContext);
     )
 }
 
@@ -90,7 +91,7 @@ void Pt_MGLES2Renderer::end2()
 void Pt_MGLES2Renderer::destroy()
 {
     MBENCHMARK_ONCE (
-        MGLES2Renderer::destroy(glWidget);
+        MGLES2Renderer::destroy(glContext);
     )
 }
 
diff --git a/benchmarks/pt_mgles2renderer/pt_mgles2renderer.h b/benchmarks/pt_mgles2renderer/pt_mgles2renderer.h
index 92ac12b4..91ed7c7f 100644
--- a/benchmarks/pt_mgles2renderer/pt_mgles2renderer.h
+++ b/benchmarks/pt_mgles2renderer/pt_mgles2renderer.h
@@ -25,6 +25,7 @@
 class QGLWidget;
 class MGLES2Renderer;
 class QPainter;
+class QGLContext;
 
 class Pt_MGLES2Renderer : public QObject
 {
@@ -59,6 +60,7 @@ private slots:
 
 private:
     QGLWidget *glWidget;
+    QGLContext *glContext;
     QPainter *painter;
 };