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/qqnxtheme.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/plugins/platforms/qnx/qqnxtheme.cpp') diff --git a/src/plugins/platforms/qnx/qqnxtheme.cpp b/src/plugins/platforms/qnx/qqnxtheme.cpp index be62c3e410..ae9acd845e 100644 --- a/src/plugins/platforms/qnx/qqnxtheme.cpp +++ b/src/plugins/platforms/qnx/qqnxtheme.cpp @@ -43,13 +43,11 @@ #include "qqnxfiledialoghelper.h" #include "qqnxsystemsettings.h" +#include "qqnxintegration.h" QT_BEGIN_NAMESPACE -QQnxTheme::QQnxTheme(QPlatformFontDatabase *fontDatabase, - QQnxBpsEventFilter *eventFilter) - : m_fontDatabase(fontDatabase), - m_eventFilter(eventFilter) +QQnxTheme::QQnxTheme(const QQnxIntegration *integration) : m_integration(integration) { } @@ -77,7 +75,7 @@ QPlatformDialogHelper *QQnxTheme::createPlatformDialogHelper(DialogType type) co { switch (type) { case QPlatformTheme::FileDialog: - return new QQnxFileDialogHelper(m_eventFilter); + return new QQnxFileDialogHelper(m_integration); #ifndef QT_NO_COLORDIALOG case QPlatformTheme::ColorDialog: #endif @@ -91,8 +89,10 @@ QPlatformDialogHelper *QQnxTheme::createPlatformDialogHelper(DialogType type) co const QFont *QQnxTheme::font(Font type) const { - if (m_fonts.isEmpty() && m_fontDatabase) - m_fonts = qt_qnx_createRoleFonts(m_fontDatabase); + QPlatformFontDatabase *fontDatabase = m_integration->fontDatabase(); + + if (fontDatabase && m_fonts.isEmpty()) + m_fonts = qt_qnx_createRoleFonts(fontDatabase); return m_fonts.value(type, 0); } -- cgit v1.2.3