From 27ba43fe5302158cdb54bc0e3fd055b3008ec7ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Fri, 11 Feb 2011 07:55:12 +0100
Subject: Lighthouse: Wayland: Sort out egl includes in plugin

We used to include the X part of the eglplatform.h, but now the mesa
version of the header file has a WL_EGL_PLATFORM part. This define is
defined in wayland-egl.h which thus needs to be included before any egl
header file.
---
 src/plugins/platforms/eglconvenience/qeglconvenience.h |  4 ++++
 src/plugins/platforms/wayland/qwaylandinclude.h        | 15 ---------------
 src/plugins/platforms/wayland/wayland.pro              |  2 ++
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/plugins/platforms/eglconvenience/qeglconvenience.h b/src/plugins/platforms/eglconvenience/qeglconvenience.h
index a1df3cc..681e9db 100644
--- a/src/plugins/platforms/eglconvenience/qeglconvenience.h
+++ b/src/plugins/platforms/eglconvenience/qeglconvenience.h
@@ -46,7 +46,11 @@
 #include <QtGui/QPlatformWindowFormat>
 #include <QtCore/QVector>
 
+#ifdef Q_PLATFORM_WAYLAND
+#include "qwaylandinclude.h"
+#else
 #include <EGL/egl.h>
+#endif
 QT_BEGIN_NAMESPACE
 
 QVector<EGLint> q_createConfigAttributesFromFormat(const QPlatformWindowFormat &format);
diff --git a/src/plugins/platforms/wayland/qwaylandinclude.h b/src/plugins/platforms/wayland/qwaylandinclude.h
index d1f7e39..afaa885 100644
--- a/src/plugins/platforms/wayland/qwaylandinclude.h
+++ b/src/plugins/platforms/wayland/qwaylandinclude.h
@@ -50,23 +50,8 @@
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
-//#define MESA_EGL_NO_X11_HEADERS
 #define EGL_EGLEXT_PROTOTYPES
  #include <EGL/egl.h>
  #include <EGL/eglext.h>
 
-#undef FocusOut
-#undef FocusIn
-#undef KeyPress
-#undef KeyRelease
-#undef None
-#undef RevertToParent
-#undef GrayScale
-#undef CursorShape
-
-#ifdef FontChange
-#undef FontChange
-#endif
-
-
 #endif // QWAYLANDINCLUDE_H
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 7e8a1fa..e40e423 100644
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -3,6 +3,8 @@ include(../../qpluginbase.pri)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
+DEFINES += Q_PLATFORM_WAYLAND
+
 SOURCES =   main.cpp \
             qwaylandintegration.cpp \
             qwaylandshmsurface.cpp \
-- 
cgit v0.12