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/widgets/kernel/qapplication_p.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/widgets/kernel/qapplication_p.h')
| -rw-r--r-- | src/widgets/kernel/qapplication_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index ae4f0c2044..2d639172e2 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -157,10 +157,7 @@ QMacTabletHash *qt_mac_tablet_hash(); # endif #endif -struct FontHash : public QHash<QByteArray, QFont> -{ - FontHash(); -}; +typedef QHash<QByteArray, QFont> FontHash; FontHash *qt_app_fonts_hash(); typedef QHash<QByteArray, QPalette> PaletteHash; @@ -292,6 +289,7 @@ public: static void setSystemPalette(const QPalette &pal); static void setPalette_helper(const QPalette &palette, const char* className, bool clearWidgetPaletteHash); static void initializeWidgetPaletteHash(); + static void initializeWidgetFontHash(); static void setSystemFont(const QFont &font); #if defined(Q_WS_X11) |