diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-08-02 14:14:15 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-02 20:38:54 +0200 |
commit | 0e3dcf362460a2e4457f7059343d9720638360b8 (patch) | |
tree | bcbdc7b4098b2408050004fac236883acbebc493 /src/platformsupport/themes/genericunix/qgenericunixthemes_p.h | |
parent | e247e2810cf12254335f2f4418424d99995579bc (diff) |
Fix default font for X11.
Qt 5 X11 applications currently have differing fonts since they
no longer read ~/.config/Trolltech.conf.
Set the default font value 4.8 would return for
XRender/FontConfig in the theme classes.
Change-Id: Ie0a77e6781a47a68fd67895821ab1773c25e0470
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/platformsupport/themes/genericunix/qgenericunixthemes_p.h')
-rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes_p.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h index 64b2db0a10..215162945e 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h @@ -45,6 +45,7 @@ #include <qpa/qplatformtheme.h> #include <QtCore/QString> #include <QtCore/QStringList> +#include <QtGui/QFont> QT_BEGIN_HEADER @@ -65,16 +66,20 @@ public: class QGenericUnixTheme : public QPlatformTheme { public: - QGenericUnixTheme() {} + QGenericUnixTheme(); static QPlatformTheme *createUnixTheme(const QString &name); static QStringList themeNames(); + virtual const QFont *font(Font type) const; virtual QVariant themeHint(ThemeHint hint) const; static QStringList xdgIconThemePaths(); static const char *name; + +private: + const QFont m_systemFont; }; #ifndef QT_NO_SETTINGS @@ -113,12 +118,14 @@ private: class QGnomeTheme : public QPlatformTheme { public: - QGnomeTheme() {} + QGnomeTheme(); virtual QVariant themeHint(ThemeHint hint) const; + virtual const QFont *font(Font type) const; static const char *name; private: + const QFont m_systemFont; }; QPlatformTheme *qt_createUnixTheme(); |