From 4ebc83745d21072952527f87a43906ea2b71fc27 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 3 Oct 2011 17:19:07 +0200 Subject: Fix compilation on Harmattan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Samuel Rødal --- src/plugins/platforms/xcb/xcb.pro | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/plugins/platforms/xcb/xcb.pro') diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index 143a671047..13fe5b900c 100644 --- 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 -- cgit v1.2.3