From ecb025e346b662548a5dec51eda61f0c812a4f57 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 9 Jan 2017 20:11:25 +0100 Subject: [PATCH] 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 --- configure.bat | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/configure.bat b/configure.bat index 47f1889277e..7ce39e7ecf4 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" ) ) )