diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:50:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-25 12:50:29 +0200 |
| commit | 9e04c60ac070348f8208fb0254e62d6e593320c3 (patch) | |
| tree | cd038cf2612faf8dadeae5fb8b807b66e2291026 /src/plugins/platforms/xcb | |
| parent | bfa8d15e15fdeb0bbfb6575e37be1c32445ab7cc (diff) | |
| parent | 04d0a9626ce61b2e05a40f9562c2bcf12e234639 (diff) | |
Merge "Merge branch 'master' into refactor" into refactor
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index f136b8167f..7b7b23ce0c 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -53,7 +53,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/qguiapplication_p.h> #include <private/qwindow_p.h> |