diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-05-14 18:43:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-14 18:43:38 +0200 |
| commit | 70cd276db01de8a9ccabb60282f00068b3840b88 (patch) | |
| tree | ffeae752c77d0e0074b59fe5c3c682d2842e459e /src/plugins/platforms/qnx/qqnxintegration.cpp | |
| parent | 800214f0b9cbbbc7b77a12180ce59033dd3cca64 (diff) | |
| parent | 3d4aeb791990f359e277efbfb0a1f1793945b55d (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxintegration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp index 41ca2b5e18..1110eb5f28 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.cpp +++ b/src/plugins/platforms/qnx/qqnxintegration.cpp @@ -67,12 +67,12 @@ #include "qqnxvirtualkeyboardbps.h" #elif defined(QQNX_PPS) #include "qqnxnavigatorpps.h" +#include "qqnxnavigatoreventnotifier.h" #include "qqnxvirtualkeyboardpps.h" #endif #if defined(QQNX_PPS) # include "qqnxbuttoneventnotifier.h" -# include "qqnxnavigatoreventnotifier.h" # include "qqnxclipboard.h" # if defined(QQNX_IMF) @@ -284,7 +284,7 @@ QQnxIntegration::~QQnxIntegration() #endif // Stop/destroy navigator event notifier -#if defined(QQNX_PPS) +#if !defined(Q_OS_BLACKBERRY) && defined(QQNX_PPS) delete m_navigatorEventNotifier; #endif delete m_navigatorEventHandler; |