From e95d94cbbdcb6e7f7f87f1e636a31f21cc5e8563 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 23 Apr 2012 14:27:02 +0300 Subject: Windows: Fix QRawFont loading from data. The implementation for loading QRawFont from data was missing from Windows QPA plugin. For freetype font database, just called the parent QBasicFontDatabse implementation. For native font database, ported the implementation from Qt 4.8 qrawfont_win.cpp. Task-number: QTBUG-24197 Change-Id: Ia784d4cbc4f37c925aa49e53d04faf06a7169a73 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/platforms/windows/qwindowsfontdatabase.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase.h') diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.h b/src/plugins/platforms/windows/qwindowsfontdatabase.h index 3921992775..f442f492aa 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.h @@ -87,6 +87,8 @@ public: virtual QFont defaultFont() const { return systemDefaultFont(); } virtual bool fontsAlwaysScalable() const; + void derefUniqueFont(const QString &uniqueFont); + void refUniqueFont(const QString &uniqueFont); static QFont systemDefaultFont(); @@ -112,6 +114,13 @@ private: }; QList m_applicationFonts; + + struct UniqueFontData { + HANDLE handle; + QAtomicInt refCount; + }; + + QMap m_uniqueFontData; }; QT_END_NAMESPACE -- cgit v1.2.3