diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-07 08:56:41 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-07 12:43:32 +0100 |
| commit | 83cabda862dced9477d155c84df9440047c856cf (patch) | |
| tree | 9f39de378bfeed923d2a35e433481e4da1dc0f32 /src/gui/text/qplatformfontdatabase_qpa.h | |
| parent | 7439fb47cd7c5731dd1aadeaf10c46b58aa59798 (diff) | |
Add fonts to QPlatformTheme.
- Remove QPlatformFontDatabase::defaultFonts() returning
a hash containing widget name ->font and the Windows
implementation.
- Add enumeration and font accessor to QPlatformTheme. The value
returned for the enumeration value overwrites the default font
of the font database.
- Implement for Windows, Mac and KDE.
- Add more Windows palettes.
Task-number: QTBUG-23686
Change-Id: I8a2abdfd216df23daa7c9630c54264cdf61295db
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/gui/text/qplatformfontdatabase_qpa.h')
| -rw-r--r-- | src/gui/text/qplatformfontdatabase_qpa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qplatformfontdatabase_qpa.h b/src/gui/text/qplatformfontdatabase_qpa.h index 6a58a3106c..5a5a8f321f 100644 --- a/src/gui/text/qplatformfontdatabase_qpa.h +++ b/src/gui/text/qplatformfontdatabase_qpa.h @@ -100,7 +100,7 @@ public: virtual QString fontDir() const; virtual QFont defaultFont() const; - virtual QHash<QByteArray, QFont> defaultFonts() const; + virtual QString resolveFontFamilyAlias(const QString &family) const; //callback |