summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure7
-rw-r--r--configure.bat3
2 files changed, 10 insertions, 0 deletions
diff --git a/configure b/configure
index b76f22a43f..1d23b8eb40 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.bat b/configure.bat
index 171074bc68..ca106486a6 100644
--- a/configure.bat
+++ b/configure.bat
@@ -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