path: root/src/platformsupport/eglconvenience/qeglpbuffer_p.h
diff options
authorLaszlo Agocs <>2016-04-22 17:13:38 +0200
committerLaszlo Agocs <>2016-05-17 16:13:42 +0000
commit6e401ebc4760e696443f8afa13e1cf2f08629e73 (patch)
treee09b7ac29ff687225e650629df13e136ae6f3664 /src/platformsupport/eglconvenience/qeglpbuffer_p.h
parentbfa53e1c67eddb14887cda37d7c89c76f4cce378 (diff)
egl: Reshuffle headers to help less fortunate systems with X11
EGL headers including X headers has traditionally been problematic due to getting macros for Status, None, etc. In most cases this is not an issue anymore because on embedded one will almost always use a driver targeting the framebuffer or DRM/KMS and therefore the EGL headers do not pull in X dependencies. Furthermore, Mesa supports MESA_EGL_NO_X11_HEADERS which we set, avoiding the problem altogether with Mesa regardless of targeting X11 or KMS. However, other drivers do not have this option. On i.MX6 for instance, targeting X11 is problematic due to not having EGL_API_FB defined, which in turn means the EGL headers pulls in X headers in order to be able to define the native display and window types as Display and Window. Try to play nice with this use case by reshuffling the includes and undefining the problematic names. This restores patch set 2 from the previously merged, and then reverted commit. This here is safe since the egl.h include and the following undefs are only done internally for eglfs and can have therefore no effect on other code. Task-number: QTBUG-52928 Change-Id: I383e783d5064dc8fb41f3ef56d2a4f4fcd31a6cf Reviewed-by: Louai Al-Khanji <>
Diffstat (limited to 'src/platformsupport/eglconvenience/qeglpbuffer_p.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/eglconvenience/qeglpbuffer_p.h b/src/platformsupport/eglconvenience/qeglpbuffer_p.h
index 81fdab8901..aa79a0a42c 100644
--- a/src/platformsupport/eglconvenience/qeglpbuffer_p.h
+++ b/src/platformsupport/eglconvenience/qeglpbuffer_p.h
@@ -45,9 +45,9 @@
// We mean it.
-#include <EGL/egl.h>
#include <qpa/qplatformoffscreensurface.h>
#include <QtPlatformSupport/private/qeglplatformcontext_p.h>
+#include <EGL/egl.h>