From 16b95b65a6fea501dade6e3f5f1ad48f7dfaa173 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 14 Apr 2015 09:37:58 +0200 Subject: Q*GlyphCache: de-inline dtor and export vtable The destructor is the first virtual method. By not defining it out-of-line, we provoke multiple copies of vtables, not all of which can be merged by the linker. If the linker fails, RTTI such as dynamic_cast and catch-blocks involving the type will not work. Additionally, QFontEngineGlyphCache was not exported, and therefore also not its vtable, making it impossible for users outside of QtGui to get a unique RTTI for the class. Change-Id: Ib265945934216bb609629431eb4c71996d4fd39d Reported-by: Volker Krause Task-number: QTBUG-45582 Reviewed-by: Konstantin Ritt Reviewed-by: Friedemann Kleint Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/text.pri | 1 + 1 file changed, 1 insertion(+) (limited to 'src/gui/text/text.pri') diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 61e239f678..087927549f 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -47,6 +47,7 @@ HEADERS += \ SOURCES += \ text/qfont.cpp \ text/qfontengine.cpp \ + text/qfontengineglyphcache.cpp \ text/qfontsubset.cpp \ text/qfontmetrics.cpp \ text/qfontdatabase.cpp \ -- cgit v1.2.3