summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/text/qfontengine.cpp7
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