From 081b5398f874d952637c278264c0f80139a8b08b Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 11 Mar 2021 14:51:13 +0100
Subject: [PATCH 1/2] 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>
---
 cmake/QtProcessConfigureArgs.cmake |  4 +---
 configure                          | 14 --------------
 configure.bat                      | 13 -------------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake
index 70dd5b92e3..1f0007ac45 100644
--- a/cmake/QtProcessConfigureArgs.cmake
+++ b/cmake/QtProcessConfigureArgs.cmake
@@ -53,9 +53,7 @@ unset(device_options)
 set_property(GLOBAL PROPERTY UNHANDLED_ARGS "")
 while(NOT "${configure_args}" STREQUAL "")
     list(POP_FRONT configure_args arg)
-    if(arg STREQUAL "-cmake")
-        # ignore
-    elseif(arg STREQUAL "-cmake-generator")
+    if(arg STREQUAL "-cmake-generator")
         list(POP_FRONT configure_args generator)
     elseif(arg STREQUAL "-cmake-use-default-generator")
         set(auto_detect_generator FALSE)
diff --git a/configure b/configure
index a0f1b873d2..b2c978b025 100755
--- a/configure
+++ b/configure
@@ -228,20 +228,6 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
-    cmake)
-        # Ignore. Kept to keep build scripts working. Consider removal in Qt 6.2.
-        ;;
-    qmake)
-        echo >&2 "ERROR: You cannot configure Qt 6 with qmake anymore."
-        ERROR=yes
-        ;;
-    redo)
-        if [ -f ${outpathPrefix}config.opt ]; then
-            if grep -e ^-cmake <${outpathPrefix}config.opt >/dev/null 2>&1; then
-                BUILD_WITH_CMAKE=yes
-            fi
-        fi
-        ;;
     *)
         ;;
     esac
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%"

From 24f790490fe4dd76374ad74d51a51d57331d620c Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 11 Mar 2021 14:56:42 +0100
Subject: [PATCH 2/2] Remove superfluous variable assignments from
 configure.bat

Change-Id: I18d17a4ec8f5a33cb13282b584ecd75dd861d040
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 configure.bat | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/configure.bat b/configure.bat
index 640051f750..36fae68144 100644
--- a/configure.bat
+++ b/configure.bat
@@ -53,10 +53,6 @@ echo ERROR: You cannot configure qtbase separately within a top-level build. >&2
 exit /b 1
 :wastoplevel
 
-set SYNCQT=
-set PLATFORM=
-set MAKE=
-set CMAKE=true
 call :doargs %ARGS%
 if errorlevel 1 exit /b
 goto doneargs