anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 21:05:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport GuiFontLoader deprecation warning fixes

Browse Source
This commit is contained in:
Juergen Spitzmueller 2021-03-13 12:04:58 +01:00
parent aad8804549
commit 85ece5fb3d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiFontLoader.cpp
View File

@ -226,6 +226,7 @@ QFont symbolFont(QString const & family, bool * ok)
return font; return font;
} }
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
// A simple setFamily() fails on Qt 2 // A simple setFamily() fails on Qt 2
QString const raw = rawName(family); QString const raw = rawName(family);
@ -237,6 +238,7 @@ QFont symbolFont(QString const & family, bool * ok)
*ok = true; *ok = true;
return font; return font;
} }
#endif
LYXERR_NOPOS(Debug::FONT, " FAILED :-("); LYXERR_NOPOS(Debug::FONT, " FAILED :-(");
*ok = false; *ok = false;
@ -370,7 +372,9 @@ QFont makeQFont(FontInfo const & f)
else else
LYXERR(Debug::FONT, "This font is NOT an exact match"); LYXERR(Debug::FONT, "This font is NOT an exact match");
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
LYXERR(Debug::FONT, "XFLD: " << font.rawName()); LYXERR(Debug::FONT, "XFLD: " << font.rawName());
#endif
font.setPointSizeF(f.realSize() * lyxrc.currentZoom / 100.0); font.setPointSizeF(f.realSize() * lyxrc.currentZoom / 100.0);