diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-19 12:58:18 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-19 14:52:54 (GMT) |
| commit | 4af11f2c6666c55657569f946c33816f33711225 (patch) | |
| tree | 8df4cfa88fdab26df840bdb92b319d42505205c0 /src/plugins/platforms/xlib/qxlibscreen.cpp | |
| parent | aea5e35f57d061b133d2fa613d10f5e0118f5706 (diff) | |
| download | Qt-4af11f2c6666c55657569f946c33816f33711225.zip Qt-4af11f2c6666c55657569f946c33816f33711225.tar.gz Qt-4af11f2c6666c55657569f946c33816f33711225.tar.bz2 | |
Compile fixes for Xlib plugin.
Diffstat (limited to 'src/plugins/platforms/xlib/qxlibscreen.cpp')
| -rw-r--r-- | src/plugins/platforms/xlib/qxlibscreen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/xlib/qxlibscreen.cpp b/src/plugins/platforms/xlib/qxlibscreen.cpp index 7c8a367..920116a 100644 --- a/src/plugins/platforms/xlib/qxlibscreen.cpp +++ b/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); |