diff options
Diffstat (limited to 'src/platformsupport/fontdatabases/mac')
-rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 12 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm index 7a6dfe266f..57fbf6032e 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -381,15 +381,13 @@ QT_WARNING_POP return ret; } -bool QCoreTextFontEngine::processHheaTable() const +void QCoreTextFontEngine::initializeHeightMetrics() const { - if (!QFontEngine::processHheaTable()) { - m_ascent = QFixed::fromReal(CTFontGetAscent(ctfont)); - m_descent = QFixed::fromReal(CTFontGetDescent(ctfont)); - m_leading = QFixed::fromReal(CTFontGetLeading(ctfont)); - } + m_ascent = QFixed::fromReal(CTFontGetAscent(ctfont)); + m_descent = QFixed::fromReal(CTFontGetDescent(ctfont)); + m_leading = QFixed::fromReal(CTFontGetLeading(ctfont)); - return true; + QFontEngine::initializeHeightMetrics(); } QFixed QCoreTextFontEngine::capHeight() const diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h index 5111e2ce2e..da75594fde 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h @@ -139,7 +139,7 @@ protected: bool hasColorGlyphs() const; bool shouldAntialias() const; bool shouldSmoothFont() const; - bool processHheaTable() const override; + void initializeHeightMetrics() const override; QCFType<CTFontRef> ctfont; QCFType<CGFontRef> cgFont; |