Mercurial > octave
changeset 31754:106c7532a764
always build Qt graphics library
* libgui/graphics/module.mk: Eliminate AM_CONDITIONAL surrounding
contents of entire file.
(%canon_reldir%_libgraphics_la_CPPFLAGS): Include @QT_CPPFLAGS@ in the
list in place of the previously removed @QT_OPENGL_CPPFLAGS@.
* acinclude.m4 (OCTAVE_CHECK_QT): Don't define AM_CONDITIONAL
AMCOND_BUILD_QT_GRAPHICS.
(OCTAVE_CHECK_QT, OCTAVE_CHECK_QT_VERSION): Delete unused
build_qt_graphics variable.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Jan 2023 20:31:53 -0500 |
| parents | 93067553a722 |
| children | eb32cf98eed1 |
| files | libgui/graphics/module.mk m4/acinclude.m4 |
| diffstat | 2 files changed, 1 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/module.mk Tue Jan 17 15:48:16 2023 -0500 +++ b/libgui/graphics/module.mk Tue Jan 17 20:31:53 2023 -0500 @@ -1,5 +1,3 @@ -if AMCOND_BUILD_QT_GRAPHICS - OCTAVE_GUI_GRAPHICS_MOC = \ %reldir%/moc-ButtonControl.cc \ %reldir%/moc-ButtonGroup.cc \ @@ -128,6 +126,7 @@ $(FONTCONFIG_CPPFLAGS) \ $(HDF5_CPPFLAGS) \ @OCTGUI_DLL_DEFS@ \ + @QT_CPPFLAGS@ \ -Ilibgui/graphics -I$(srcdir)/libgui/graphics \ -Ilibgui/src -I$(srcdir)/libgui/src \ -Iliboctave \ @@ -152,5 +151,3 @@ $(libgraphics_MOC) \ $(libgraphics_MOC_H) \ $(libgraphics_UI_H) - -endif
--- a/m4/acinclude.m4 Tue Jan 17 15:48:16 2023 -0500 +++ b/m4/acinclude.m4 Tue Jan 17 20:31:53 2023 -0500 @@ -1614,7 +1614,6 @@ octave_qt_versions="$1" build_qt_gui=no - build_qt_graphics=no use_qscintilla=no win32_terminal=no @@ -1683,7 +1682,6 @@ fi AM_CONDITIONAL([AMCOND_BUILD_QT_GUI], [test $build_qt_gui = yes]) - AM_CONDITIONAL([AMCOND_BUILD_QT_GRAPHICS], [test $build_qt_graphics = yes]) AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], [test $use_qscintilla = yes]) AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) ]) @@ -1782,7 +1780,6 @@ qt_version="$1"; build_qt_gui=yes - build_qt_graphics=no win32_terminal=no warn_qt_libraries=""