From 17b6967f6811cb3adeb8c7eb79a422d2c10ee0d1 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Tue, 3 Jan 2017 17:44:15 +0100
Subject: [PATCH] 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>
---
 configure | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index d6a263dc8ef..074606dfe96 100755
--- a/configure
+++ b/configure
@@ -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