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>

4 files changed, 32 insertions, 1 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 6442f290d2..f739037cc6 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -45,6 +45,7 @@
 #include "private/qplatformintegrationfactory_qpa_p.h"
 #include "private/qevent_p.h"
 #include "qfont.h"
+#include "qplatformfontdatabase_qpa.h"
 
 #include <QtCore/QAbstractEventDispatcher>
 #include <QtCore/private/qcoreapplication_p.h>
@@ -861,7 +862,8 @@ QFont QGuiApplication::font()
 {
     QMutexLocker locker(applicationFontMutex());
     if (!QGuiApplicationPrivate::app_font)
-        QGuiApplicationPrivate::app_font = new QFont(QLatin1String("Helvetica"));
+        QGuiApplicationPrivate::app_font =
+            new QFont(QGuiApplicationPrivate::platformIntegration()->fontDatabase()->defaultFont());
     return *QGuiApplicationPrivate::app_font;
 }
 
diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp
index 04f1bd392a..886ca16da3 100644
--- a/src/gui/kernel/qplatformintegration_qpa.cpp
+++ b/src/gui/kernel/qplatformintegration_qpa.cpp
@@ -195,6 +195,7 @@ QPlatformPixmap *QPlatformIntegration::createPlatformPixmap(QPlatformPixmap::Pix
 
 QPlatformGLContext *QPlatformIntegration::createPlatformGLContext(QGuiGLContext *context) const
 {
+    Q_UNUSED(context);
     qWarning("This plugin does not support createPlatformGLContext!");
     return 0;
 }
diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp
index 059dc3e188..7ad838561b 100644
--- a/src/gui/text/qplatformfontdatabase_qpa.cpp
+++ b/src/gui/text/qplatformfontdatabase_qpa.cpp
@@ -344,6 +344,30 @@ QString QPlatformFontDatabase::fontDir() const
 }
 
 /*!
+    Returns the default system font.
+
+    \sa QGuiApplication::font()
+    \since 5.0
+*/
+
+QFont QPlatformFontDatabase::defaultFont() const
+{
+    return QFont(QLatin1String("Helvetica"));
+}
+
+/*!
+    Returns fonts for class names.
+
+    \sa QGuiApplication::font()
+    \since 5.0
+*/
+
+QHash<QByteArray, QFont> QPlatformFontDatabase::defaultFonts() const
+{
+    return QHash<QByteArray, QFont>();
+}
+
+/*!
     \class QPlatformFontDatabase
     \brief The QPlatformFontDatabase class makes it possible to customize how fonts
     are discovered and how they are rendered
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,