summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-12-04 14:17:46 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-12-10 15:25:37 +0100
commit126c5c501a305ee43c5e51261421266f09ed3bb4 (patch)
tree8f83bdb99090439e5a133b087bf811e8f3c0012b /configure
parent928b51704a14d038f940759830579e82899ae8e5 (diff)
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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 7 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