diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-03 14:50:40 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-03 14:54:35 +0200 |
| commit | 37edacb7109ee1b81f4106e177913f23d86b47a3 (patch) | |
| tree | d06ee3db18ccef7705c391a2f4e9648d1aa502ae /src/gui/text/qplatformfontdatabase_qpa.h | |
| parent | 6c4dec7bff6f55b0c41729f4a4ab6962a037af15 (diff) | |
QPlatformFontDatabase: Add default fonts.
Add a default font accessor used to initalize QGuiApplication::font().
Add accessor for default font hash providing the defaults for
QApplication::font(const char *widgetClassName).
Change-Id: Ie4eb6edb251a81e81288ef480ae5550bd1125008
Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
Reviewed-on: http://codereview.qt.nokia.com/2567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/gui/text/qplatformfontdatabase_qpa.h')
| -rw-r--r-- | src/gui/text/qplatformfontdatabase_qpa.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/text/qplatformfontdatabase_qpa.h b/src/gui/text/qplatformfontdatabase_qpa.h index 1fb3c32fea..d34d602e43 100644 --- a/src/gui/text/qplatformfontdatabase_qpa.h +++ b/src/gui/text/qplatformfontdatabase_qpa.h @@ -46,6 +46,7 @@ #include <QtCore/QString> #include <QtCore/QStringList> #include <QtCore/QList> +#include <QtCore/QHash> #include <QtGui/QFontDatabase> #include <QtGui/private/qfont_p.h> @@ -96,6 +97,9 @@ public: virtual QString fontDir() const; + virtual QFont defaultFont() const; + virtual QHash<QByteArray, QFont> defaultFonts() const; + //callback static void registerQPF2Font(const QByteArray &dataArray, void *handle); static void registerFont(const QString &familyname, const QString &foundryname, QFont::Weight weight, |