summaryrefslogtreecommitdiffstats
path: root/config.tests/qpa/xcb/xcb.cpp
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@nokia.com>2011-09-13 15:03:49 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-15 20:39:28 +0200
commitb0fa5d66ac2750d7e3707f2a74ca7f812f028f7f (patch)
tree0d31cc22524f1d627b71f601e82b3f856a33a4a3 /config.tests/qpa/xcb/xcb.cpp
parent8e67ef47942f7d7034ccf2166411d2bf1668c1e2 (diff)
Fix Xcb autodetection during configure.
Change-Id: I550e633d49cfcf4df393ae7d691e7f407276eb58 Reviewed-on: http://codereview.qt-project.org/4781 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'config.tests/qpa/xcb/xcb.cpp')
-rw-r--r--config.tests/qpa/xcb/xcb.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/config.tests/qpa/xcb/xcb.cpp b/config.tests/qpa/xcb/xcb.cpp
index 71b30fea5a..50fb86fc62 100644
--- a/config.tests/qpa/xcb/xcb.cpp
+++ b/config.tests/qpa/xcb/xcb.cpp
@@ -40,7 +40,12 @@
****************************************************************************/
#include <xcb/xcb.h>
+
+// FIXME This workaround can be removed for xcb-icccm > 3.8
+#define class class_name
#include <xcb/xcb_icccm.h>
+#undef class
+
#include <xcb/xfixes.h>
#include <xcb/xcb_image.h>
#include <xcb/xcb_keysyms.h>