Mercurial > octave
changeset 26884:e201cf0c7360
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 11 Mar 2019 20:45:44 +0000 |
parents | a2aed4b49be3 (current diff) 7a6366dbe77e (diff) |
children | e247ecdee41d |
files | libgui/graphics/Figure.cc libgui/graphics/module.mk libinterp/corefcn/input.cc |
diffstat | 4 files changed, 25 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc Sat Mar 09 10:25:11 2019 +0000 +++ b/libgui/graphics/Figure.cc Mon Mar 11 20:45:44 2019 +0000 @@ -768,7 +768,6 @@ connect (window, SIGNAL (screenChanged (QScreen*)), this, SLOT (screenChanged (QScreen*))); - #endif } @@ -789,6 +788,8 @@ // from the GUI thread does not necessarily trigger a redraw. Force it. redraw (); } +#else + octave_unused_parameter (screen); #endif }
--- a/libgui/graphics/module.mk Sat Mar 09 10:25:11 2019 +0000 +++ b/libgui/graphics/module.mk Mon Mar 11 20:45:44 2019 +0000 @@ -131,7 +131,7 @@ $(FONTCONFIG_CPPFLAGS) \ $(HDF5_CPPFLAGS) \ @OCTGUI_DLL_DEFS@ \ - @QT_CPPFLAGS@ \ + @QT_OPENGL_CPPFLAGS@ \ -Ilibgui/graphics -I$(srcdir)/libgui/graphics \ -Isrc -I$(srcdir)/libgui/src \ -Iliboctave \ @@ -146,7 +146,9 @@ -I$(srcdir)/libinterp/octave-value %canon_reldir%___init_qt___la_LDFLAGS = \ - -avoid-version -module $(NO_UNDEFINED_LDFLAG) $(WARN_LDFLAGS) + -avoid-version -module $(NO_UNDEFINED_LDFLAG) \ + $(QT_OPENGL_LDFLAGS) \ + $(WARN_LDFLAGS) DLD_LIBOCTGUI_LIBADD = $(OCT_GUI_LINK_DEPS)
--- a/libinterp/corefcn/input.cc Sat Mar 09 10:25:11 2019 +0000 +++ b/libinterp/corefcn/input.cc Mon Mar 11 20:45:44 2019 +0000 @@ -498,22 +498,25 @@ m_mfile_encoding.end (), m_mfile_encoding.begin (), ::tolower); - std::string codepage = (m_mfile_encoding.compare ("system") == 0) + std::string encoding = (m_mfile_encoding.compare ("system") == 0) ? octave_locale_charset_wrapper () : m_mfile_encoding; - // Check for valid codepage. + // Check for valid encoding name. void *codec - = octave_iconv_open_wrapper (codepage.c_str (), "utf-8"); + = octave_iconv_open_wrapper (encoding.c_str (), "utf-8"); - if (errno == EINVAL) + if (codec == reinterpret_cast<void *> (-1)) { m_mfile_encoding = saved_encoding; - - error ("__mfile_encoding__: conversion from codepage '%s' not supported", - codepage.c_str ()); + if (errno == EINVAL) + error ("__mfile_encoding__: conversion from encoding '%s' " + "not supported", encoding.c_str ()); + else + error ("__mfile_encoding__: error %d opening encoding '%s'.", + errno, encoding.c_str ()); } - - octave_iconv_close_wrapper (codec); + else + octave_iconv_close_wrapper (codec); } }
--- a/m4/acinclude.m4 Sat Mar 09 10:25:11 2019 +0000 +++ b/m4/acinclude.m4 Mon Mar 11 20:45:44 2019 +0000 @@ -1820,7 +1820,7 @@ AC_LANG_PUSH(C++) ac_octave_save_CPPFLAGS="$CPPFLAGS" ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" + CPPFLAGS="$QT_OPENGL_CPPFLAGS $CXXPICFLAG $CPPFLAGS" CXXFLAGS="$CXXPICFLAG $CXXFLAGS" AC_CHECK_HEADERS([QOffscreenSurface]) AC_CACHE_CHECK([whether Qt supports full offscreen OpenGL rendering], @@ -1874,7 +1874,7 @@ AC_LANG_PUSH(C++) ac_octave_save_CPPFLAGS="$CPPFLAGS" ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" + CPPFLAGS="$QT_OPENGL_CPPFLAGS $CXXPICFLAG $CPPFLAGS" CXXFLAGS="$CXXPICFLAG $CXXFLAGS" AC_CHECK_HEADERS([QOpenGLWidget QGLWidget QGLFunctions_1_1]) AC_CACHE_CHECK([whether Qt works with OpenGL and GLU], @@ -2009,6 +2009,8 @@ QT_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $QT_MODULES | $SED -e 's/^ *$//')" QT_LDFLAGS="$($PKG_CONFIG --libs-only-L $QT_MODULES | $SED -e 's/^ *$//')" QT_LIBS="$($PKG_CONFIG --libs-only-l $QT_MODULES | $SED -e 's/^ *$//')" + QT_OPENGL_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $QT_OPENGL_MODULE | $SED -e 's/^ *$//')" + QT_OPENGL_LDFLAGS="$($PKG_CONFIG --libs-only-L $QT_OPENGL_MODULE | $SED -e 's/^ *$//')" QT_OPENGL_LIBS="$($PKG_CONFIG --libs-only-l $QT_OPENGL_MODULE | $SED -e 's/^ *$//')" case $host_os in @@ -2017,6 +2019,7 @@ if test -z "$QT_LIBS"; then QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" + QT_OPENGL_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_OPENGL_MODULE | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" QT_OPENGL_LIBS="`$PKG_CONFIG --libs-only-other $QT_OPENGL_MODULE | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" ## Enabling link_all_deps works around libtool's imperfect handling ## of the -F flag @@ -2173,6 +2176,8 @@ AC_SUBST(QT_CPPFLAGS) AC_SUBST(QT_LDFLAGS) AC_SUBST(QT_LIBS) + AC_SUBST(QT_OPENGL_CPPFLAGS) + AC_SUBST(QT_OPENGL_LDFLAGS) AC_SUBST(QT_OPENGL_LIBS) ]) dnl