diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-01-11 16:58:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-14 14:07:48 +0100 |
| commit | e11cf63b0babcba8709cd39ff46e43e773f7fa9f (patch) | |
| tree | 9e225f8c34ac39aa5b8e69d25eb6a1bdd9e011b2 /src/gui/text/qfontengineglyphcache_p.h | |
| parent | 9941bf5118f1944fe882497444308e7d3a48e349 (diff) | |
Fix crash when trying to create paths for color-glyphs (Emoji) on Mac
CoreText segfaults when creating paths for color-glyphs:
0 0x00007fff8fd41e69 in TFont::FindColourBitmapForGlyph ()
1 0x00007fff8fd417ac in TFont::CreatePathForGlyph ()
2 0x000000010567d1af in QCoreTextFontEngine::addGlyphsToPath (...)
So we shortcut the code-path, since we don't support Emoji yet anyways.
Task-number: QTBUG-28615
Change-Id: Ife16ae4959077d9eaaf6ea5cd1f27a4e2e01e7f5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/gui/text/qfontengineglyphcache_p.h')
| -rw-r--r-- | src/gui/text/qfontengineglyphcache_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h index 18440f22fa..092873a4d4 100644 --- a/src/gui/text/qfontengineglyphcache_p.h +++ b/src/gui/text/qfontengineglyphcache_p.h @@ -69,7 +69,8 @@ public: enum Type { Raster_RGBMask, Raster_A8, - Raster_Mono + Raster_Mono, + Raster_ARGB }; QFontEngineGlyphCache(const QTransform &matrix, Type type) : m_transform(matrix), m_type(type) { } |