changeset 25430:292268688dac

maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 05 Jun 2018 13:28:45 -0400
parents ecc488aa56a0 (current diff) 2b3c3c8c8360 (diff)
children 6782d1f0fe54
files libinterp/corefcn/oct-stream.cc
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/geometryimages.m	Tue Jun 05 16:22:59 2018 +0200
+++ b/doc/interpreter/geometryimages.m	Tue Jun 05 13:28:45 2018 -0400
@@ -143,7 +143,7 @@
   if (isempty (available_graphics_toolkits ()))
     error ("no graphics toolkit available for plotting");
   elseif (strcmp ("qt", graphics_toolkit ())
-          && __have_feature__ ("QOFFSCREENSURFACE"))
+          && __have_feature__ ("QT_OFFSCREEN"))
     ## Use qt with QOffscreenSurface for plot
   elseif (! strcmp ("gnuplot", graphics_toolkit ()) ...
           && ! __have_feature__ ("OSMESA"))
--- a/doc/interpreter/interpimages.m	Tue Jun 05 16:22:59 2018 +0200
+++ b/doc/interpreter/interpimages.m	Tue Jun 05 13:28:45 2018 -0400
@@ -86,7 +86,7 @@
   if (isempty (available_graphics_toolkits ()))
     error ("no graphics toolkit available for plotting");
   elseif (strcmp ("qt", graphics_toolkit ())
-          && __have_feature__ ("QOFFSCREENSURFACE"))
+          && __have_feature__ ("QT_OFFSCREEN"))
     ## Use qt with QOffscreenSurface for plot
   elseif (! strcmp ("gnuplot", graphics_toolkit ())
           && ! __have_feature__ ("OSMESA"))
--- a/doc/interpreter/plotimages.m	Tue Jun 05 16:22:59 2018 +0200
+++ b/doc/interpreter/plotimages.m	Tue Jun 05 13:28:45 2018 -0400
@@ -124,7 +124,7 @@
   if (isempty (available_graphics_toolkits ()))
     error ("no graphics toolkit available for plotting");
   elseif (strcmp ("qt", graphics_toolkit ())
-          && __have_feature__ ("QOFFSCREENSURFACE"))
+          && __have_feature__ ("QT_OFFSCREEN"))
     ## Use qt with QOffscreenSurface for plot
   elseif (! strcmp ("gnuplot", graphics_toolkit ()) ...
           && ! __have_feature__ ("OSMESA"))
--- a/doc/interpreter/sparseimages.m	Tue Jun 05 16:22:59 2018 +0200
+++ b/doc/interpreter/sparseimages.m	Tue Jun 05 13:28:45 2018 -0400
@@ -245,7 +245,7 @@
   if (isempty (available_graphics_toolkits ()))
     error ("no graphics toolkit available for plotting");
   elseif (strcmp ("qt", graphics_toolkit ())
-          && __have_feature__ ("QOFFSCREENSURFACE"))
+          && __have_feature__ ("QT_OFFSCREEN"))
     ## Use qt with QOffscreenSurface for plot
   elseif (! strcmp ("gnuplot", graphics_toolkit ())
           && ! __have_feature__ ("OSMESA"))
--- a/doc/interpreter/splineimages.m	Tue Jun 05 16:22:59 2018 +0200
+++ b/doc/interpreter/splineimages.m	Tue Jun 05 13:28:45 2018 -0400
@@ -176,7 +176,7 @@
   if (isempty (available_graphics_toolkits ()))
     error ("no graphics toolkit available for plotting");
   elseif (strcmp ("qt", graphics_toolkit ())
-          && __have_feature__ ("QOFFSCREENSURFACE"))
+          && __have_feature__ ("QT_OFFSCREEN"))
     ## Use qt with QOffscreenSurface for plot
   elseif (! strcmp ("gnuplot", graphics_toolkit ())
           && ! __have_feature__ ("OSMESA"))