Default to cmake when building Qt

People that insist on qmake builds of Qt can configure with -qmake

Task-number: QTBUG-87049
Change-Id: I5729b654d4c8b9c6b526234ba5563aff8fd750e1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-10-23 15:37:57 +02:00 committed by Joerg Bornemann
parent 6886b11625
commit ba7ef28ea9
2 changed files with 3 additions and 3 deletions

2
configure vendored
View File

@ -404,7 +404,7 @@ OPT_VERBOSE=no
OPT_HELP= OPT_HELP=
CFG_SILENT=no CFG_SILENT=no
CFG_DEV=no CFG_DEV=no
BUILD_WITH_CMAKE=no BUILD_WITH_CMAKE=yes
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# parse command line arguments # parse command line arguments

View File

@ -69,7 +69,7 @@ exit /b 1
set SYNCQT= set SYNCQT=
set PLATFORM= set PLATFORM=
set MAKE= set MAKE=
set CMAKE= set CMAKE=true
call :doargs %ARGS% call :doargs %ARGS%
if errorlevel 1 exit /b if errorlevel 1 exit /b
goto doneargs goto doneargs
@ -156,7 +156,7 @@ goto doneargs
goto nextarg goto nextarg
:qmake :qmake
set CMAKE= set CMAKE=false
goto nextarg goto nextarg
:doneargs :doneargs