summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@digia.com>2012-10-01 10:17:21 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-19 18:11:06 +0200
commitcdc2161b6f87deaac6a256885fd6ecdccad6eb82 (patch)
tree3d2cd1a20e2b4a0b7e871c6ab78b4fa2bcaf9195 /configure
parent7d7f09650c3b3b2990f16ff4a6401a8c74e1f868 (diff)
Made xcb plugin work when the GLX extension is not present.
Change-Id: I9285d7524586ff404206c088019ece33335137d9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 6 insertions, 0 deletions
diff --git a/configure b/configure
index d130b69ef4..5229c2b0ea 100755
--- a/configure
+++ b/configure
@@ -801,6 +801,7 @@ CFG_XINPUT2=auto
CFG_XINPUT=runtime
CFG_XKB=auto
CFG_XCB=auto
+CFG_XCB_GLX=no
CFG_XCB_LIMITED=yes
CFG_EGLFS=auto
CFG_DIRECTFB=auto
@@ -4790,6 +4791,11 @@ if [ "$CFG_XCB" != "no" ]; then
QT_CONFIG="$QT_CONFIG xcb-render"
fi
+ 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
+
if compileTest qpa/xcb-poll-for-queued-event "xcb-poll-for-queued-event" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then
CFG_XCB_LIMITED=no
QT_CONFIG="$QT_CONFIG xcb-poll-for-queued-event"