summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-08-30 22:25:52 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-31 16:23:10 +0200
commit99ef183cb1395bab34ec8865d1d47ffa44b94a64 (patch)
treee8a64c1a5ca0069950b2ff98e98cac375faa2419 /configure
parent9fcf8dc2e8fa2748b51750d14b6e6cd8352bd27e (diff)
Use pkg-config to search for all XCB dependencies
The XCB platform plugin requires several XCB libraries to work. Without this fix, we get the build error in compileTest only, which is hard to check. Change-Id: I6b599f5ad32661e9dc01db11705d702920350cfa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 7a72ba7396..5e77995119 100755
--- a/configure
+++ b/configure
@@ -4772,8 +4772,8 @@ fi
if [ "$CFG_XCB" != "no" ]; 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`"
+ QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb xcb-image xcb-keysyms xcb-icccm xcb-sync xcb-xfixes xcb-randr 2>/dev/null`"
+ QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb xcb-image xcb-keysyms xcb-icccm xcb-sync xcb-xfixes xcb-randr 2>/dev/null`"
fi
if compileTest qpa/xcb "xcb" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then
CFG_XCB=yes