From 1eabbc0908160de7879a9ee7fa43916f0f9f8d49 Mon Sep 17 00:00:00 2001 From: Sergio Martins 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 Reviewed-by: Rafael Roquetto Reviewed-by: Thomas McGuire --- src/plugins/platforms/qnx/qqnxfiledialoghelper.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/qnx/qqnxfiledialoghelper.h') diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h index 352709c763..e17ea80501 100644 --- a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h +++ b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h @@ -48,13 +48,13 @@ QT_BEGIN_NAMESPACE -class QQnxBpsEventFilter; +class QQnxIntegration; class QQnxFileDialogHelper : public QPlatformFileDialogHelper { Q_OBJECT public: - explicit QQnxFileDialogHelper(QQnxBpsEventFilter *eventFilter); + explicit QQnxFileDialogHelper(const QQnxIntegration *); ~QQnxFileDialogHelper(); bool handleEvent(bps_event_t *event); @@ -81,7 +81,7 @@ Q_SIGNALS: private: void setNameFilter(const QString &filter); - QQnxBpsEventFilter *m_eventFilter; + const QQnxIntegration *m_integration; dialog_instance_t m_dialog; QFileDialogOptions::AcceptMode m_acceptMode; QString m_selectedFilter; -- cgit v1.2.3