Mercurial > octave

comparison libgui/src/module.mk @ 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 a0e13472457d
children a103cfd738c5
comparison
equal deleted inserted replaced
31221:f5755dbacd8d 31222:1a0756f7c90a
263 %reldir%/m-editor/moc-octave-txt-lexer.cc \ 263 %reldir%/m-editor/moc-octave-txt-lexer.cc \
264 %reldir%/m-editor/moc-marker.cc 264 %reldir%/m-editor/moc-marker.cc
265 265
266 $(OCTAVE_GUI_SRC_M_EDITOR_MOC): | %reldir%/m-editor/$(octave_dirstamp) 266 $(OCTAVE_GUI_SRC_M_EDITOR_MOC): | %reldir%/m-editor/$(octave_dirstamp)
267 267
268 OCTAVE_GUI_SRC_COMMAND_WIDGET_MOC = \
269 %reldir%/moc-command-widget.cc
270
271 $(OCTAVE_GUI_SRC_COMMAND_WIDGET_MOC): | %reldir%/$(octave_dirstamp)
272
268 octave_gui_MOC += \ 273 octave_gui_MOC += \
269 $(OCTAVE_GUI_SRC_M_EDITOR_MOC) 274 $(OCTAVE_GUI_SRC_M_EDITOR_MOC) \
275 $(OCTAVE_GUI_SRC_COMMAND_WIDGET_MOC)
270 276
271 DIRSTAMP_FILES += \ 277 DIRSTAMP_FILES += \
272 %reldir%/m-editor/$(octave_dirstamp) 278 %reldir%/m-editor/$(octave_dirstamp) \
279 %reldir%/$(octave_dirstamp)
273 280
274 endif 281 endif
275 282
276 OCTAVE_GUI_SRC_MOC = \ 283 OCTAVE_GUI_SRC_MOC = \
277 %reldir%/moc-external-editor-interface.cc \ 284 %reldir%/moc-external-editor-interface.cc \
278 %reldir%/moc-command-widget.cc \
279 %reldir%/moc-community-news.cc \ 285 %reldir%/moc-community-news.cc \
280 %reldir%/moc-dialog.cc \ 286 %reldir%/moc-dialog.cc \
281 %reldir%/moc-documentation-dock-widget.cc \ 287 %reldir%/moc-documentation-dock-widget.cc \
282 %reldir%/moc-documentation.cc \ 288 %reldir%/moc-documentation.cc \
283 %reldir%/moc-documentation-bookmarks.cc \ 289 %reldir%/moc-documentation-bookmarks.cc \