Fix support for scripts that require OpenType

We need to load OpenType tables when initializing fonts for
scripts that require them. This fixes support for many Brahmic
scripts.

Change-Id: Ib5e50f2c7e5edb4b3e3ecf9fd004f2cf62634add
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2012-03-07 09:49:20 +01:00 committed by Qt by Nokia
parent 7df2422fa4
commit 3d6901066a
2 changed files with 2 additions and 2 deletions

View File

@ -229,7 +229,7 @@ QFontEngine *QBasicFontDatabase::fontEngine(const QFontDef &fontDef, QUnicodeTab
delete engine; delete engine;
engine = 0; engine = 0;
} else if (scriptRequiresOpenType(script)) { } else if (scriptRequiresOpenType(script)) {
HB_Face hbFace = engine->harfbuzzFace(); HB_Face hbFace = engine->initializedHarfbuzzFace();
if (!hbFace || !hbFace->supported_scripts[script]) { if (!hbFace || !hbFace->supported_scripts[script]) {
delete engine; delete engine;
engine = 0; engine = 0;

View File

@ -575,7 +575,7 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, QUnicodeTables::
delete engine; delete engine;
engine = 0; engine = 0;
} else if (scriptRequiresOpenType(script)) { } else if (scriptRequiresOpenType(script)) {
HB_Face hbFace = engine->harfbuzzFace(); HB_Face hbFace = engine->initializedHarfbuzzFace();
if (!hbFace || !hbFace->supported_scripts[script]) { if (!hbFace || !hbFace->supported_scripts[script]) {
delete engine; delete engine;
engine = 0; engine = 0;