From c5264c89b7710dc2f2d8c7c604f0b23852cb2eef Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Thu, 4 Mar 2010 13:08:32 +0100
Subject: Fix build when egl.h includes X11 headers & pollutes namespace

At some point we should fix the include order in all the .cpp files,
however #udef'ing the defines we use elsewhere seems to work for now.

Reviewed-By: TrustMe
---
 src/gui/egl/qegl_p.h | 2 ++
 src/opengl/qgl_p.h   | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h
index aa89772..ffb45aa 100644
--- a/src/gui/egl/qegl_p.h
+++ b/src/gui/egl/qegl_p.h
@@ -77,6 +77,8 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #undef Type
 #undef FontChange
 #undef CursorShape
+#undef Unsorted
+#undef GrayScale
 #endif
 
 // Internally we use the EGL-prefixed native types which are used in EGL >= 1.3.
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index b828bea..c142715 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -65,13 +65,7 @@
 #include "qglpaintdevice_p.h"
 
 #ifdef QT_OPENGL_ES
-QT_BEGIN_INCLUDE_NAMESPACE
-#if defined(QT_OPENGL_ES_2)
-#include <EGL/egl.h>
-#else
-#include <GLES/egl.h>
-#endif
-QT_END_INCLUDE_NAMESPACE
+#include <QtGui/private/qegl_p.h>
 #endif
 
 QT_BEGIN_NAMESPACE
-- 
cgit v0.12