[Development] src/plugins/platforms/eglfs compilation error

[David Faure]

Same old story: the Xlib.h headers #define None, breaking the None in qurl.h

This breaks compilation of qtbase/src/plugins/platforms/eglfs in stable branch 
for me.

Including Qt headers after egl headers works around it, but it would have to 
be done in many .cpp files... (I only tried on qeglfsintegration.cpp)

Investigation:

Xlib.h is included by 
src/3rdparty/angle/include/EGL/eglplatform.h
which is included by
include/EGL/eglplatform.h
which is included by
src/3rdparty/angle/include/EGL/egl.h
which is included by
include/EGL/egl.h
which is included by
qeglfsscreen.h
which is included by
qeglfsintegration.h
which is included by
qeglfsintegration.cpp before it includes Qt headers, such
as qguiapplication_p.h -> qwindowsysteminterface.h -> qevent.h -> qurl.h

I am very surprised that this passed the CI and that others aren't affected.

Well, src/3rdparty/angle isn't supposed to be in the include path on Linux?

And/or it shouldn't generate forwarding headers, when angle is not used.

I do have /usr/include/EGL/egl.h btw.

-- 
David Faure | david.faure at kdab.com | Managing Director KDAB France
KDAB (France) S.A.S., a KDAB Group company
Tel. France +33 (0)4 90 84 08 53, Sweden (HQ) +46-563-540090
KDAB - Qt Experts - Platform-independent software solutions