diff options
author | Stephen Kelly <stephen.kelly.qnx@kdab.com> | 2012-04-18 12:07:10 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 07:30:02 +0200 |
commit | 47617f68cbed0c14e7318e1c85885ed8411b7344 (patch) | |
tree | f46c5c4c7e97a7c07451f26c8339cb10ee912668 /src/plugins/platforms/qnx/qqnxintegration.h | |
parent | 5c2e560fe94e00502b7de811cd33c4da08b18c2b (diff) |
Make the QNX QPA plugin work with non blackberry.
Change-Id: Id85d18d9f21711e8d53e8e4bfdf39d10e135f593
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxintegration.h')
-rw-r--r-- | src/plugins/platforms/qnx/qqnxintegration.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h index 801bd7b6e5..3207b9ce9d 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.h +++ b/src/plugins/platforms/qnx/qqnxintegration.h @@ -51,15 +51,18 @@ QT_BEGIN_NAMESPACE class QQnxEventThread; -class QQnxInputContext; class QQnxNativeInterface; +class QQnxWindow; +class QQnxScreen; +class QQnxScreenEventHandler; + +#ifdef Q_OS_BLACKBERRY +class QQnxInputContext; class QQnxNavigatorEventHandler; class QQnxNavigatorEventNotifier; class QQnxAbstractVirtualKeyboard; -class QQnxWindow; class QQnxServices; -class QQnxScreen; -class QQnxScreenEventHandler; +#endif #ifndef QT_NO_CLIPBOARD class QQnxClipboard; @@ -80,7 +83,9 @@ public: QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const; +#ifdef Q_OS_BLACKBERRY QPlatformInputContext *inputContext() const; +#endif void moveToScreen(QWindow *window, int screen); @@ -98,7 +103,9 @@ public: bool paintUsingOpenGL() const { return m_paintUsingOpenGL; } +#ifdef Q_OS_BLACKBERRY QPlatformServices *services() const; +#endif static QWindow *window(screen_window_t qnxWindow); @@ -112,15 +119,17 @@ private: screen_context_t m_screenContext; QQnxEventThread *m_eventThread; +#ifdef Q_OS_BLACKBERRY QQnxNavigatorEventHandler *m_navigatorEventHandler; QQnxNavigatorEventNotifier *m_navigatorEventNotifier; QQnxAbstractVirtualKeyboard *m_virtualKeyboard; QQnxInputContext *m_inputContext; + QQnxServices *m_services; +#endif QPlatformFontDatabase *m_fontDatabase; bool m_paintUsingOpenGL; QAbstractEventDispatcher *m_eventDispatcher; QQnxNativeInterface *m_nativeInterface; - QQnxServices *m_services; QList<QQnxScreen*> m_screens; QQnxScreenEventHandler *m_screenEventHandler; #ifndef QT_NO_CLIPBOARD |