CMake: Disable building Qt with qmake
Print an error message when configure is passed the -qmake option. The only supported way to build Qt now is with CMake. This means the CMakeLists.txt files are the source of truth now, and pro2cmake will not have to be used anymore. The .pro files can be removed at a later time. The same is true for configure.cmake files. They are the authoritative source, and the configure.json files will be removed at a later time. Task-number: QTBUG-88741 Change-Id: Ia9de4c1411978b40b13e9b982977e7818164c984 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
928b51704a
commit
126c5c501a
7
configure
vendored
7
configure
vendored
@ -920,6 +920,12 @@ else
|
||||
fi
|
||||
}
|
||||
|
||||
printQmakeBuildErrorAndExit()
|
||||
{
|
||||
echo >&2 "ERROR: You cannot configure Qt 6 with qmake anymore. Please configure with -cmake instead."
|
||||
exit 1
|
||||
}
|
||||
|
||||
checkTopLevelBuild "$@"
|
||||
parseCommandline "$@"
|
||||
handleHelp
|
||||
@ -945,6 +951,7 @@ if [ "$BUILD_WITH_CMAKE" = "yes" ]; then
|
||||
|
||||
cmake "-DOPTFILE=$optfilename" $top_level_arg -P "$relpath/cmake/QtProcessConfigureArgs.cmake"
|
||||
else
|
||||
printQmakeBuildErrorAndExit
|
||||
findPerl
|
||||
findAwk
|
||||
findMake
|
||||
|
@ -163,6 +163,9 @@ goto doneargs
|
||||
|
||||
if "%CMAKE%" == "true" goto cmake
|
||||
|
||||
echo ERROR: You cannot configure Qt 6 with qmake anymore. Please configure with -cmake instead. >&2
|
||||
exit /b 1
|
||||
|
||||
rem Find various executables
|
||||
for %%C in (clang-cl.exe clang.exe cl.exe icl.exe g++.exe perl.exe jom.exe) do set %%C=%%~$PATH:C
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user