diff options
| author | Liang Qi <liang.qi@qt.io> | 2021-10-20 08:51:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2021-10-20 13:02:49 +0000 |
| commit | 5ce28f2696031edb2ff7e4ae8f62801fdb63d865 (patch) | |
| tree | 0674cf5a10034f7c4a66fccbb2cc6e887ce63a47 /src/client/qwaylandintegration.cpp | |
| parent | 0154d0b65b139c4919a020c29846f56697b5b42c (diff) | |
Support different text input protocols - update
This amends 99a6eb7b79471114705d7c68b0d5b388ea16ac03.
Only update text input when needed. And try to unregister the ones
which are not needed.
For client side, when QT_WAYLAND_TEXT_INPUT_PROTOCOL contains
multiple valid ones, the order doesn't matter now.
Fixes: QTBUG-97394
Task-number: QTBUG-96414
Change-Id: Ibe174056a4d4a4f2026e488d2ea99ec875b11ccc
Reviewed-by: Inho Lee <inho.lee@qt.io>
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 5b712cab9..67af87cb2 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -497,7 +497,7 @@ void QWaylandIntegration::reconfigureInputContext() if (requested.isNull()) { if (mDisplay->textInputMethodManager() != nullptr) mInputContext.reset(new QWaylandInputMethodContext(mDisplay.data())); - else + else if (mDisplay->textInputManager() != nullptr) mInputContext.reset(new QWaylandInputContext(mDisplay.data())); } else { mInputContext.reset(QPlatformInputContextFactory::create(requested)); |