diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-03-23 14:17:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-27 17:06:59 +0200 |
| commit | 4f1820e3a77b3fdda32a1b935502b187e73059cf (patch) | |
| tree | b4547ee03c9ba6257ad51134f689ad466eebae30 /src/plugins/platforms/windows/qwindowsfontdatabase_ft.h | |
| parent | d41e0564f5f6a002ca2cdb0d745de8e75247ea99 (diff) | |
Implement application font loading for Windows
For FreeType Windows font database, use the application font loading
implementation of the parent class.
For native Windows font database, the implementation was adapted from
Qt 4.8.
Also fixed a bug in font database population, where old data was not
destroyed before population, resulting in fonts not getting properly
repopulated when a new font was added.
Task-number: QTBUG-24193
Task-number: QTBUG-24195
Task-number: QTBUG-24196
Change-Id: Ie224a87baf7500b9867aaafa807f62dd4503dee8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase_ft.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase_ft.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h index 24810c9202..bb55b68251 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h @@ -56,7 +56,6 @@ public: QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference); QStringList fallbacksForFamily(const QString family, const QFont::Style &style, const QFont::StyleHint &styleHint, const QUnicodeTables::Script &script) const; - QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName); virtual QString fontDir() const; virtual QFont defaultFont() const; |