From 184958d301d975335b17d6433ac5195fc37a0ece Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 18 Apr 2026 00:21:26 +0300 Subject: [PATCH 34/34] Make Qt6-6.10 minimum requirement for Qt6x-client See RM #1959 Signed-off-by: Marko Lindqvist --- m4/qt.m4 | 2 +- meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/qt.m4 b/m4/qt.m4 index b4e45b817c..01b49d0258 100644 --- a/m4/qt.m4 +++ b/m4/qt.m4 @@ -8,7 +8,7 @@ AC_DEFUN([FC_QT], FC_QT_CXXFLAGS="$FC_QT6_CXXFLAGS" FC_QT_LIBS="$FC_QT6_LIBS" fc_qt_usable="$fc_qt6_usable" ;; - xqt6x|xQt6x) FC_QT6([0x060900], [6.9]) + xqt6x|xQt6x) FC_QT6([0x060a00], [6.10]) FC_QT_CPPFLAGS="$FC_QT6_CPPFLAGS" FC_QT_CXXFLAGS="$FC_QT6_CXXFLAGS" FC_QT_LIBS="$FC_QT6_LIBS" diff --git a/meson.build b/meson.build index fdfd916426..dc8dd7f6de 100644 --- a/meson.build +++ b/meson.build @@ -931,8 +931,8 @@ if get_option('audio') == 'sdl3' or get_option('clients').contains('sdl3') endif if qtver == 'qt6x' - qt_minver = '0x060900' - qt_vercheck = '6.9' + qt_minver = '0x060a00' + qt_vercheck = '6.10' qt_modename = 'Qt6x' add_global_arguments('-DQT_DISABLE_DEPRECATED_BEFORE=' + qt_minver, language : 'cpp') priv_conf_data.set('FC_QT6X_MODE', 1) -- 2.53.0