From 1eabbc0908160de7879a9ee7fa43916f0f9f8d49 Mon Sep 17 00:00:00 2001
From: Sergio Martins <sergio.martins.qnx@kdab.com>
Date: Fri, 7 Dec 2012 10:49:19 +0000
Subject: Blackberry: Fix crash when opening file dialog without parent.

If parent is null, we now use qqnxintegration->primaryScreen()

This simplifies ctors of QQnxTheme and QQnxFileDialogHelper which now
receive a QQnxIntegration pointer instead of receiving a font database
and a bps event filter.

Change-Id: I3b1ed4d99f738b980a4f19a98618341a14e0c222
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
---
 src/plugins/platforms/qnx/qqnxtheme.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/plugins/platforms/qnx/qqnxtheme.h')

diff --git a/src/plugins/platforms/qnx/qqnxtheme.h b/src/plugins/platforms/qnx/qqnxtheme.h
index ea44d1cee2..17b2eab142 100644
--- a/src/plugins/platforms/qnx/qqnxtheme.h
+++ b/src/plugins/platforms/qnx/qqnxtheme.h
@@ -51,14 +51,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQnxBpsEventFilter;
-
-class QPlatformFontDatabase;
+class QQnxIntegration;
 
 class QQnxTheme : public QPlatformTheme
 {
 public:
-    QQnxTheme(QPlatformFontDatabase *fontDatabase, QQnxBpsEventFilter *eventFilter);
+    explicit QQnxTheme(const QQnxIntegration *);
     ~QQnxTheme();
 
     static QString name() { return QStringLiteral("blackberry"); }
@@ -69,9 +67,8 @@ public:
     const QFont *font(Font type = SystemFont) const;
 
 private:
-    QPlatformFontDatabase *m_fontDatabase;
-    QQnxBpsEventFilter *m_eventFilter;
     mutable QHash<QPlatformTheme::Font, QFont*> m_fonts;
+    const QQnxIntegration *m_integration;
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3