From 144ad51312b1af2354fee669be2990e70470caa3 Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer.qnx@kdab.com>
Date: Wed, 4 Jul 2012 14:42:57 +0100
Subject: 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>
---
 src/gui/kernel/qapplication.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index a5fca58..ab71509 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;
 }
 
-- 
cgit v0.12