From c845f1ed4c35e8a626389a415a56b07d6b5b83f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Nilsen?= <bjorn.nilsen@nokia.com>
Date: Wed, 23 Jun 2010 14:33:49 +0200
Subject: Compile openkode plugin.

Reviewed-by: jorgen
---
 .../platforms/openkode/qopenkodeglintegration.cpp  | 22 ----------------------
 .../platforms/openkode/qopenkodeglintegration.h    | 13 +------------
 .../platforms/openkode/qopenkodeintegration.cpp    |  6 +-----
 .../platforms/openkode/qopenkodeintegration.h      |  2 +-
 4 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/src/plugins/platforms/openkode/qopenkodeglintegration.cpp b/src/plugins/platforms/openkode/qopenkodeglintegration.cpp
index b0d901b..7223538 100644
--- a/src/plugins/platforms/openkode/qopenkodeglintegration.cpp
+++ b/src/plugins/platforms/openkode/qopenkodeglintegration.cpp
@@ -147,28 +147,6 @@ void qt_glformat_from_eglconfig(QGLFormat& format, const EGLConfig config)
     eglGetError();
 }
 
-QEGLPlatformWidgetSurface::QEGLPlatformWidgetSurface()
-    :QPlatformGLWidgetSurface()
-{
-
-}
-QEGLPlatformWidgetSurface::~QEGLPlatformWidgetSurface()
-{
-}
-
-bool QEGLPlatformWidgetSurface::create(QGLWidget* widget, QGLFormat& format)
-{
-    return true;
-}
-void QEGLPlatformWidgetSurface::setGeometry(const QRect& rect)
-{
-    Q_UNUSED(rect);
-}
-bool QEGLPlatformWidgetSurface::filterEvent(QEvent *event)
-{
-    return QPlatformGLWidgetSurface::filterEvent(event);
-}
-
 QEGLPlatformContext::QEGLPlatformContext()
 {
 }
diff --git a/src/plugins/platforms/openkode/qopenkodeglintegration.h b/src/plugins/platforms/openkode/qopenkodeglintegration.h
index c3291b8..b0b7a48 100644
--- a/src/plugins/platforms/openkode/qopenkodeglintegration.h
+++ b/src/plugins/platforms/openkode/qopenkodeglintegration.h
@@ -42,7 +42,7 @@
 #ifndef QOPENKODEGLINTEGRATION_H
 #define QOPENKODEGLINTEGRATION_H
 
-#include <QtOpenGL/qglplatformintegration_lite.h>
+#include <QtGui/qplatformglcontext_lite.h>
 #include <QtGui/private/qeglproperties_p.h>
 #include <EGL/egl.h>
 
@@ -50,17 +50,6 @@ void qt_eglproperties_set_glformat(QEglProperties& eglProperties, const QGLForma
 // Updates "format" with the parameters of the selected configuration.
 void qt_glformat_from_eglconfig(QGLFormat& format, const EGLConfig config);
 
-class QEGLPlatformWidgetSurface : public QPlatformGLWidgetSurface
-{
-public:
-    QEGLPlatformWidgetSurface();
-    virtual ~QEGLPlatformWidgetSurface();
-
-    bool create(QGLWidget*, QGLFormat&);
-    void setGeometry(const QRect&);
-    bool filterEvent(QEvent *);
-};
-
 class QEGLPlatformContext : public QPlatformGLContext
 {
 public:
diff --git a/src/plugins/platforms/openkode/qopenkodeintegration.cpp b/src/plugins/platforms/openkode/qopenkodeintegration.cpp
index cd957af..5e461ae 100644
--- a/src/plugins/platforms/openkode/qopenkodeintegration.cpp
+++ b/src/plugins/platforms/openkode/qopenkodeintegration.cpp
@@ -212,7 +212,7 @@ QPlatformWindow *QOpenKODEIntegration::createPlatformWindow(QWidget *tlw, WId )
 
 QWindowSurface *QOpenKODEIntegration::createWindowSurface(QWidget *widget, WId wid) const
 {
-    return new QGLWindowSurface(widget);
+    return new QOpenKODEWindowSurface(widget, wid);
 }
 
 bool QOpenKODEIntegration::hasOpenGL() const
@@ -223,10 +223,6 @@ QPlatformGLContext *QOpenKODEIntegration::createGLContext()
 {
     return new QEGLPlatformContext;
 }
-QPlatformGLWidgetSurface *QOpenKODEIntegration::createGLWidgetSurface()
-{
-    return new QEGLPlatformWidgetSurface;
-}
 
 GLuint QOpenKODEIntegration::blitterProgram()
 {
diff --git a/src/plugins/platforms/openkode/qopenkodeintegration.h b/src/plugins/platforms/openkode/qopenkodeintegration.h
index ad6db4b..f53c520 100644
--- a/src/plugins/platforms/openkode/qopenkodeintegration.h
+++ b/src/plugins/platforms/openkode/qopenkodeintegration.h
@@ -47,6 +47,7 @@
 #include <QtGui/QPlatformIntegration>
 #include <QtGui/QPlatformScreen>
 #include <QtGui/private/qeglcontext_p.h>
+#include <QtGui/qplatformglcontext_lite.h>
 
 # include <GLES2/gl2.h>
 
@@ -83,7 +84,6 @@ public:
 
     bool hasOpenGL() const;
     QPlatformGLContext * createGLContext();
-    QPlatformGLWidgetSurface * createGLWidgetSurface();
 
     virtual QList<QPlatformScreen *> screens() const { return mScreens; }
 
-- 
cgit v0.12