From 2003b83f6f09d478aa490334076d8870f6e32a6e Mon Sep 17 00:00:00 2001
From: Donald Carr <donald.carr@nokia.com>
Date: Mon, 19 Mar 2012 13:45:42 +0000
Subject: Avoid Qt/X11 header contamination via egl.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

egl.h on certain platforms directly includes X11 headers, resulting in an
all too familiar header conflict. There are existing defines we merely need
to set in order to avoid this eventuality.

Change-Id: Ic91b66286ad6cc329f9c88b5e47834690a8eb96a
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/platforms/eglfs/eglfs.pro | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/plugins/platforms/eglfs')

diff --git a/src/plugins/platforms/eglfs/eglfs.pro b/src/plugins/platforms/eglfs/eglfs.pro
index 80c5579cfb..86a1b8239c 100644
--- a/src/plugins/platforms/eglfs/eglfs.pro
+++ b/src/plugins/platforms/eglfs/eglfs.pro
@@ -13,6 +13,9 @@ DESTDIR = $$QT.gui.plugins/platforms
 
 #DEFINES += Q_OPENKODE
 
+#Avoid X11 header collision
+DEFINES += MESA_EGL_NO_X11_HEADERS
+
 SOURCES =   main.cpp \
             qeglfsintegration.cpp \
             qeglfswindow.cpp \
-- 
cgit v1.2.3