diff options
| author | JiDe Zhang <zhangjide@uniontech.com> | 2024-03-05 16:08:00 +0000 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-03-10 16:51:56 +0000 |
| commit | fc3df6d3d62759e7abd2518792a77a1daf3fb6c8 (patch) | |
| tree | da7b02b9bbc93fba6fdb5f089288cfced01aa717 /src/client/qwaylanddisplay.cpp | |
| parent | 95b8818ae1c3f24fb9dac1e59929c77a08b47b16 (diff) | |
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>
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 7bc8d1889..97b04b1dc 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -342,7 +342,7 @@ void QWaylandDisplay::setupConnection() if (!mXkbContext) qCWarning(lcQpaWayland, "failed to create xkb context"); #endif - if (!mClientSideInputContextRequested) + if (mWaylandInputContextRequested) checkTextInputProtocol(); } @@ -397,7 +397,7 @@ bool QWaylandDisplay::initialize() // Give wl_output.done and zxdg_output_v1.done events a chance to arrive forceRoundTrip(); } - if (!mClientSideInputContextRequested) + if (mWaylandInputContextRequested) mTextInputManagerIndex = INT_MAX; return qEnvironmentVariableIntValue("QT_WAYLAND_DONT_CHECK_SHELL_INTEGRATION") || shellIntegration(); @@ -1015,8 +1015,8 @@ bool QWaylandDisplay::isKeyboardAvailable() const [](const QWaylandInputDevice *device) { return device->keyboard() != nullptr; }); } -bool QWaylandDisplay::isClientSideInputContextRequested() const { - return mClientSideInputContextRequested; +bool QWaylandDisplay::isWaylandInputContextRequested() const { + return mWaylandInputContextRequested; } #if QT_CONFIG(cursor) |