From ba7ef28ea90b9eb490ebe4e10983105c5b66ce7f Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 23 Oct 2020 15:37:57 +0200 Subject: [PATCH] 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 --- configure | 2 +- configure.bat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index c104e2534af..073f2a1b3a4 100755 --- a/configure +++ b/configure @@ -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 90d2eaa4f55..4c93e4b7e6a 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