From b1e9d4c097b6a31a38e78d45d5e9536cc9b8ad29 Mon Sep 17 00:00:00 2001
From: Thomas Senyk <thomas.senyk@pelagicore.com>
Date: Thu, 22 Nov 2012 18:11:56 +0100
Subject: [PATCH] xcb plugin: Move the include XInput2.h statements

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>
---
 src/plugins/platforms/xcb/qxcbconnection.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index b5756bd06c..4c4df137a3 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -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