From b0fa5d66ac2750d7e3707f2a74ca7f812f028f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@nokia.com>
Date: Tue, 13 Sep 2011 15:03:49 +0200
Subject: Fix Xcb autodetection during configure.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.cpp      | 5 +++++
 config.tests/qpa/xcb/xcb.cpp                                         | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'config.tests/qpa')

diff --git a/config.tests/qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.cpp b/config.tests/qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.cpp
index d15e554423..8f93d64af5 100644
--- a/config.tests/qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.cpp
+++ b/config.tests/qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.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>
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>
-- 
cgit v1.2.3