diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp index b308c956f29..cb453f8ca7d 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.cpp +++ b/src/plugins/platforms/qnx/qqnxintegration.cpp @@ -32,11 +32,12 @@ #if QT_CONFIG(qqnx_pps) # include "qqnxbuttoneventnotifier.h" # include "qqnxclipboard.h" -# if QT_CONFIG(qqnx_imf) -# include "qqnxinputcontext_imf.h" -# else -# include "qqnxinputcontext_noimf.h" -# endif +#endif + +#if QT_CONFIG(qqnx_imf) +# include "qqnxinputcontext_imf.h" +#else +# include "qqnxinputcontext_noimf.h" #endif #include @@ -117,9 +118,9 @@ QQnxIntegration::QQnxIntegration(const QStringList ¶mList) , m_screenEventThread(0) , m_navigatorEventHandler(new QQnxNavigatorEventHandler()) , m_virtualKeyboard(0) + , m_inputContext(0) #if QT_CONFIG(qqnx_pps) , m_navigatorEventNotifier(0) - , m_inputContext(0) , m_buttonsNotifier(new QQnxButtonEventNotifier()) #endif , m_qpaInputContext(0) @@ -403,7 +404,6 @@ QPlatformOpenGLContext *QQnxIntegration::createPlatformOpenGLContext(QOpenGLCont } #endif -#if QT_CONFIG(qqnx_pps) QPlatformInputContext *QQnxIntegration::inputContext() const { qCDebug(lcQpaQnx) << Q_FUNC_INFO; @@ -411,7 +411,6 @@ QPlatformInputContext *QQnxIntegration::inputContext() const return m_qpaInputContext; return m_inputContext; } -#endif void QQnxIntegration::moveToScreen(QWindow *window, int screen) { diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h index 8a78d54cebc..d096a78dcb8 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.h +++ b/src/plugins/platforms/qnx/qqnxintegration.h @@ -33,9 +33,9 @@ class QQnxAbstractVirtualKeyboard; class QQnxServices; class QSimpleDrag; +class QQnxInputContext; #if QT_CONFIG(qqnx_pps) -class QQnxInputContext; class QQnxNavigatorEventNotifier; class QQnxButtonEventNotifier; #endif @@ -73,9 +73,7 @@ public: QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override; #endif -#if QT_CONFIG(qqnx_pps) QPlatformInputContext *inputContext() const override; -#endif void moveToScreen(QWindow *window, int screen); @@ -124,9 +122,9 @@ private: QQnxScreenEventThread *m_screenEventThread; QQnxNavigatorEventHandler *m_navigatorEventHandler; QQnxAbstractVirtualKeyboard *m_virtualKeyboard; + QQnxInputContext *m_inputContext; #if QT_CONFIG(qqnx_pps) QQnxNavigatorEventNotifier *m_navigatorEventNotifier; - QQnxInputContext *m_inputContext; QQnxButtonEventNotifier *m_buttonsNotifier; #endif QPlatformInputContext *m_qpaInputContext;