From 37edacb7109ee1b81f4106e177913f23d86b47a3 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 3 Aug 2011 14:50:40 +0200
Subject: QPlatformFontDatabase: Add default fonts.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/gui/text/qplatformfontdatabase_qpa.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/gui/text/qplatformfontdatabase_qpa.h')

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,
-- 
cgit v1.2.3