diff options
| author | mread <qt-info@nokia.com> | 2009-08-26 14:28:06 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-28 08:57:38 (GMT) |
| commit | 719d5ac4220744d17344ff07ffaa9e86c01ac412 (patch) | |
| tree | 30dc926cf6b2df8a09ca8ab4e8c4f1aa36b4a34a /src/gui/text/qfontengine_s60_p.h | |
| parent | 625dbf4edd3a1057e525c68c319e4525741ceaaa (diff) | |
| download | Qt-719d5ac4220744d17344ff07ffaa9e86c01ac412.zip Qt-719d5ac4220744d17344ff07ffaa9e86c01ac412.tar.gz Qt-719d5ac4220744d17344ff07ffaa9e86c01ac412.tar.bz2 | |
Deleting the CFontStore without a crash
CFontStore deletion crashes if there are any open fonts in it.
These are now all deleted before the store is deleted.
Reviewed-by: aportale
Diffstat (limited to 'src/gui/text/qfontengine_s60_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_s60_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h index 0c1be8c..bbbc3d6 100644 --- a/src/gui/text/qfontengine_s60_p.h +++ b/src/gui/text/qfontengine_s60_p.h @@ -69,11 +69,12 @@ QT_BEGIN_NAMESPACE class QFontEngineS60Extensions { public: - QFontEngineS60Extensions(COpenFont *font); + QFontEngineS60Extensions(CFont* fontOwner, COpenFont *font); QByteArray getSfntTable(uint tag) const; const unsigned char *cmap() const; QPainterPath glyphOutline(glyph_t glyph) const; + CFont *fontOwner() const; private: COpenFont *m_font; @@ -82,6 +83,7 @@ private: mutable const unsigned char *m_cmap; mutable bool m_symbolCMap; mutable QByteArray m_cmapTable; + CFont* m_fontOwner; }; class QFontEngineS60 : public QFontEngine |