From 0cff91f2ee627a703040dfb5e0ad53448db50921 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 19 Aug 2026 03:55:25 +0300 Subject: [PATCH 57/57] Meson: Silence sfinae-incomplete warnings with Qt < 6.11 See RM #2149 Signed-off-by: Marko Lindqvist --- meson.build | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 0002888299..9c985e7134 100644 --- a/meson.build +++ b/meson.build @@ -949,6 +949,18 @@ else qt_opts = 'cpp_std=c++17' endif +qt_mod = import('qt6') + +if cxx_build and cxx_compiler.has_argument('-Wno-sfinae-incomplete') + qt_si_dep = dependency('Qt6', modules: ['Core', 'Gui', 'Widgets'], + version: '< 6.11', + required: false) + + if qt_si_dep.found() + add_global_arguments('-Wno-sfinae-incomplete', language : 'cpp') + endif +endif + if get_option('audio') != 'none' priv_conf_data.set('AUDIO_SDL', 1) @@ -3715,7 +3727,6 @@ if gtk4_theme 'freeciv/themes/gtk4/Freeciv/gtk-4.0')) endif -qt_mod = import('qt6') qt_dep = dependency('Qt6', modules: ['Core', 'Gui', 'Widgets'], version: '>= ' + qt_vercheck, required: false) -- 2.53.0