diff options
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index b0d377bcac..185765bb34 100644 --- 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 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 |