summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorBradley Smith <bradley@baysmith.com>2012-03-18 18:44:31 -0700
committerQt by Nokia <qt-info@nokia.com>2012-03-19 20:16:04 +0100
commit336f24465a106553dae26ac84a3c43f9ad939a57 (patch)
tree36b6ae906d16ee06a7604c0829a25f21b3feb02d /configure
parent477c43260eea8461dff1e0e8acb4b61a1600518a (diff)
Improves configure checks for XCB.
The XCB plugin requries libxcb >= 1.5. Configure and config.tests/qpa/xcb now check for this. Change-Id: I96c688b79bf5b49fd3ecc4ddc12ebdc2d3788790 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 8164badeba..0ec2d92133 100755
--- a/configure
+++ b/configure
@@ -5041,7 +5041,7 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
fi
if [ "$CFG_XCB" != "no" ]; then
- if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists xcb 2>/dev/null; then
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then
QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`"
QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null`"
fi