diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-06-15 12:27:24 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-19 00:01:35 (GMT) |
| commit | 2eb8edb5983f7aeff29e45afc4c00ab7c36b0faf (patch) | |
| tree | 6c32b444826e76daca29bf563f796622172198f1 /src | |
| parent | 1812ca1b74d9a5378a0d06fe686d9bb2937d3d6a (diff) | |
| download | Qt-2eb8edb5983f7aeff29e45afc4c00ab7c36b0faf.zip Qt-2eb8edb5983f7aeff29e45afc4c00ab7c36b0faf.tar.gz Qt-2eb8edb5983f7aeff29e45afc4c00ab7c36b0faf.tar.bz2 | |
[Blackberry] Fix deletion of dangling pointers
This bug affects only Qt 4.8 series.
Task-number: QTBUG-25796
Change-Id: I42c9bf5e8778e9bac2bb10c8e5888e02a61f72d7
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/blackberry/qbbintegration.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/blackberry/qbbintegration.cpp b/src/plugins/platforms/blackberry/qbbintegration.cpp index 6283bb1..bfd1eb8 100644 --- a/src/plugins/platforms/blackberry/qbbintegration.cpp +++ b/src/plugins/platforms/blackberry/qbbintegration.cpp @@ -178,8 +178,10 @@ QBBIntegration::~QBBIntegration() delete mLocaleThread; #endif +#if !defined(Q_OS_BLACKBERRY) // stop/destroy event thread delete mScreenEventThread; +#endif // stop/destroy navigator event handling classes delete mNavigatorEventNotifier; @@ -209,7 +211,6 @@ QBBIntegration::~QBBIntegration() QBBGLContext::shutdown(); #if defined(Q_OS_BLACKBERRY) - delete mBpsEventFilter; bps_shutdown(); #endif |