From cabc226b2a26cc890ab94a1d4de526f9d89bc327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 21 Aug 2015 12:00:26 +0200
Subject: [PATCH] build-style qmake: don't use configure_script

When running do_configure(), configure_script is already set to
./configure and we can't set another default.
Thus always use qmake directly.
---
 common/build-style/qmake.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh
index 4815f67cb01..62a565648e2 100644
--- a/common/build-style/qmake.sh
+++ b/common/build-style/qmake.sh
@@ -2,14 +2,12 @@
 # This helper is for templates using Qt4/Qt5 qmake.
 #
 do_configure() {
-	configure_script=qmake
-
 	if [ -n "$build_pie" ]; then
-		${configure_script} ${configure_args} \
+		qmake ${configure_args} \
 			QMAKE_LFLAGS_SHLIB+=" -Wl,-z,now" \
 			QMAKE_LFLAGS_PLUGIN+=" -Wl,-z,now"
 	else
-		${configure_script} ${configure_args}
+		qmake ${configure_args}
 	fi
 }