diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-21 01:00:08 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-21 01:00:09 +0200 |
commit | 7a252ac46780b6145084d8d5ca0549b2de3639cc (patch) | |
tree | e8a938a26fb610e0eaba62dcf185b2e361f01951 /src/gui/text/qfontengine.cpp | |
parent | 10b8ed816d0dff4321d5a8b0723a8090b2058678 (diff) | |
parent | 2708c6c11d685ab25c12d558961d924c9a4533d2 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iaf28977e7ecf566b28b9406dcb005d48621169c2
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
-rw-r--r-- | src/gui/text/qfontengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 64623c86df..9b0b0ec0d5 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -1849,7 +1849,7 @@ QFontEngine *QFontEngineMulti::loadEngine(int at) // info about the actual script of the characters may have been discarded, // so we do not check for writing system support, but instead just load // the family indiscriminately. - if (QFontEngine *engine = QFontDatabase::findFont(request, QFontDatabase::Any)) { + if (QFontEngine *engine = QFontDatabase::findFont(request, QChar::Script_Common)) { engine->fontDef.weight = request.weight; if (request.style > QFont::StyleNormal) engine->fontDef.style = request.style; |