Mercurial > octave-nkf

diff libgui/qterminal/libqterminal/unix/TerminalView.cpp @ 19009:c59745865c7f gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to gui-release.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Aug 2014 09:06:21 -0400
parents 8b566ad1f88a 625e3bb65885
children dcb260e7a648 be7ac98fab43
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Wed Jul 30 07:02:41 2014 +0200
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Fri Aug 01 09:06:21 2014 -0400
@@ -212,8 +212,11 @@
       // Disabling kerning saves some computation when rendering text.
       // font.setKerning(false);
 
-      font.setStyleStrategy (  QFont::StyleStrategy(font.styleStrategy()
-                             | QFont::ForceIntegerMetrics)  );
+      QFont::StyleStrategy strategy = font.styleStrategy();
+#if defined (HAVE_QFONT_FORCE_INTEGER_METRICS)
+      strategy |= QFont::ForceIntegerMetrics;
+#endif
+      font.setStyleStrategy(QFont::StyleStrategy(strategy));
 
       QWidget::setFont(font);
       fontChange(font);