whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check if the string inside the families list is empty and not the list 

This amends 97f73e9577 and accounts for
when the minimial QPA platform is used ensuring the fallback to the
QFontEngineBox.

Task-number: QTBUG-71743
Change-Id: I72d45e02754fe31e31a2234d53c45e1d20dfa3d2
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
bb10
Andy Shaw 2018-11-13 14:10:43 +01:00
parent d1e3a21631
commit 5cabf50164
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2830,7 +2830,7 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
fe = QFontDatabase::findFont(req, script);
if (fe) {
if (fe->type() == QFontEngine::Box && !req.families.isEmpty()) {
if (fe->type() == QFontEngine::Box && !req.families.at(0).isEmpty()) {
if (fe->ref.load() == 0)
delete fe;
fe = 0;