summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xlib/qxlibscreen.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-05-05 08:46:30 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-05-05 08:47:59 (GMT)
commit18a05b0d40a8b569e369248c748a9ed65883f522 (patch)
tree3459ff0c415829da3010e6002cbf0b0e2f03d84b /src/plugins/platforms/xlib/qxlibscreen.cpp
parent8a706b5133b1ba1d5eb5fdca97e002597d6ff829 (diff)
downloadQt-18a05b0d40a8b569e369248c748a9ed65883f522.zip
Qt-18a05b0d40a8b569e369248c748a9ed65883f522.tar.gz
Qt-18a05b0d40a8b569e369248c748a9ed65883f522.tar.bz2
Lighthouse: Fix up Xlib
Diffstat (limited to 'src/plugins/platforms/xlib/qxlibscreen.cpp')
-rw-r--r--src/plugins/platforms/xlib/qxlibscreen.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/xlib/qxlibscreen.cpp b/src/plugins/platforms/xlib/qxlibscreen.cpp
index 7c8a367..c4c8126 100644
--- a/src/plugins/platforms/xlib/qxlibscreen.cpp
+++ b/src/plugins/platforms/xlib/qxlibscreen.cpp
@@ -54,8 +54,6 @@
#include <private/qapplication_p.h>
-#include <X11/extensions/Xfixes.h>
-
QT_BEGIN_NAMESPACE
static int (*original_x_errhandler)(Display *dpy, XErrorEvent *);
@@ -201,7 +199,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);