From 227e9a40cfeb7e00658cd343266e9d4140a4ebcf Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Sat, 10 Aug 2013 20:05:36 +0300 Subject: Get rid of HB dependency in FT font engine Instead of loading HB face in QFreetypeFace::getFace(), defer allocation until the first FT font engine for that face gets initialized; then, QFreetypeFace "reparents" and manages the loaded HB face. Change-Id: I2ac8ead4c6ed25d341af9c9cf0c34dfb979f8390 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/qfontengine_ft_p.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gui/text/qfontengine_ft_p.h') diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index bd4c855b91..e2e99893c8 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -99,7 +99,6 @@ struct QFreetypeFace } FT_Face face; - void *hbFace; int xsize; // 26.6 int ysize; // 26.6 FT_Matrix matrix; @@ -124,6 +123,9 @@ private: QAtomicInt ref; QMutex _lock; QByteArray fontData; + + void *hbFace; + qt_destroy_func_t hbFace_destroy_func; }; // If this is exported this breaks compilation of the windows -- cgit v1.2.3