Mercurial > octave
comparison libgui/src/command-widget.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 | d5696a4efa84 |
children | ed7b17c7ddf3 |
comparison
equal
deleted
inserted
replaced
31221:f5755dbacd8d | 31222:1a0756f7c90a |
---|---|
24 //////////////////////////////////////////////////////////////////////// | 24 //////////////////////////////////////////////////////////////////////// |
25 | 25 |
26 #if defined (HAVE_CONFIG_H) | 26 #if defined (HAVE_CONFIG_H) |
27 # include "config.h" | 27 # include "config.h" |
28 #endif | 28 #endif |
29 | |
30 #if defined (HAVE_QSCINTILLA) | |
29 | 31 |
30 #include <QGroupBox> | 32 #include <QGroupBox> |
31 #include <QHBoxLayout> | 33 #include <QHBoxLayout> |
32 #include <QLabel> | 34 #include <QLabel> |
33 #include <QLineEdit> | 35 #include <QLineEdit> |
298 QsciScintilla::keyPressEvent(e); | 300 QsciScintilla::keyPressEvent(e); |
299 } | 301 } |
300 } | 302 } |
301 | 303 |
302 } | 304 } |
305 | |
306 #endif |