From e39541512137a65b7098397aeaf7216eeeb8ec41 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 20 Jul 2026 19:44:35 +0300 Subject: [PATCH 27/27] Do not include anything Qt-specific to ruledit.cpp Declare ruledit_qt_run() in ruledit.h, so ruledit.cpp compilation sees it without including Qt-specific headers. This fixes compilation failure with nls disabled and g++-16. See RM #2075 Signed-off-by: Marko Lindqvist --- tools/ruledit/ruledit.cpp | 1 - tools/ruledit/ruledit.h | 4 ++++ tools/ruledit/ruledit_qt.h | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ruledit/ruledit.cpp b/tools/ruledit/ruledit.cpp index 9931f3dcaa..d2bf97a157 100644 --- a/tools/ruledit/ruledit.cpp +++ b/tools/ruledit/ruledit.cpp @@ -42,7 +42,6 @@ // ruledit #include "comments.h" -#include "ruledit_qt.h" #include "ruledit.h" diff --git a/tools/ruledit/ruledit.h b/tools/ruledit/ruledit.h index 08be924d92..4f21ae9ac9 100644 --- a/tools/ruledit/ruledit.h +++ b/tools/ruledit/ruledit.h @@ -20,4 +20,8 @@ struct ruledit_arguments { extern struct ruledit_arguments reargs; +// Declared here so ruledit.cpp compilation sees it, without +// including anything Qt-specific. +int ruledit_qt_run(int argc, char **argv); + #endif // FC__RULEDIT_H diff --git a/tools/ruledit/ruledit_qt.h b/tools/ruledit/ruledit_qt.h index 7066ea8eb9..751514b781 100644 --- a/tools/ruledit/ruledit_qt.h +++ b/tools/ruledit/ruledit_qt.h @@ -156,7 +156,6 @@ signals: void incoming_req_vec_change(const requirement_vector *vec); }; -int ruledit_qt_run(int argc, char **argv); void ruledit_qt_display_requirers(const char *msg, void *data); void show_experimental(QWidget *wdg); -- 2.53.0