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/qqnxintegration.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/qqnxintegration.h')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxintegration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h index 97a5e631e8..e3eb9e06ba 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.h +++ b/src/plugins/platforms/qnx/qqnxintegration.h @@ -128,10 +128,10 @@ public: void createDisplay(screen_display_t display, bool isPrimary); void removeDisplay(QQnxScreen *screen); + QQnxScreen *primaryDisplay() const; private: void createDisplays(); void destroyDisplays(); - QQnxScreen *primaryDisplay() const; static void addWindow(screen_window_t qnxWindow, QWindow *window); static void removeWindow(screen_window_t qnxWindow); |