diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-11-07 09:53:56 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-11-13 20:43:06 +0000 |
| commit | 2316db05a89c7de6a10ac64e0860262b25ed2a31 (patch) | |
| tree | 4116b69f43b32b905abc216d4d703819b490f0ab /src/gui/text/qfontengine.cpp | |
| parent | 3a3e2193d7f8879e2d68c311c3149e9f6b779d5a (diff) | |
QFontEngine: Check for AAT support only with HB-NG
HB-old is unable to handle these anyways.
Change-Id: Ibe69b5d030134b8a0a76dc966b6dfc6b5ff9a883
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index a0eedee6b9..3208a199b7 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -370,17 +370,15 @@ bool QFontEngine::supportsScript(QChar::Script script) const 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 uint len; if (getSfntTableData(MAKE_TAG('m','o','r','t'), 0, &len) || getSfntTableData(MAKE_TAG('m','o','r','x'), 0, &len)) return true; - } #endif -#ifdef QT_ENABLE_HARFBUZZ_NG - if (qt_useHarfbuzzNG()) { bool ret = false; if (hb_face_t *face = hb_qt_face_get_for_engine(const_cast<QFontEngine *>(this))) { hb_tag_t script_tag_1, script_tag_2; |