commit: 85090ab2fd1d546306205faab526f5ab452a27dc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 21 18:22:24 2026 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 28 20:57:59 2026 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=85090ab2
ecm.eclass: Unconditionally set BUILD_WITH_QT6 to ON
...instead of setting QT_MAJOR_VERSION=6, which upstream have discouraged.
This could lead to Qt5 preference in case a build system finds Qt5Core
before including any module that inits QtVersionOption.cmake, but almost
none of those should be left at this point [that we package].
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/ecm.eclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 8d675ad953..7436afd2bd 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -581,7 +581,7 @@ ecm_src_configure() {
append-cppflags -DQT_NO_DEBUG
fi
- local cmakeargs=( -DQT_MAJOR_VERSION=6 )
+ local cmakeargs
if in_iuse test; then
cmakeargs+=( $(usev !test -DBUILD_TESTING=OFF) )
@@ -611,6 +611,7 @@ ecm_src_configure() {
set(ECM_DISABLE_APPSTREAMTEST ON CACHE BOOL "") #
*-disable-appstreamtest.patch
set(ECM_DISABLE_GIT ON CACHE BOOL "") #
*-disable-git-commit-hooks.patch
+ set(BUILD_WITH_QT6 ON CACHE BOOL "") # QtVersionOption.cmake:
Hard-require Qt6
# KDEInstallDirs6 section
set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "") # install
mkspecs in same dir as Qt stuff
# move handbook outside of doc dir, bug #667138
