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

Fix regression introduced by 8e3fdf1354

Browse Source 
Task-number: QTBUG-42963
Change-Id: Iaf2677a967ef424a3b781cdb2d3194d0e0e55333
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
This commit is contained in:
Konstantin Ritt 2014-12-03 17:49:46 +04:00
parent 27894537ab
commit 8f6b328410
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1635,7 +1635,12 @@ QFontEngine *QFontEngineMulti::loadEngine(int at)
request.styleStrategy |= QFont::NoFontMerging;
request.family = fallbackFamilyAt(at - 1);
return QFontDatabase::findFont(m_script, /*fontprivate = */0, request, /*multi = */false);
if (QFontEngine *engine = QFontDatabase::findFont(m_script, /*fontprivate = */0, request, /*multi = */false)) {
engine->fontDef = request;
return engine;
}
return 0;
}
glyph_t QFontEngineMulti::glyphIndex(uint ucs4) const