1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable platforminputcontext in QNX QPA without PPS

Browse Source 
Platforminputcontext is needed for Qt Virtual Keyboard to work thus it
needs to be enabled without to condition to PPS. PPS is removed in
QNX 8.0 and the condition would never be met. It is safe to enable
platforminputcontext without condition for QNX 7.x as well since it is
needed for Qt VKB anyways.

Fixes: QTBUG-129436
Pick-to: 6.8
Change-Id: I82230d1411e54713a2dabadf5a8dff3ca5455fbb
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
This commit is contained in:
Tuomas Vaarala 2024-10-02 14:13:56 +03:00
parent 926d3287ab
commit 4d908a3b5e
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/qnx/qqnxintegration.cpp
View File

@ -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 <qpa/qplatforminputcontextfactory_p.h>
@ -117,9 +118,9 @@ QQnxIntegration::QQnxIntegration(const QStringList &paramList)
, 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)
{

6
src/plugins/platforms/qnx/qqnxintegration.h
View File

@ -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;