summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer.qnx@kdab.com>2012-07-04 14:42:57 +0100
committerQt by Nokia <qt-info@nokia.com>2012-07-12 20:07:56 +0200
commit144ad51312b1af2354fee669be2990e70470caa3 (patch)
tree2d842b58932ddaf3757c2e1cc1c2832e87d8d1d7 /src/gui/kernel/qapplication.cpp
parentc7964e7962a002028169eab5b85d15dd3e0005d1 (diff)
QNX: Set the default application font to Slate Pro on Blackberry
This is already handled by the QPlatformTheme in Qt5 Change-Id: Ice21ecbaeb3f62e467a6e1496200f9040e907eb5 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Fabian Bumberger Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
-rw-r--r--src/gui/kernel/qapplication.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index a5fca584bb..ab71509077 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -1951,8 +1951,14 @@ void QApplicationPrivate::setSystemPalette(const QPalette &pal)
QFont QApplication::font()
{
QMutexLocker locker(applicationFontMutex());
- if (!QApplicationPrivate::app_font)
+ if (!QApplicationPrivate::app_font) {
+#if defined(Q_OS_BLACKBERRY)
+ QApplicationPrivate::app_font = new QFont(QLatin1String("Slate Pro"));
+ QApplicationPrivate::app_font->setPixelSize(21);
+#else
QApplicationPrivate::app_font = new QFont(QLatin1String("Helvetica"));
+#endif
+ }
return *QApplicationPrivate::app_font;
}