Mercurial > octave

diff libgui/graphics/GLCanvas.cc @ 31751:e863066429f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
assume QOffscreenSurface is available QOffscreenSurface was introduced in Qt 5.1. * acinclude.m4 (OCTAVE_CHECK_QT_OPENGL_OFFSCREEN_OK): Delete. (OCTAVE_CHECK_QT_VERSION): Delete use. * configure.ac, geometryimages.m, interpimages.m, module.mk, plotimages.m, sparseimages.m, splineimages.m, GLCanvas.cc, GLCanvas.h, getframe.m, __check_rendering_capability__.m, copyobj.m, hgsave.m, jupyter-notebook.tst, publish.tst: Eliminate checks for Qt OffscreenSurface feature. Assume it is always available.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Jan 2023 13:11:02 -0500
parents 5f11de0e7440
children 345a3f5890e7
line wrap: on
line diff
--- a/libgui/graphics/GLCanvas.cc	Tue Jan 17 10:27:03 2023 -0500
+++ b/libgui/graphics/GLCanvas.cc	Tue Jan 17 13:11:02 2023 -0500
@@ -290,7 +290,6 @@
 
     if (! isValid ())
       {
-#  if defined (HAVE_QT_OFFSCREEN)
         static bool os_ctx_ok = true;
         if (os_ctx_ok && ! m_os_context.isValid ())
           {
@@ -304,9 +303,6 @@
           }
 
         retval = m_os_context.makeCurrent (&m_os_surface);
-#  else
-        retval = false;
-#  endif
       }
     else
       makeCurrent ();