Compile fixes for Xlib plugin.

(cherry picked from commit 4af11f2c6666c55657569f946c33816f33711225)

src/plugins/platforms/xlib/qxlibscreen.cpp

@@ -41,6 +41,8 @@
 
 #include "qxlibscreen.h"
 
+#include <X11/extensions/Xfixes.h>
+
 #include "qxlibcursor.h"
 #include "qxlibwindow.h"
 #include "qxlibkeyboard.h"
@@ -54,8 +56,6 @@
 
 #include <private/qapplication_p.h>
 
-#include <X11/extensions/Xfixes.h>
-
 QT_BEGIN_NAMESPACE
 
 static int (*original_x_errhandler)(Display *dpy, XErrorEvent *);
@@ -201,7 +201,7 @@ QXlibScreen::QXlibScreen()
 
 
 #ifndef DONT_USE_MIT_SHM
-    Status MIT_SHM_extension_supported = XShmQueryExtension (mDisplay->nativeDisplay());
+    int MIT_SHM_extension_supported = XShmQueryExtension (mDisplay->nativeDisplay());
     Q_ASSERT(MIT_SHM_extension_supported == True);
 #endif
     original_x_errhandler = XSetErrorHandler(qt_x_errhandler);

src/plugins/platforms/xlib/qxlibstatic.cpp

@@ -51,10 +51,6 @@
 
 #include <QDebug>
 
-#ifndef QT_NO_XFIXES
-#include <X11/extensions/Xfixes.h>
-#endif // QT_NO_XFIXES
-
 static const char * x11_atomnames = {
     // window-manager <-> client protocols
     "WM_PROTOCOLS\0"

src/plugins/platforms/xlib/qxlibstatic.h

@@ -135,6 +135,7 @@ typedef char *XPointer;
 #endif
 
 #ifndef QT_NO_XFIXES
+#include <X11/extensions/Xfixes.h>
 typedef Bool (*PtrXFixesQueryExtension)(Display *, int *, int *);
 typedef Status (*PtrXFixesQueryVersion)(Display *, int *, int *);
 typedef void (*PtrXFixesSetCursorName)(Display *dpy, Cursor cursor, const char *name);

src/plugins/platforms/xlib/qxlibwindow.cpp

@@ -47,14 +47,6 @@
 #include "qxlibstatic.h"
 #include "qxlibdisplay.h"
 
-#include <QtGui/QWindowSystemInterface>
-#include <QSocketNotifier>
-#include <QApplication>
-#include <QDebug>
-
-#include <QtGui/private/qwindowsurface_p.h>
-#include <QtGui/private/qapplication_p.h>
-
 #if !defined(QT_NO_OPENGL)
 #if !defined(QT_OPENGL_ES_2)
 #include "qglxintegration.h"
@@ -66,6 +58,15 @@
 #endif  //QT_OPENGL_ES_2
 #endif //QT_NO_OPENGL
 
+
+#include <QtGui/QWindowSystemInterface>
+#include <QSocketNotifier>
+#include <QApplication>
+#include <QDebug>
+
+#include <QtGui/private/qwindowsurface_p.h>
+#include <QtGui/private/qapplication_p.h>
+
 //#define MYX11_DEBUG
 
 QT_BEGIN_NAMESPACE