Mercurial > octave
diff configure.ac @ 31752:345a3f5890e7
assume QOpenGLWidget is available
QOpenGLWidget was introduced in Qt 5.4.
* acinclude.m4 (OCTAVE_CHECK_QT_OPENGL_OK): Delete.
(OCTAVE_CHECK_QT_VERSION): Delete use. Don't define separate macros
and compiler flag variables for QtOpenGL module. Include them with
the other Qt compiler flags.
* subst-config-vals.in.sh, subst-cross-config-vals.in.sh,
configure.ac, GLCanvas.cc, GLCanvas.h, module.mk, build-env.h,
build-env.in.cc, toplev.cc: Eliminate checks for Qt QOpenGLWidget.
Assume it is always available. Eliminate QtOpenGL configuration
variables.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Jan 2023 13:43:26 -0500 |
| parents | e863066429f1 |
| children | 56223b5a01d4 |
line wrap: on
line diff
--- a/configure.ac Tue Jan 17 13:11:02 2023 -0500 +++ b/configure.ac Tue Jan 17 13:43:26 2023 -0500 @@ -3027,8 +3027,8 @@ OCTAVE_GUI_LINK_OPTS="" if test $build_qt_gui = yes; then - LIBOCTGUI_LINK_DEPS="$QT_LIBS $QT_OPENGL_LIBS" - LIBOCTGUI_LINK_OPTS="$QT_LDFLAGS $QT_OPENGL_LDFLAGS" + LIBOCTGUI_LINK_DEPS="$QT_LIBS" + LIBOCTGUI_LINK_OPTS="$QT_LDFLAGS" if test $link_all_deps = yes || test -n "$QT_LDFLAGS"; then LIBOCTGUI_LINK_DEPS="$LIBOCTGUI_LINK_DEPS $LIBOCTINTERP_LINK_DEPS" @@ -3273,7 +3273,6 @@ Qt CPPFLAGS: $QT_CPPFLAGS Qt LDFLAGS: $QT_LDFLAGS Qt GUI libraries: $QT_LIBS - Qt OpenGL libraries: $QT_OPENGL_LIBS Qt moc: $MOC $MOCFLAGS Qt uic: $UIC $UICFLAGS Qt rcc: $RCC $RCCFLAGS