summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>2016-02-26 11:53:01 -0800
committerGabriel de Dietrich <gabriel.dedietrich@qt.io>2016-05-12 19:11:51 +0000
commit2852a8b87e3a8ed95b72d26b0e180b7fd4491cf3 (patch)
tree6bcc189969d1442a274aec3898d5f8edb02e0cba /configure
parent07dd6dbaee5bdcbeebc54f04dccc45ad4778eab4 (diff)
XCB: Auto-detect xcb-glx also with xcb-qt
Task-number: QTBUG-43784 Change-Id: Iaa0388e34900f6241db8cd864caed4fb6fc32819 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index ce5b9c2b27..a4819818d1 100755
--- a/configure
+++ b/configure
@@ -5555,6 +5555,11 @@ if [ "$CFG_XCB" != "no" ]; then
if [ "$CFG_XCB" = "qt" ]; then
QT_CONFIG="$QT_CONFIG xcb-qt"
+
+ if compileTest qpa/xcb-glx "xcb-glx" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then
+ CFG_XCB_GLX=yes
+ QT_CONFIG="$QT_CONFIG xcb-glx"
+ fi
else
CFG_XCB="system"
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then