[LyX features/killqt4] Remove a workaround that seems to be useless since Qt 4.8

Jean-Marc Lasgouttes lasgouttes at lyx.org
Sat Nov 19 18:16:10 UTC 2022


The branch, killqt4, has been updated.

- Log -----------------------------------------------------------------

commit 546efc3ff116ecfc0980ae32e6282c965f39918d
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Sat Nov 19 20:09:59 2022 +0100

    Remove a workaround that seems to be useless since Qt 4.8

diff --git a/src/frontends/qt/GuiFontLoader.cpp b/src/frontends/qt/GuiFontLoader.cpp
index ebc3857..d980dac 100644
--- a/src/frontends/qt/GuiFontLoader.cpp
+++ b/src/frontends/qt/GuiFontLoader.cpp
@@ -284,14 +284,6 @@ QFont makeQFont(FontInfo const & f)
 			QString family = makeFontName(toqstr(lyxrc.roman_font_name),
 				toqstr(lyxrc.roman_font_foundry));
 			font.setFamily(family);
-#ifdef Q_OS_MAC
-			// FIXME KILLQT4: Double-check that this is fixed in Qt5
-			// Workaround for a Qt bug, see http://www.lyx.org/trac/ticket/3684
-			// and http://bugreports.qt.nokia.com/browse/QTBUG-11145.
-			// FIXME: Check whether this is really fixed in Qt 4.8
-			if (family == "Times" && !font.exactMatch())
-				font.setFamily("Times New Roman");
-#endif
 			break;
 		}
 		case SANS_FAMILY:

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt/GuiFontLoader.cpp |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Repository for new features


More information about the lyx-cvs mailing list