Mercurial > octave

changeset 28847:7d9a11de251f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Wed, 30 Sep 2020 14:09:50 -0400
parents a55766bb10ca (current diff) 2219027f5bd4 (diff)
children 751afb1ee1d0
files libgui/qterminal/libqterminal/unix/TerminalView.cpp libgui/src/m-editor/file-editor.cc libgui/src/main-window.cc libgui/src/resource-manager.cc libgui/src/variable-editor.cc m4/acinclude.m4
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Wed Sep 30 17:51:11 2020 +0200
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Wed Sep 30 14:09:50 2020 -0400
@@ -213,7 +213,7 @@
       // Disabling kerning saves some computation when rendering text.
       // font.setKerning(false);
 
-      QFont::StyleStrategy strategy = font.styleStrategy();
+      int strategy = font.styleStrategy();
 #if defined (HAVE_QFONT_FORCE_INTEGER_METRICS)
       strategy |= QFont::ForceIntegerMetrics;
 #endif
@@ -968,7 +968,7 @@
 #else
   foreach (QRect rect, (pe->region() & contentsRect()).rects())
 #endif
-  {
+    {
       drawBackground(paint,rect,palette().window().color());
       drawContents(paint, rect);
     }