From 585eee896fe9ec132ce60f0255fcbe4a71c7376f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 16 Jun 2024 22:22:13 +0300 Subject: [PATCH 21/26] Make Qt-6.6 minimum version for Qt6x mode See osdn #48550 Signed-off-by: Marko Lindqvist --- m4/qt.m4 | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/qt.m4 b/m4/qt.m4 index 903463e6eb..c95f7f12ae 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([0x060400], [6.4]) + xqt6x|xQt6x) FC_QT6([0x060600], [6.6]) 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 4efb25d68a..208c211c06 100644 --- a/meson.build +++ b/meson.build @@ -895,7 +895,7 @@ if qtver == 'qt5' priv_conf_data.set('FC_QT5_MODE', 1) qt_opts = [] elif qtver == 'qt6x' - add_global_arguments('-DQT_DISABLE_DEPRECATED_BEFORE=0x060400', language : 'cpp') + add_global_arguments('-DQT_DISABLE_DEPRECATED_BEFORE=0x060600', language : 'cpp') priv_conf_data.set('FC_QT6X_MODE', 1) qt_opts = 'cpp_std=c++17' else -- 2.43.0