2 files changed, 18 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index 92430c35bd..400a5ea805 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -215,6 +215,9 @@ void QCoreTextFontEngine::init()
     } else
         avgCharWidth = QFontEngine::averageCharWidth();
 
+    underlineThickness = QFixed::fromReal(CTFontGetUnderlineThickness(ctfont));
+    underlinePos = -QFixed::fromReal(CTFontGetUnderlinePosition(ctfont));
+
     cache_cost = (CTFontGetAscent(ctfont) + CTFontGetDescent(ctfont)) * avgCharWidth.toInt() * 2000;
 
     // HACK hb_coretext requires both CTFont and CGFont but user_data is only void*
@@ -757,6 +760,16 @@ bool QCoreTextFontEngine::supportsTransformation(const QTransform &transform) co
         return false;
 }
 
+QFixed QCoreTextFontEngine::lineThickness() const
+{
+    return underlineThickness;
+}
+
+QFixed QCoreTextFontEngine::underlinePosition() const
+{
+    return underlinePos;
+}
+
 QFontEngine::Properties QCoreTextFontEngine::properties() const
 {
     Properties result;
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
index 6f12f5a705..5681347931 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
@@ -92,6 +92,9 @@ public:
     int synthesized() const Q_DECL_OVERRIDE { return synthesisFlags; }
     bool supportsSubPixelPositions() const Q_DECL_OVERRIDE { return true; }
 
+    QFixed lineThickness() const Q_DECL_OVERRIDE;
+    QFixed underlinePosition() const Q_DECL_OVERRIDE;
+
     void draw(CGContextRef ctx, qreal x, qreal y, const QTextItemInt &ti, int paintDeviceHeight);
 
     FaceId faceId() const Q_DECL_OVERRIDE;
@@ -140,6 +143,8 @@ private:
     int synthesisFlags;
     CGAffineTransform transform;
     QFixed avgCharWidth;
+    QFixed underlineThickness;
+    QFixed underlinePos;
     QFontEngine::FaceId face_id;
     mutable bool kerningPairsLoaded;
 };