Commit b13801fd authored by Laszlo Agocs's avatar Laszlo Agocs
Browse files

Avoid pulling in X11 headers in brcm backend


In some configurations we may end up using Mesa's EGL headers instead
of the Broadcom ones. Make this work by setting the usual define to
prevent including Xlib headers that then conflict with all sorts of
things in QtCore.

Change-Id: I4970553428e5b0e81bd76694980f3b6b194ae4c2
Reviewed-by: default avatarAndy Nichols <andy.nichols@theqtcompany.com>
Showing with 3 additions and 0 deletions
...@@ -12,6 +12,9 @@ CONFIG += egl ...@@ -12,6 +12,9 @@ CONFIG += egl
LIBS += -lbcm_host LIBS += -lbcm_host
QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
# Avoid X11 header collision
DEFINES += MESA_EGL_NO_X11_HEADERS
SOURCES += $$PWD/qeglfsbrcmmain.cpp \ SOURCES += $$PWD/qeglfsbrcmmain.cpp \
$$PWD/qeglfsbrcmintegration.cpp $$PWD/qeglfsbrcmintegration.cpp
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment