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 <cullmann@kde.org> Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
parent
82edcd4e12
commit
080096590b
@ -268,8 +268,13 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGra
|
|||||||
, m_focusWindow(0)
|
, m_focusWindow(0)
|
||||||
, m_systemTrayTracker(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
|
#ifdef XCB_USE_XLIB
|
||||||
Display *dpy = XOpenDisplay(m_displayName.constData());
|
dpy = XOpenDisplay(m_displayName.constData());
|
||||||
if (dpy) {
|
if (dpy) {
|
||||||
m_primaryScreen = DefaultScreen(dpy);
|
m_primaryScreen = DefaultScreen(dpy);
|
||||||
m_connection = XGetXCBConnection(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());
|
qFatal("QXcbConnection: Could not connect to display %s", m_displayName.constData());
|
||||||
|
|
||||||
#ifdef XCB_USE_EGL
|
#ifdef XCB_USE_EGL
|
||||||
EGLNativeDisplayType dpy = EGL_DEFAULT_DISPLAY;
|
|
||||||
EGLDisplay eglDisplay = eglGetDisplay(dpy);
|
EGLDisplay eglDisplay = eglGetDisplay(dpy);
|
||||||
m_egl_display = eglDisplay;
|
m_egl_display = eglDisplay;
|
||||||
EGLint major, minor;
|
EGLint major, minor;
|
||||||
|
Loading…
Reference in New Issue
Block a user