diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-04-23 14:27:02 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 15:37:23 +0200 |
commit | e95d94cbbdcb6e7f7f87f1e636a31f21cc5e8563 (patch) | |
tree | a9fefef9dc335fc1aaaf21137b320ce941d87f26 /src/plugins/platforms/windows/qwindowsfontdatabase.h | |
parent | d7a102ac65951d646fc08fcc1bec13ee0cd8f866 (diff) |
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 <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.h | 9 |
1 files changed, 9 insertions, 0 deletions
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<WinApplicationFont> m_applicationFonts; + + struct UniqueFontData { + HANDLE handle; + QAtomicInt refCount; + }; + + QMap<QString, UniqueFontData> m_uniqueFontData; }; QT_END_NAMESPACE |