qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp

Update the already existing fix for EGL/X11 header issue to fix
an additional problem encountered on my system where I had
compile errors in qeglplatformscreen.cpp. The problem was related
to the wrong order of includes. The X11 headers must always be
included last, as indicated in
http://lists.qt-project.org/pipermail/development/2013-March/010511.html



The fix is done in the existing 0003-xcb-egl-fixes.patch patch, since
it is an additional fix for the same problem.

[Thomas: tweak commit log, and adjust SoB details as suggested by
Arnout.]

Signed-off-by: Marc Andre <marc.andre@netline.ch>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>