Mercurial > octave
changeset 29853:b918ef934b71
allow building without QScintilla to work again (bug #60879)
* main-window.cc (main_window::adopt_editor_widget): Get pointer to
qt_interpreter_events outside of HAVE_QSCINTILLA conditional since it
is always needed.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 05 Jul 2021 09:02:55 -0400 |
| parents | b2455f0a8297 |
| children | 2bb72743d3eb |
| files | libgui/src/main-window.cc |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Sun Jul 04 11:29:14 2021 +0200 +++ b/libgui/src/main-window.cc Mon Jul 05 09:02:55 2021 -0400 @@ -337,6 +337,10 @@ void main_window::adopt_editor_widget (void) { + interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj (); + + qt_interpreter_events *qt_link = interp_qobj->qt_link (); + #if defined (HAVE_QSCINTILLA) file_editor *editor = new file_editor (this, m_octave_qobj); @@ -402,10 +406,6 @@ connect (m_file_browser_window, &files_dock_widget::file_renamed_signal, editor, &file_editor::handle_file_renamed); - interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj (); - - qt_interpreter_events *qt_link = interp_qobj->qt_link (); - // Signals for removing/renaming files/dirs in the terminal window connect (qt_link, &qt_interpreter_events::file_renamed_signal, editor, &file_editor::handle_file_renamed);