diff options
author | Sergio Martins <sergio.martins.qnx@kdab.com> | 2012-12-07 10:49:19 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 13:23:51 +0100 |
commit | 1eabbc0908160de7879a9ee7fa43916f0f9f8d49 (patch) | |
tree | 04b6ae7fde5dec8a013352f35dac250c825ab5bd /src/plugins/platforms/qnx/qqnxtheme.h | |
parent | aa3a75ce145b6402578fc5b527d8a7c6a57cf765 (diff) |
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>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxtheme.h')
-rw-r--r-- | src/plugins/platforms/qnx/qqnxtheme.h | 9 |
1 files changed, 3 insertions, 6 deletions
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 |