summaryrefslogtreecommitdiffstats
path: root/configure.bat
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-03-11 14:51:13 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-03-11 16:39:50 +0100
commit081b5398f874d952637c278264c0f80139a8b08b (patch)
treeb7aa98515820628d9702f705fcb34828361b6325 /configure.bat
parent3d71f1733da5ffed58850d9d4c8697c7a8e549fa (diff)
Remove the -qmake and -cmake configure arguments
Qt is built with CMake since 6.0 and the QMake build system was removed in 6.1. It's time to remove the -cmake and -qmake configure arguments for Qt 6.2. Fixes: QTBUG-88286 Change-Id: Ie726ec364ded025f8d93bd69b469561a6ae40aa9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'configure.bat')
-rw-r--r--configure.bat13
1 files changed, 0 insertions, 13 deletions
diff --git a/configure.bat b/configure.bat
index 43ecea2bea..640051f750 100644
--- a/configure.bat
+++ b/configure.bat
@@ -75,12 +75,6 @@ goto doneargs
if /i "%~1" == "-redo" goto redo
if /i "%~1" == "--redo" goto redo
- if /i "%~1" == "-cmake" goto cmake
- if /i "%~1" == "--cmake" goto cmake
-
- if /i "%~1" == "-qmake" goto qmake
- if /i "%~1" == "--qmake" goto qmake
-
:nextarg
shift
goto doargs
@@ -108,13 +102,6 @@ goto doneargs
echo No config.opt present - cannot redo configuration. >&2
exit /b 1
-:cmake
- goto nextarg
-
-:qmake
- echo ERROR: You cannot configure Qt 6 with qmake anymore. >&2
- exit /b 1
-
:doneargs
cd "%TOPQTDIR%"