diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-11 14:51:13 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-11 16:39:50 +0100 |
| commit | 081b5398f874d952637c278264c0f80139a8b08b (patch) | |
| tree | b7aa98515820628d9702f705fcb34828361b6325 | |
| parent | 3d71f1733da5ffed58850d9d4c8697c7a8e549fa (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>
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 4 | ||||
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | configure.bat | 13 |
3 files changed, 1 insertions, 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) @@ -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%" |