Fix compilation on Harmattan

Include Xlib.h for XInitThreads and add the SUPPORT_X11 macro
to DEFINES for Harmattan's EGL library.

Change-Id: I34ad284fe5b671f3924e406a18b8c5520df8346a
Reviewed-on: http://codereview.qt-project.org/5935
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index b0d377b..185765b 100644 (file)
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -62,6 +62,10 @@
 #include <EGL/egl.h>
 #endif
 
+#ifdef XCB_USE_XLIB
+#include <X11/Xlib.h>
+#endif
+
 #include <private/qplatforminputcontextfactory_qpa_p.h>
 #include <qplatforminputcontext_qpa.h>
 

diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro
index 143a671..13fe5b9 100644 (file)
--- a/src/plugins/platforms/xcb/xcb.pro
+++ b/src/plugins/platforms/xcb/xcb.pro
@@ -68,6 +68,10 @@ contains(DEFINES, XCB_USE_DRI2) {
         DEFINES += XCB_USE_EGL
         LIBS += -lEGL
         HEADERS += qxcbeglsurface.h
+
+        # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType
+        # and other types to the correct X11 types
+        DEFINES += SUPPORT_X11
     } else:contains(QT_CONFIG, xcb-xlib) {
         DEFINES += XCB_USE_GLX
         HEADERS += qglxintegration.h