Mercurial > octave

diff libgui/src/octave-qobject.cc @ 31222:1a0756f7c90a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9c0099048264
children 59c9da7c43d6 c6d54dd31a7e
line wrap: on
line diff
--- a/libgui/src/octave-qobject.cc	Wed Aug 31 22:04:02 2022 +0200
+++ b/libgui/src/octave-qobject.cc	Sat Sep 03 00:18:49 2022 +0200
@@ -40,7 +40,9 @@
 // QTerminal includes
 #include "QTerminal.h"
 
-#include "command-widget.h"
+#if defined (HAVE_QSCINTILLA)
+#  include "command-widget.h"
+#endif
 #include "community-news.h"
 #include "documentation-dock-widget.h"
 #include "files-dock-widget.h"
@@ -461,6 +463,7 @@
           = QPointer<terminal_dock_widget> (new terminal_dock_widget (mw, *this));
         if (experimental_terminal_widget ())
           {
+#if defined (HAVE_QSCINTILLA)
             command_widget *cmd_widget
               = m_terminal_widget->get_command_widget ();
 
@@ -483,6 +486,7 @@
                      m_terminal_widget, &terminal_dock_widget::new_command_line_signal);
 
             connect_interpreter_events (cmd_widget);
+#endif
           }
         else
           {