Mercurial > octave

comparison libinterp/corefcn/toplev.cc @ 31752:345a3f5890e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 52a5bec0fc74
children 21f9b34eb893
comparison
equal deleted inserted replaced
31751:e863066429f1 31752:345a3f5890e7
538 { "QRUPDATE_LDFLAGS", build_env::QRUPDATE_LDFLAGS }, 538 { "QRUPDATE_LDFLAGS", build_env::QRUPDATE_LDFLAGS },
539 { "QRUPDATE_LIBS", build_env::QRUPDATE_LIBS }, 539 { "QRUPDATE_LIBS", build_env::QRUPDATE_LIBS },
540 { "QT_CPPFLAGS", build_env::QT_CPPFLAGS }, 540 { "QT_CPPFLAGS", build_env::QT_CPPFLAGS },
541 { "QT_LDFLAGS", build_env::QT_LDFLAGS }, 541 { "QT_LDFLAGS", build_env::QT_LDFLAGS },
542 { "QT_LIBS", build_env::QT_LIBS }, 542 { "QT_LIBS", build_env::QT_LIBS },
543 { "QT_OPENGL_LIBS", build_env::QT_OPENGL_LIBS },
544 { "RANLIB", build_env::RANLIB }, 543 { "RANLIB", build_env::RANLIB },
545 { "RDYNAMIC_FLAG", build_env::RDYNAMIC_FLAG }, 544 { "RDYNAMIC_FLAG", build_env::RDYNAMIC_FLAG },
546 { "READLINE_LIBS", build_env::READLINE_LIBS }, 545 { "READLINE_LIBS", build_env::READLINE_LIBS },
547 { "SHARED_LIBS", build_env::SHARED_LIBS }, 546 { "SHARED_LIBS", build_env::SHARED_LIBS },
548 { "SH_LDFLAGS", build_env::SH_LDFLAGS }, 547 { "SH_LDFLAGS", build_env::SH_LDFLAGS },