AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix enum passed to QFontDatabase::findFont

Browse Source 
The script taken here is a QChar::Script, not a
QFontDatabase::WritingSystem. This means it was passing QChar::Unknown.

Change-Id: I919ae7187ba277346a7719116a94776dce24dd84
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Allan Sandfeld Jensen 2018-10-15 14:57:59 +02:00
parent fc4b0769a5
commit 1cd2955173
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/text/qfontdatabase.h
View File

@ -160,8 +160,8 @@ private:
static void createDatabase(); static void createDatabase();
static void parseFontName(const QString &name, QString &foundry, QString &family); static void parseFontName(const QString &name, QString &foundry, QString &family);
static QString resolveFontFamilyAlias(const QString &family); static QString resolveFontFamilyAlias(const QString &family);
static QFontEngine *findFont(const QFontDef &request, int script); static QFontEngine *findFont(const QFontDef &request, int script /* QChar::Script */);
static void load(const QFontPrivate *d, int script); static void load(const QFontPrivate *d, int script /* QChar::Script */);
friend struct QFontDef; friend struct QFontDef;
friend class QFontPrivate; friend class QFontPrivate;

2
src/gui/text/qfontengine.cpp
View File

@ -1849,7 +1849,7 @@ QFontEngine *QFontEngineMulti::loadEngine(int at)
// info about the actual script of the characters may have been discarded, // info about the actual script of the characters may have been discarded,
// so we do not check for writing system support, but instead just load // so we do not check for writing system support, but instead just load
// the family indiscriminately. // the family indiscriminately.
if (QFontEngine *engine = QFontDatabase::findFont(request, QFontDatabase::Any)) { if (QFontEngine *engine = QFontDatabase::findFont(request, QChar::Script_Common)) {
engine->fontDef.weight = request.weight; engine->fontDef.weight = request.weight;
if (request.style > QFont::StyleNormal) if (request.style > QFont::StyleNormal)
engine->fontDef.style = request.style; engine->fontDef.style = request.style;