diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-08-24 21:12:35 +0800 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-08-26 13:34:58 +0200 |
commit | 0d7ef7993dc18a69d0bffd78666ee6ae7fb83e34 (patch) | |
tree | 8ceb4de98e9ccc76cd2d2471d34c812c4e8708b2 /src | |
parent | a1909f834b3d1d36a7cb043aa0ff88bc0774cf27 (diff) |
xcb: Disable GLX when xcb-xlib is not present due xlib usage
The GLX and EGL code is using DISPLAY_FROM_XCB which requires
xlib support, disable GLX when when xlib is not present.
Change-Id: I55126e48e52390fdcfb1348a11fbf9628d32b13c
Reviewed-on: http://codereview.qt.nokia.com/3665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index c06d565df3..a891bb39e6 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -172,7 +172,7 @@ void QXcbWindow::create() m_requestedFormat = window()->format(); -#if defined(XCB_USE_GLX) || defined(XCB_USE_EGL) +#if (defined(XCB_USE_GLX) || defined(XCB_USE_EGL)) && defined(XCB_USE_XLIB) if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL) || window()->format().hasAlpha()) { diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index 4f16c3b50f..ba36ab14fb 100644 --- a/src/plugins/platforms/xcb/xcb.pro +++ b/src/plugins/platforms/xcb/xcb.pro @@ -71,7 +71,7 @@ contains(QT_CONFIG, opengl) { DEFINES += XCB_USE_EGL LIBS += -lEGL HEADERS += qxcbeglsurface.h - } else { + } else:contains(QT_CONFIG, xcb-xlib) { DEFINES += XCB_USE_GLX HEADERS += qglxintegration.h SOURCES += qglxintegration.cpp |