Skip to content

Commit

Permalink
reduce nesting in configure.bat
Browse files Browse the repository at this point in the history
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 7af6e9b.

Task-number: QTBUG-58019
Change-Id: I698a2a51891a4e7af75836c075888f70df865409
Reviewed-by: Jake Petroules <[email protected]>
  • Loading branch information
ossilator authored and liangqi committed Jan 10, 2017
1 parent 41d1785 commit ecb025e
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
)
)
Expand Down

0 comments on commit ecb025e

Please sign in to comment.