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/kernel | |
| 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/kernel')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformintegration_qpa.cpp | 1 |
2 files changed, 4 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; } |