diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-09 20:11:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-10 12:44:21 +0000 |
| commit | ecb025e346b662548a5dec51eda61f0c812a4f57 (patch) | |
| tree | c646beaa3eee5f3cb7549b8ae64fc557bfa3c00f /configure.bat | |
| parent | 41d1785e130e5ab43b24635c890ee501971de18b (diff) | |
reduce nesting in configure.bat
for some inexplicable reason, configure.bat went into an endless loop
on win 8.1+ while attempting to parse the command line; this is clearly
a bug in cmd, so work around it.
amends 7af6e9bb.
Task-number: QTBUG-58019
Change-Id: I698a2a51891a4e7af75836c075888f70df865409
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.bat b/configure.bat index 47f1889277..7ce39e7ecf 100644 --- a/configure.bat +++ b/configure.bat @@ -89,13 +89,12 @@ goto doneargs :help type %QTSRC%\config_help.txt - if %TOPLEVEL% == true ( - for /d %%p in ("%TOPQTSRC%"\qt*) do ( - if not "%%p" == "%QTSRC%" ( - if exist "%%p\config_help.txt" ( - echo. - type "%%p\config_help.txt" - ) + if %TOPLEVEL% == false exit /b 1 + for /d %%p in ("%TOPQTSRC%"\qt*) do ( + if not "%%p" == "%QTSRC%" ( + if exist "%%p\config_help.txt" ( + echo. + type "%%p\config_help.txt" ) ) ) |