Support multi-key for input context plugin

Sync from QPlatformInputContextFactory::requested in
8596998cb025a8338c9403f5ef9db5a23f5cc682 of qtbase to
QPlatformInputContextFactory.

Fixes: QTBUG-120202
Change-Id: Ib15d8a59c4cb3baaa19355ed5d7c30c87a7a1c16
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h
index 234524925..5b564c8d7 100644
--- a/src/client/qwaylanddisplay_p.h
+++ b/src/client/qwaylanddisplay_p.h
@@ -40,6 +40,8 @@ struct wp_viewport;
 
 QT_BEGIN_NAMESPACE
 
+#define WAYLAND_IM_KEY "wayland"
+
 class QAbstractEventDispatcher;
 class QSocketNotifier;
 class QPlatformScreen;
@@ -253,7 +255,7 @@ public:
     wl_event_queue *frameEventQueue() { return m_frameEventQueue; };
 
     bool isKeyboardAvailable() const;
-    bool isClientSideInputContextRequested() const;
+    bool isWaylandInputContextRequested() const;
 
     void initEventThread();
 
@@ -357,9 +359,9 @@ private:
     static const wl_callback_listener syncCallbackListener;
     bool mWaylandTryReconnect = false;
 
-    bool mClientSideInputContextRequested = [] () {
-        const QString& requested = QPlatformInputContextFactory::requested();
-        return !requested.isEmpty() && requested != QLatin1String("wayland");
+    bool mWaylandInputContextRequested = [] () {
+        const auto requested = QPlatformInputContextFactory::requested();
+        return requested.isEmpty() || requested.contains(QLatin1String(WAYLAND_IM_KEY));
     }();
     QStringList mTextInputManagerList;
     int mTextInputManagerIndex = INT_MAX;