summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltan Arvai <zarvai@inf.u-szeged.hu>2013-11-21 16:58:26 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-22 10:20:07 +0100
commit5c99c148b2e0b48577953ab40ead5009f8aca071 (patch)
tree5606bd13a87366cf8251411c7e0cedb2bb6349df
parentb69da78438492af157bb03d5d76a701538db5470 (diff)
Fix which method in functions.prf on Windows.
The first "set _endwhich" needs a value to work well. Change-Id: I1fb65b71dd7dd378de62d2836ba003d54787cd23 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--build/qmake/mkspecs/features/functions.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/qmake/mkspecs/features/functions.prf b/build/qmake/mkspecs/features/functions.prf
index 87a547b68..78a0272a0 100644
--- a/build/qmake/mkspecs/features/functions.prf
+++ b/build/qmake/mkspecs/features/functions.prf
@@ -61,7 +61,7 @@ defineReplace(which) {
command = $$split(out, " ")
executable = $$first(command)
# Return the first match only
- out = $$system("((for /f \"usebackq delims=\" %i in (`where $$executable 2^> NUL`) do @if not defined _endwhich (@echo %i & set _endwhich)) & set _endwhich=)")
+ out = $$system("((for /f \"usebackq delims=\" %i in (`where $$executable 2^> NUL`) do @if not defined _endwhich (@echo %i & set _endwhich=true)) & set _endwhich=)")
isEmpty(out) {
message($$executable not found)
out = $$executable