Mercurial > octave
comparison libgui/src/main-window.cc @ 31222:1a0756f7c90a
disable experimental terminal widget when building without qscintilla
* command-widget.cc: inlcude into #if defined (HAVE_QSCINTILLA)
* main-window.cc: include command-widget.h only if HAVE_QSCINTILLA
* module.mk: only build moc-command-widget.cc if HAVE_QSCINTILLA
* octave-qobject.cc: include command-widget.h only if HAVE_QSCINTILLA,
(base_qobject::terminal_widget): use conditional compilation where
referring to new terminal widget
* terminal-dock-widget.cc: include command-widget.h only if HAVE_QSCINTILLA,
(terminal_dock_widget, init_command_prompt): use conditional compilation
where referring to new terminal widget
* terminal-dock-widget.h: use conditional compilation where referring to
new terminal widget Thu Sep 01 02:34:37 2022 +0200
* octave.cc (cmdline_options): only return true on experimental terminal
widget option if built with scintilla
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Sat, 03 Sep 2022 00:18:49 +0200 |
parents | be5f23b39ee3 |
children | 50a225732661 |
comparison
equal
deleted
inserted
replaced
31221:f5755dbacd8d | 31222:1a0756f7c90a |
---|---|
56 // QTerminal includes | 56 // QTerminal includes |
57 #include "QTerminal.h" | 57 #include "QTerminal.h" |
58 | 58 |
59 #if defined (HAVE_QSCINTILLA) | 59 #if defined (HAVE_QSCINTILLA) |
60 # include "file-editor.h" | 60 # include "file-editor.h" |
61 # include "command-widget.h" | |
61 #endif | 62 #endif |
62 #include "command-widget.h" | |
63 #include "gui-preferences-cs.h" | 63 #include "gui-preferences-cs.h" |
64 #include "gui-preferences-dw.h" | 64 #include "gui-preferences-dw.h" |
65 #include "gui-preferences-ed.h" | 65 #include "gui-preferences-ed.h" |
66 #include "gui-preferences-global.h" | 66 #include "gui-preferences-global.h" |
67 #include "gui-preferences-mw.h" | 67 #include "gui-preferences-mw.h" |