diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp index 57078f711..851fb6ab2 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp @@ -13,6 +13,8 @@ /* Qt includes */ #include +#include + #include "qgenodeclipboard.h" #include "qnitpickerglcontext.h" #include "qnitpickerintegration.h" @@ -82,6 +84,11 @@ QAbstractEventDispatcher *QNitpickerIntegration::createEventDispatcher() const void QNitpickerIntegration::initialize() { screenAdded(_nitpicker_screen); + + QString icStr = QPlatformInputContextFactory::requested(); + if (icStr.isNull()) + icStr = QLatin1String("compose"); + m_inputContext.reset(QPlatformInputContextFactory::create(icStr)); } @@ -106,4 +113,9 @@ QPlatformOpenGLContext *QNitpickerIntegration::createPlatformOpenGLContext(QOpen return new QNitpickerGLContext(context); } +QPlatformInputContext *QNitpickerIntegration::inputContext() const +{ + return m_inputContext.data(); +} + QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h index f75168705..00e878129 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h @@ -19,6 +19,7 @@ #include #include +#include #include "qnitpickerscreen.h" #include "qsignalhandlerthread.h" @@ -42,6 +43,7 @@ class QNitpickerIntegration : public QPlatformIntegration * variable of QNitpickerIntegration. */ static Genode::Signal_receiver &_signal_receiver(); + QScopedPointer m_inputContext; public: @@ -61,6 +63,8 @@ class QNitpickerIntegration : public QPlatformIntegration QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; #endif QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; + + QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; }; QT_END_NAMESPACE