2 files changed, 35 insertions, 0 deletions
diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
index 4bee868fa9..877c5d848f 100644
--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
@@ -41,7 +41,12 @@
 
 #include <private/qmakearray_p.h>
 
+#include <QtCore/QMetaMethod>
 #include <QtGui/QKeyEvent>
+#include <QtGui/private/qguiapplication_p.h>
+
+#include <qpa/qplatforminputcontext.h>
+#include <qpa/qplatformintegration.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -794,4 +799,30 @@ xkb_keysym_t QXkbCommon::lookupLatinKeysym(xkb_state *state, xkb_keycode_t keyco
     return sym;
 }
 
+void QXkbCommon::setXkbContext(QPlatformInputContext *inputContext, struct xkb_context *context)
+{
+    if (!inputContext || !context)
+        return;
+
+    const char *const inputContextClassName = "QComposeInputContext";
+    const char *const normalizedSignature = "setXkbContext(xkb_context*)";
+
+    if (inputContext->objectName() != QLatin1String(inputContextClassName))
+        return;
+
+    static const QMetaMethod setXkbContext = [&]() {
+        int methodIndex = inputContext->metaObject()->indexOfMethod(normalizedSignature);
+        QMetaMethod method = inputContext->metaObject()->method(methodIndex);
+        Q_ASSERT(method.isValid());
+        if (!method.isValid())
+            qCWarning(lcXkbcommon) << normalizedSignature << "not found on" << inputContextClassName;
+        return method;
+    }();
+
+    if (!setXkbContext.isValid())
+        return;
+
+    setXkbContext.invoke(inputContext, Qt::DirectConnection, Q_ARG(struct xkb_context*, context));
+}
+
 QT_END_NAMESPACE
diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon_p.h b/src/platformsupport/input/xkbcommon/qxkbcommon_p.h
index 475c51ad91..561eae03db 100644
--- a/src/platformsupport/input/xkbcommon/qxkbcommon_p.h
+++ b/src/platformsupport/input/xkbcommon/qxkbcommon_p.h
@@ -64,7 +64,9 @@ QT_BEGIN_NAMESPACE
 
 Q_DECLARE_LOGGING_CATEGORY(lcXkbcommon)
 
+class QEvent;
 class QKeyEvent;
+class QPlatformInputContext;
 
 class QXkbCommon
 {
@@ -99,6 +101,8 @@ public:
         return sym >= XKB_KEY_KP_Space && sym <= XKB_KEY_KP_9;
     }
 
+    static void setXkbContext(QPlatformInputContext *inputContext, struct xkb_context *context);
+
     struct XKBStateDeleter {
         void operator()(struct xkb_state *state) const { return xkb_state_unref(state); }
     };