From 080096590b9bc30fcbaba1bb140f6aee20418e7a Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Tue, 31 Dec 2013 15:55:35 +0200 Subject: [PATCH] xcb platform: Fix build when both EGL and xcb-Xlib are used Fix a multiple define when Qt is configured to use both EGL and xcb-Xlib. Change-Id: I6fdb282f575842711b3b5d377bbdf3bc9909bf0c Reviewed-by: Christoph Cullmann Reviewed-by: David Faure --- src/plugins/platforms/xcb/qxcbconnection.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 24734a8240..3c4ab8d3e2 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -268,8 +268,13 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGra , m_focusWindow(0) , m_systemTrayTracker(0) { +#ifdef XCB_USE_EGL + EGLNativeDisplayType dpy = EGL_DEFAULT_DISPLAY; +#elif defined(XCB_USE_XLIB) + Display *dpy; +#endif #ifdef XCB_USE_XLIB - Display *dpy = XOpenDisplay(m_displayName.constData()); + dpy = XOpenDisplay(m_displayName.constData()); if (dpy) { m_primaryScreen = DefaultScreen(dpy); m_connection = XGetXCBConnection(dpy); @@ -285,7 +290,6 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGra qFatal("QXcbConnection: Could not connect to display %s", m_displayName.constData()); #ifdef XCB_USE_EGL - EGLNativeDisplayType dpy = EGL_DEFAULT_DISPLAY; EGLDisplay eglDisplay = eglGetDisplay(dpy); m_egl_display = eglDisplay; EGLint major, minor;