diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-23 15:37:57 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-02 15:36:13 +0000 |
| commit | ba7ef28ea90b9eb490ebe4e10983105c5b66ce7f (patch) | |
| tree | 3b69791a5a71f0b0a12fb5a90127d5ff3adc2b79 | |
| parent | 6886b11625b4334ce0eea5fd2a988b73db0f65d0 (diff) | |
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>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.bat | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -404,7 +404,7 @@ OPT_VERBOSE=no OPT_HELP= CFG_SILENT=no CFG_DEV=no -BUILD_WITH_CMAKE=no +BUILD_WITH_CMAKE=yes #------------------------------------------------------------------------------- # parse command line arguments diff --git a/configure.bat b/configure.bat index 90d2eaa4f5..4c93e4b7e6 100644 --- a/configure.bat +++ b/configure.bat @@ -69,7 +69,7 @@ exit /b 1 set SYNCQT= set PLATFORM= set MAKE= -set CMAKE= +set CMAKE=true call :doargs %ARGS% if errorlevel 1 exit /b goto doneargs @@ -156,7 +156,7 @@ goto doneargs goto nextarg :qmake - set CMAKE= + set CMAKE=false goto nextarg :doneargs |