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%"