2 files changed, 20 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index 4e50d6c53f..2ea7e6f00d 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -192,6 +192,25 @@ void QCoreTextFontEngine::init()
     setUserData(QVariant::fromValue((void *)cgFont));
 }
 
+glyph_t QCoreTextFontEngine::glyphIndex(uint ucs4) const
+{
+    int len = 0;
+
+    QChar str[2];
+    if (Q_UNLIKELY(QChar::requiresSurrogates(ucs4))) {
+        str[len++] = QChar(QChar::highSurrogate(ucs4));
+        str[len++] = QChar(QChar::lowSurrogate(ucs4));
+    } else {
+        str[len++] = QChar(ucs4);
+    }
+
+    CGGlyph glyphIndices[2];
+
+    CTFontGetGlyphsForCharacters(ctfont, (const UniChar *)str, glyphIndices, len);
+
+    return glyphIndices[0];
+}
+
 bool QCoreTextFontEngine::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs,
                                        int *nglyphs, QFontEngine::ShaperFlags flags) const
 {
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
index 1cdac820b6..0070aede24 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
@@ -62,6 +62,7 @@ public:
     QCoreTextFontEngine(CGFontRef font, const QFontDef &def);
     ~QCoreTextFontEngine();
 
+    virtual glyph_t glyphIndex(uint ucs4) const;
     virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const;
     virtual void recalcAdvances(QGlyphLayout *, ShaperFlags) const;