diff options
| author | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-02-04 11:54:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-04 20:57:06 +0100 |
| commit | b0e6bc42ebec357816d53456d3ef214f9fb8754c (patch) | |
| tree | f9190c9763ac7a1632dada820793da0affbb6c5e /configure | |
| parent | eba56a35e3a1e208ba7b6c5b7bf26f61215d38d2 (diff) | |
Set QMAKE_X11_PREFIX also when Qt configure with -qt-xcb
Change-Id: Ib9ca7edb1e914275a415b6c74ef691838415a40f
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -5193,6 +5193,14 @@ if [ "$CFG_XCB" != "no" ]; then QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`" QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null`" fi + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then + QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" + else + # default to LSB prefix + QMAKE_X11_PREFIX="/usr" + fi + QMakeVar set QMAKE_X11_PREFIX "$QMAKE_X11_PREFIX" + if compileTest qpa/xcb "xcb" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then if [ "$CFG_XCB" = "qt" ]; then @@ -5200,14 +5208,6 @@ if [ "$CFG_XCB" != "no" ]; then else CFG_XCB="system" - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then - QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" - else - # default to LSB prefix - QMAKE_X11_PREFIX="/usr" - fi - QMakeVar set QMAKE_X11_PREFIX "$QMAKE_X11_PREFIX" - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm" QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`" |