diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 01:27:27 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 01:27:39 +0100 |
| commit | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (patch) | |
| tree | 897cf6bfb1814b0935982ff5975a6cbfb48d6d9e /src/plugins/platforms/windows/qwindowsfontdatabase_ft.h | |
| parent | 3d19422ef16a230bb11dbbfe4a8cc9667f39bf15 (diff) | |
| parent | 6c612c933803ef57ea45e907d0181b40659148ac (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Change-Id: I89dc2e193bd01624c1fb50484610d516e39b1538
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase_ft.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase_ft.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h index 5a0c4c6377..4136b75dd8 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h @@ -59,8 +59,9 @@ public: QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName); virtual QString fontDir() const; - virtual QFont defaultFont() const; - virtual QHash<QByteArray, QFont> defaultFonts() const; + virtual QFont defaultFont() const { return systemDefaultFont(); } + static QFont systemDefaultFont(); + static HFONT systemFont(); static QFont LOGFONT_to_QFont(const LOGFONT& lf, int verticalDPI = 0); |