Fix xcb-icccm 3.8 support

Build fix on platforms having xcb-icccm >= 3.8

Change-Id: Ia20c9a439d57e147db90d635679e471bfa02c840
Reviewed-on: http://codereview.qt-project.org/4779
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index db8d37e..50be8ba 100644 (file)
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -53,16 +53,28 @@
 #include "qdri2context.h"
 #endif
 
-#define class class_name // Yeah, in 2011 ...
+// FIXME This workaround can be removed for xcb-icccm > 3.8
+#define class class_name
 #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_get_wm_hints_reply xcb_icccm_get_wm_hints_reply
+#define xcb_get_wm_hints xcb_icccm_get_wm_hints
+#define xcb_set_wm_hints xcb_icccm_set_wm_hints
+#define xcb_set_wm_normal_hints xcb_icccm_set_wm_normal_hints
+#define xcb_size_hints_set_base_size xcb_icccm_size_hints_set_base_size
+#define xcb_size_hints_set_max_size xcb_icccm_size_hints_set_max_size
+#define xcb_size_hints_set_min_size xcb_icccm_size_hints_set_min_size
+#define xcb_size_hints_set_position xcb_icccm_size_hints_set_position
+#define xcb_size_hints_set_resize_inc xcb_icccm_size_hints_set_resize_inc
+#define xcb_size_hints_set_size xcb_icccm_size_hints_set_size
+#define xcb_size_hints_set_win_gravity xcb_icccm_size_hints_set_win_gravity
 #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
+#define xcb_wm_hints_t xcb_icccm_wm_hints_t
+#define XCB_WM_STATE_ICONIC XCB_ICCCM_WM_STATE_ICONIC
 #endif
 
 #include <private/qguiapplication_p.h>