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>
This commit is contained in:
Joerg Bornemann 2021-03-11 14:51:13 +01:00
parent 3d71f1733d
commit 081b5398f8
3 changed files with 1 additions and 30 deletions

View File

@ -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)

14
configure vendored
View File

@ -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

View File

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