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: 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>
---
 configure | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'configure')

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
-- 
cgit v1.2.3