whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Holger Hans Peter Freyther 2011-08-24 21:12:35 +08:00 committed by Lars Knoll
parent a1909f834b
commit 0d7ef7993d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -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())
{

2
src/plugins/platforms/xcb/xcb.pro
View File

@ -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