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>

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 d15e554..8f93d64 100644 (file)
--- 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 71b30fe..50fb86f 100644 (file)
--- 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>