Mercurial > octave

comparison 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
comparison
equal deleted inserted replaced
31221:f5755dbacd8d 31222:1a0756f7c90a
38 #include <QTranslator> 38 #include <QTranslator>
39 39
40 // QTerminal includes 40 // QTerminal includes
41 #include "QTerminal.h" 41 #include "QTerminal.h"
42 42
43 #include "command-widget.h" 43 #if defined (HAVE_QSCINTILLA)
44 # include "command-widget.h"
45 #endif
44 #include "community-news.h" 46 #include "community-news.h"
45 #include "documentation-dock-widget.h" 47 #include "documentation-dock-widget.h"
46 #include "files-dock-widget.h" 48 #include "files-dock-widget.h"
47 #include "history-dock-widget.h" 49 #include "history-dock-widget.h"
48 #include "interpreter-qobject.h" 50 #include "interpreter-qobject.h"
459 { 461 {
460 m_terminal_widget 462 m_terminal_widget
461 = QPointer<terminal_dock_widget> (new terminal_dock_widget (mw, *this)); 463 = QPointer<terminal_dock_widget> (new terminal_dock_widget (mw, *this));
462 if (experimental_terminal_widget ()) 464 if (experimental_terminal_widget ())
463 { 465 {
466 #if defined (HAVE_QSCINTILLA)
464 command_widget *cmd_widget 467 command_widget *cmd_widget
465 = m_terminal_widget->get_command_widget (); 468 = m_terminal_widget->get_command_widget ();
466 469
467 connect (cmd_widget, &command_widget::interpreter_pause, 470 connect (cmd_widget, &command_widget::interpreter_pause,
468 this, &base_qobject::interpreter_pause); 471 this, &base_qobject::interpreter_pause);
481 484
482 connect (qt_link (), &qt_interpreter_events::new_command_line_signal, 485 connect (qt_link (), &qt_interpreter_events::new_command_line_signal,
483 m_terminal_widget, &terminal_dock_widget::new_command_line_signal); 486 m_terminal_widget, &terminal_dock_widget::new_command_line_signal);
484 487
485 connect_interpreter_events (cmd_widget); 488 connect_interpreter_events (cmd_widget);
489 #endif
486 } 490 }
487 else 491 else
488 { 492 {
489 QTerminal *cmd_widget = m_terminal_widget->get_qterminal (); 493 QTerminal *cmd_widget = m_terminal_widget->get_qterminal ();
490 494