Mercurial > octave
changeset 30426:8d303ace1aff stable
build: Include QScintilla header conditionally on configure result
* libgui/src/resource-manager.h: Include <Qsci/qscilexer.h> conditionally on
HAVE_QSCINTILLA.
* libgui/src/settings-dialog.cc (settings_dialog::update_editor_lexers):
Silence compiler warning about unused variable.
See: https://octave.discourse.group/t/1914
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sat, 04 Dec 2021 16:36:59 +0100 |
| parents | a51d2c4a25f4 |
| children | d1d96e1339e3 2ac26917bdec |
| files | libgui/src/resource-manager.h libgui/src/settings-dialog.cc |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/resource-manager.h Sat Dec 04 09:24:44 2021 +0100 +++ b/libgui/src/resource-manager.h Sat Dec 04 16:36:59 2021 +0100 @@ -29,7 +29,9 @@ #include <QComboBox> #include <QIcon> #include <QPointer> -#include <Qsci/qscilexer.h> +#if defined (HAVE_QSCINTILLA) +# include <Qsci/qscilexer.h> +#endif #include <QTranslator> #include <QTemporaryFile>
--- a/libgui/src/settings-dialog.cc Sat Dec 04 09:24:44 2021 +0100 +++ b/libgui/src/settings-dialog.cc Sat Dec 04 16:36:59 2021 +0100 @@ -625,6 +625,7 @@ void settings_dialog::update_editor_lexers (int def) { #if defined (HAVE_QSCINTILLA) + QCheckBox *cb_color_mode = group_box_editor_styles->findChild <QCheckBox *> (ed_color_mode.key); @@ -639,15 +640,15 @@ resource_manager& rmgr = m_octave_qobj.get_resource_manager (); gui_settings *settings = rmgr.get_settings (); -#if defined (HAVE_LEXER_OCTAVE) +# if defined (HAVE_LEXER_OCTAVE) lexer = new QsciLexerOctave (); update_lexer (lexer, settings, m, def); delete lexer; -#elif defined (HAVE_LEXER_MATLAB) +# elif defined (HAVE_LEXER_MATLAB) lexer = new QsciLexerMatlab (); update_lexer (lexer, settings, m, def); delete lexer; -#endif +# endif lexer = new QsciLexerCPP (); update_lexer (lexer, settings, m, def); @@ -676,6 +677,11 @@ lexer = new octave_txt_lexer (); update_lexer (lexer, settings, m, def); delete lexer; + +#else + + octave_unused_parameter (def); + #endif }