AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QFontEngine: Check for AAT support only with HB-NG

Browse Source 
HB-old is unable to handle these anyways.

Change-Id: Ibe69b5d030134b8a0a76dc966b6dfc6b5ff9a883
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Konstantin Ritt 2015-11-07 09:53:56 +04:00
parent 3a3e2193d7
commit 2316db05a8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/text/qfontengine.cpp
View File

@ -370,17 +370,15 @@ bool QFontEngine::supportsScript(QChar::Script script) const
return true; return true;
} }
#ifdef Q_OS_MAC #ifdef QT_ENABLE_HARFBUZZ_NG
{ if (qt_useHarfbuzzNG()) {
#if defined(Q_OS_DARWIN)
// in AAT fonts, 'gsub' table is effectively replaced by 'mort'/'morx' table // in AAT fonts, 'gsub' table is effectively replaced by 'mort'/'morx' table
uint len; uint len;
if (getSfntTableData(MAKE_TAG('m','o','r','t'), 0, &len) || getSfntTableData(MAKE_TAG('m','o','r','x'), 0, &len)) if (getSfntTableData(MAKE_TAG('m','o','r','t'), 0, &len) || getSfntTableData(MAKE_TAG('m','o','r','x'), 0, &len))
return true; return true;
}
#endif #endif
#ifdef QT_ENABLE_HARFBUZZ_NG
if (qt_useHarfbuzzNG()) {
bool ret = false; bool ret = false;
if (hb_face_t *face = hb_qt_face_get_for_engine(const_cast<QFontEngine *>(this))) { if (hb_face_t *face = hb_qt_face_get_for_engine(const_cast<QFontEngine *>(this))) {
hb_tag_t script_tag_1, script_tag_2; hb_tag_t script_tag_1, script_tag_2;