diff options
| author | Giulio Camuffo <giuliocamuffo@gmail.com> | 2014-12-22 20:28:35 +0200 |
|---|---|---|
| committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-12-23 14:04:10 +0100 |
| commit | 7aadf03fead587299e129cf77fc8322a24cc0591 (patch) | |
| tree | 0ad5bdfafaacadbe18e3e0bbef70e4b8c021152e /src/plugins | |
| parent | 9b4fbe85d2e00c625c3d4abd975faf555000f685 (diff) | |
Fix build when using -egl and -no-xcb-xlib
Change-Id: I533f1d989b5f4b427ce572620e27c3870a64c2ae
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp index f5fc2e74c4..75b35f4fb8 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp @@ -66,7 +66,11 @@ bool QXcbEglIntegration::initialize(QXcbConnection *connection) { m_connection = connection; +#ifdef USE_XCB_XLIB Display *dpy = (Display *)m_connection->xlib_display(); +#else + EGLNativeDisplayType dpy = EGL_DEFAULT_DISPLAY; +#endif m_egl_display = eglGetDisplay(dpy); EGLint major, minor; diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 08b414e82e..56b4a9abda 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -1155,10 +1155,12 @@ xcb_window_t QXcbConnection::rootWindow() return primaryScreen()->root(); } +#ifdef XCB_USE_XLIB void *QXcbConnection::xlib_display() const { return m_xlib_display; } +#endif void QXcbConnection::processXcbEvents() { diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 54c32dd3c4..4d14dd14a3 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -328,6 +328,7 @@ void QXcbWindow::create() resolveFormat(); +#ifdef XCB_USE_XLIB if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)) { XVisualInfo *visualInfo = static_cast<XVisualInfo *>(createVisual()); if (!visualInfo && window()->surfaceType() == QSurface::OpenGLSurface) @@ -359,6 +360,7 @@ void QXcbWindow::create() XFree(visualInfo); } } +#endif if (!m_window) { |