From d7168ae0ff930f19f206a1b56c03fc35b22bb948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Wed, 7 Jul 2010 15:09:35 +0200
Subject: Never compile lighthouse with EGL support

it should reside in the plugin, not in the opengl module nor in gui
---
 configure                               | 5 +++++
 src/gui/kernel/qplatformglcontext_qpa.h | 5 +----
 src/opengl/opengl.pro                   | 2 --
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 23aa101..a57f6ce 100755
--- a/configure
+++ b/configure
@@ -6636,6 +6636,11 @@ else
     QT_CONFIG="$QT_CONFIG accessibility"
 fi
 
+# egl stuff does not belong in lighthouse, but rather in plugins
+if [ "$PLATFORM_QPA" = "yes" ]; then
+    CFG_EGL="no"
+fi
+
 # enable egl
 if [ "$CFG_EGL" = "no" ]; then
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EGL"
diff --git a/src/gui/kernel/qplatformglcontext_qpa.h b/src/gui/kernel/qplatformglcontext_qpa.h
index 8aeb635..dcfd54c 100644
--- a/src/gui/kernel/qplatformglcontext_qpa.h
+++ b/src/gui/kernel/qplatformglcontext_qpa.h
@@ -51,10 +51,7 @@ QT_BEGIN_NAMESPACE
 class Q_OPENGL_EXPORT QPlatformGLContext
 {
 public:
-    //QPlatformGLContext();
-    //virtual ~QPlatformGLContext();
-
-    //virtual bool create(QPaintDevice* device, QPlatformGLContext* shareContext) = 0;
+    virtual ~QPlatformGLContext() { }
 
     virtual void makeCurrent() = 0;
     virtual void doneCurrent() = 0;
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 09a6b0f..772c27f 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -78,8 +78,6 @@ SOURCES	+= qgl.cpp \
 }
 
 qpa {
-    DEFINES += QT_NO_EGL
-
     SOURCES +=  qgl_qpa.cpp \
                 qglpixelbuffer_stub.cpp
 }
-- 
cgit v0.12