diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-03 17:44:15 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-06 20:09:02 +0000 |
| commit | 17b6967f6811cb3adeb8c7eb79a422d2c10ee0d1 (patch) | |
| tree | 10f1ceb388846737fe239f83e707ac9cdfebd227 /configure | |
| parent | cfba3fff052b0af411d21727a68e78ea3e6a21d0 (diff) | |
don't unnecessarily pass -qtconf to qmake
it makes the call more noisy for no particular reason.
and the new code is even easier to read ...
Change-Id: Ib4dfd373f351eeaca99e6bfc42b631f931ec987d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -884,9 +884,6 @@ fi # configure and build top-level makefile #------------------------------------------------------------------------------- -[ -z "$CFG_HOST_QT_TOOLS_PATH" ] && CFG_HOST_QT_TOOLS_PATH="$outpath/bin" -CFG_QMAKE_PATH="$CFG_HOST_QT_TOOLS_PATH/qmake" - # recreate command line for qmake set -f SAVED_IFS=$IFS @@ -902,4 +899,8 @@ if [ -n "$CFG_TOPLEVEL" ]; then cd .. fi -"$CFG_QMAKE_PATH" -qtconf "$QTCONFFILE" "$relpathMangled" -- "$@" +if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then + "$CFG_HOST_QT_TOOLS_PATH/qmake" -qtconf "$QTCONFFILE" "$relpathMangled" -- "$@" +else + "$outpath/bin/qmake" "$relpathMangled" -- "$@" +fi |