AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't unnecessarily pass -qtconf to qmake

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2017-01-03 17:44:15 +01:00
parent cfba3fff05
commit 17b6967f68
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -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