1 files changed, 33 insertions, 12 deletions

diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h
index 801bd7b6e5..a3c476f16e 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.h
+++ b/src/plugins/platforms/qnx/qqnxintegration.h
@@ -50,18 +50,23 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQnxEventThread;
-class QQnxInputContext;
+class QQnxBpsEventFilter;
+class QQnxScreenEventThread;
 class QQnxNativeInterface;
-class QQnxNavigatorEventHandler;
-class QQnxNavigatorEventNotifier;
-class QQnxAbstractVirtualKeyboard;
 class QQnxWindow;
-class QQnxServices;
 class QQnxScreen;
 class QQnxScreenEventHandler;
+class QQnxNavigatorEventHandler;
+class QQnxAbstractNavigator;
+class QQnxAbstractVirtualKeyboard;
+class QQnxServices;
+
+#if defined(QQNX_PPS)
+class QQnxInputContext;
+class QQnxNavigatorEventNotifier;
+#endif
 
-#ifndef QT_NO_CLIPBOARD
+#if !defined(QT_NO_CLIPBOARD)
 class QQnxClipboard;
 #endif
 
@@ -78,9 +83,14 @@ public:
 
     QPlatformWindow *createPlatformWindow(QWindow *window) const;
     QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
+
+#if !defined(QT_NO_OPENGL)
     QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
+#endif
 
+#if defined(QQNX_PPS)
     QPlatformInputContext *inputContext() const;
+#endif
 
     void moveToScreen(QWindow *window, int screen);
 
@@ -90,13 +100,15 @@ public:
 
     QPlatformNativeInterface *nativeInterface() const;
 
-#ifndef QT_NO_CLIPBOARD
+#if !defined(QT_NO_CLIPBOARD)
     QPlatformClipboard *clipboard() const;
 #endif
 
     QVariant styleHint(StyleHint hint) const;
 
+#if !defined(QT_NO_OPENGL)
     bool paintUsingOpenGL() const { return m_paintUsingOpenGL; }
+#endif
 
     QPlatformServices *services() const;
 
@@ -111,22 +123,31 @@ private:
     static void removeWindow(screen_window_t qnxWindow);
 
     screen_context_t m_screenContext;
-    QQnxEventThread *m_eventThread;
+    QQnxScreenEventThread *m_screenEventThread;
     QQnxNavigatorEventHandler *m_navigatorEventHandler;
-    QQnxNavigatorEventNotifier *m_navigatorEventNotifier;
     QQnxAbstractVirtualKeyboard *m_virtualKeyboard;
+#if defined(QQNX_PPS)
+    QQnxNavigatorEventNotifier *m_navigatorEventNotifier;
     QQnxInputContext *m_inputContext;
+#endif
+    QQnxServices *m_services;
     QPlatformFontDatabase *m_fontDatabase;
+#if !defined(QT_NO_OPENGL)
     bool m_paintUsingOpenGL;
+#endif
     QAbstractEventDispatcher *m_eventDispatcher;
+#if defined(Q_OS_BLACKBERRY)
+    QQnxBpsEventFilter *m_bpsEventFilter;
+#endif
     QQnxNativeInterface *m_nativeInterface;
-    QQnxServices *m_services;
     QList<QQnxScreen*> m_screens;
     QQnxScreenEventHandler *m_screenEventHandler;
-#ifndef QT_NO_CLIPBOARD
+#if !defined(QT_NO_CLIPBOARD)
     mutable QQnxClipboard* m_clipboard;
 #endif
 
+    QQnxAbstractNavigator *m_navigator;
+
     static QQnxWindowMapper ms_windowMapper;
     static QMutex ms_windowMapperMutex;