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 /configure | |
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>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -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 |