summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-08-03 21:16:10 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-05 10:55:30 +0200
commit7ce8491280990350162933a0716d1b014f65aeb6 (patch)
tree7657c85c5c7d0c435860476406f79ddb192ce6b1 /src/plugins
parent4334d07f52dfc1d7fce6ebbad6e9f377ef33dedb (diff)
support xcb-icccm 3.8
this is a rather crude hack, but whatever. Change-Id: I3fa363572842b207202d4aac8526951c0e16bf5b Reviewed-on: http://codereview.qt.nokia.com/2602 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 0a02c7eff5..20e4187541 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -49,7 +49,17 @@
#include "qdri2context.h"
#endif
+#define class class_name // Yeah, in 2011 ...
#include <xcb/xcb_icccm.h>
+#undef class
+
+// xcb-icccm 3.8 support
+#ifdef XCB_ICCCM_NUM_WM_SIZE_HINTS_ELEMENTS
+#define xcb_wm_hints_t xcb_icccm_wm_hints_t
+#define xcb_wm_hints_set_iconic xcb_icccm_wm_hints_set_iconic
+#define xcb_wm_hints_set_normal xcb_icccm_wm_hints_set_normal
+#define xcb_set_wm_hints xcb_icccm_set_wm_hints
+#endif
#include <private/qapplication_p.h>
#include <private/qwindowsurface_p.h>