From 8f6b3284106fa11129e4fa6e5ec3adc6cb1f489f Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Wed, 3 Dec 2014 17:49:46 +0400 Subject: Fix regression introduced by 8e3fdf13543f43d7a4cb4fa41f Task-number: QTBUG-42963 Change-Id: Iaf2677a967ef424a3b781cdb2d3194d0e0e55333 Reviewed-by: aavit --- src/gui/text/qfontengine.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/gui/text/qfontengine.cpp') 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 -- cgit v1.2.3