diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-12-03 17:49:46 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2014-12-09 03:31:12 +0100 |
| commit | 8f6b3284106fa11129e4fa6e5ec3adc6cb1f489f (patch) | |
| tree | 448b4d2053734cd79c003ee41786dc69a303f377 /src/gui/text/qfontengine.cpp | |
| parent | 27894537abac388eac904a180a0107f8c007fcbc (diff) | |
Fix regression introduced by 8e3fdf13543f43d7a4cb4fa41f
Task-number: QTBUG-42963
Change-Id: Iaf2677a967ef424a3b781cdb2d3194d0e0e55333
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index d6597a7a59..e686c9fe81 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -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 |