diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:31 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:53 +0200 |
commit | 6e5818f2bbc8443b9308252a5e1543e014ef439d (patch) | |
tree | 07922adee2f13e818b9439c8a0bdf871dda59039 /configure | |
parent | 32aac0a1c009ee940920fd12f277180dd80b8eff (diff) | |
parent | deac55becd18efa4504eb686a1bb8081a5cd488a (diff) |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -224,28 +224,28 @@ getXQMakeConf() getQMakeConf3 "$1" "$xspecvals" } -# relies on $TEST_COMPILER being set correctly compilerSupportsFlag() { cat >conftest.cpp <<EOF int main() { return 0; } EOF - $TEST_COMPILER "$@" -o conftest-out.o conftest.cpp + "$@" -o conftest-out.o conftest.cpp ret=$? rm -f conftest.cpp conftest-out.o return $ret } -# relies on $TEST_COMPILER being set correctly linkerSupportsFlag() { + compiler=$1 + shift lflags=-Wl for flag do safe_flag=`shellEscape "$flag"` lflags=$lflags,$safe_flag done - compilerSupportsFlag "$lflags" >/dev/null 2>&1 + compilerSupportsFlag $compiler $lflags >/dev/null 2>&1 } # $1: newline-separated list of default paths @@ -727,7 +727,7 @@ mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" -QMakeVar add styles "cde mac motif fusion plastique cleanlooks windows" +QMakeVar add styles "mac fusion windows" # QTDIR may be set and point to an old or system-wide Qt installation unset QTDIR @@ -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 @@ -2669,7 +2670,7 @@ fi # auto-detect -fstack-protector-strong support (for QNX only currently) if [ "$XPLATFORM_QNX" = "yes" ]; then - if compilerSupportsFlag -fstack-protector-strong; then + if compilerSupportsFlag $TEST_COMPILER -fstack-protector-strong; then CFG_STACK_PROTECTOR_STRONG=yes else CFG_STACK_PROTECTOR_STRONG=no @@ -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" |