1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xcb plugin: Move the include XInput2.h statements

Browse Source 
If the include of egl.h does nasty things with X11-defines
(this happens with the imx6 gpu-drivers) errors are avoided if
the include of XInput2.h is next to the other X-includes,
and not after include of egl.h

Change-Id: I182d0e1fcf3fa3e6abce880d34e63cc1d2ce8ed4
Reviewed-by: Laszlo Agocs <lagocs83@gmail.com>
This commit is contained in:
Thomas Senyk 2012-11-22 18:11:56 +01:00 committed by The Qt Project
parent 2fbb69a093
commit b1e9d4c097
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/xcb/qxcbconnection.cpp
View File

@ -71,6 +71,11 @@
#include <X11/Xlibint.h>
#endif
#if defined(XCB_USE_XINPUT2) || defined(XCB_USE_XINPUT2_MAEMO)
#include <X11/extensions/XInput2.h>
#include <X11/extensions/XI2proto.h>
#endif
#ifdef XCB_USE_RENDER
#include <xcb/render.h>
#endif
@ -83,11 +88,6 @@
#include <EGL/egl.h>
#endif
#if defined(XCB_USE_XINPUT2) || defined(XCB_USE_XINPUT2_MAEMO)
#include <X11/extensions/XInput2.h>
#include <X11/extensions/XI2proto.h>
#endif
QT_BEGIN_NAMESPACE
#ifdef XCB_USE_XLIB