From 322e0034950a319629e661027427b72e6b516ca8 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 18 Apr 2026 00:24:11 +0300 Subject: [PATCH 23/23] Make Qt6-6.10 minimum requirement for Qt6x-client See RM #1959 Signed-off-by: Marko Lindqvist --- m4/qt.m4 | 2 +- meson.build | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/m4/qt.m4 b/m4/qt.m4 index e41833d0eb..af978a4d58 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 81c959ad70..a4f89b890e 100644 --- a/meson.build +++ b/meson.build @@ -899,7 +899,7 @@ if qtver == 'qt5' qt_opts = [] qt_cppflags = '-fPIC' elif qtver == 'qt6x' - qt_minver='0x060900' + qt_minver='0x060a00' add_global_arguments('-DQT_DISABLE_DEPRECATED_BEFORE=' + qt_minver, language : 'cpp') priv_conf_data.set('FC_QT6X_MODE', 1) qt_opts = 'cpp_std=c++17' @@ -3603,7 +3603,7 @@ if not qtfine if qtver == 'qt6' error('Qt6 >= 6.0 required for qt-client in Qt6 mode, but not found') elif qtver == 'qt6x' - error('Qt6 >= 6.9 required for qt-client in Qt6x mode, but not found') + error('Qt6 >= 6.10 required for qt-client in Qt6x mode, but not found') else error('Qt5 >= 5.15 required for qt-client in Qt5 mode, but not found') endif @@ -4259,7 +4259,7 @@ if not qtfine if qtver == 'qt6' error('Qt6 >= 6.0 required for qt-modpack-installer in Qt6 mode, but not found') elif qtver == 'qt6x' - error('Qt6 >= 6.9 required for qt-modpack-installer in Qt6x mode, but not found') + error('Qt6 >= 6.10 required for qt-modpack-installer in Qt6x mode, but not found') else error('Qt5 >= 5.15 required for qt-modpack-installer in Qt5 mode, but not found') endif @@ -4349,7 +4349,7 @@ if not qtfine if qtver == 'qt6' error('Qt6 >= 6.0 required for ruledit in Qt6 mode, but not found') elif qtver == 'qt6x' - error('Qt6 >= 6.9 required for ruledit in Qt6x mode, but not found') + error('Qt6 >= 6.10 required for ruledit in Qt6x mode, but not found') else error('Qt5 >= 5.15 required for ruledit in Qt5 mode, but not found') endif -- 2.53.0