Mercurial > octave
comparison libinterp/build-env.h @ 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 | 597f3ee61a48 |
children | 21f9b34eb893 |
comparison
equal
deleted
inserted
replaced
31751:e863066429f1 | 31752:345a3f5890e7 |
---|---|
142 extern OCTINTERP_API const char *QRUPDATE_LDFLAGS; | 142 extern OCTINTERP_API const char *QRUPDATE_LDFLAGS; |
143 extern OCTINTERP_API const char *QRUPDATE_LIBS; | 143 extern OCTINTERP_API const char *QRUPDATE_LIBS; |
144 extern OCTINTERP_API const char *QT_CPPFLAGS; | 144 extern OCTINTERP_API const char *QT_CPPFLAGS; |
145 extern OCTINTERP_API const char *QT_LDFLAGS; | 145 extern OCTINTERP_API const char *QT_LDFLAGS; |
146 extern OCTINTERP_API const char *QT_LIBS; | 146 extern OCTINTERP_API const char *QT_LIBS; |
147 extern OCTINTERP_API const char *QT_OPENGL_LIBS; | |
148 extern OCTINTERP_API const char *RANLIB; | 147 extern OCTINTERP_API const char *RANLIB; |
149 extern OCTINTERP_API const char *RDYNAMIC_FLAG; | 148 extern OCTINTERP_API const char *RDYNAMIC_FLAG; |
150 extern OCTINTERP_API const char *READLINE_LIBS; | 149 extern OCTINTERP_API const char *READLINE_LIBS; |
151 extern OCTINTERP_API const char *SHARED_LIBS; | 150 extern OCTINTERP_API const char *SHARED_LIBS; |
152 extern OCTINTERP_API const char *SH_LDFLAGS; | 151 extern OCTINTERP_API const char *SH_LDFLAGS; |