diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2022-01-19 11:17:19 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2022-02-02 13:02:17 +0000 |
| commit | e68f0f05daca454a2c793c5862b78f78d100a805 (patch) | |
| tree | 1bbd38e3af6c20f0ae43a5246ec2389cc5502f42 /src/client/qwaylandinputcontext.cpp | |
| parent | 1eded03865193d95fab7fd9279e34fb0dbe0cb45 (diff) | |
Add client support for the text-input-unstable-v1 protocol
This is used by weston for forwarding virtualkeyboard related
event from keyboard applications to a Qt client.
Right now Qt only supports text-input-unstable-v2, v4 and the
special qt-input-method protocol, while weston only supports
text-input-unstable-v1.
Without this, a virtual-keyboard application can't be used
with a Qt client within weston.
Change-Id: I9a34a87100854bb0b0f76762ced56419e70c297e
Reviewed-by: Inho Lee <inho.lee@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/client/qwaylandinputcontext.cpp')
| -rw-r--r-- | src/client/qwaylandinputcontext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp index c59485277..32433cdc0 100644 --- a/src/client/qwaylandinputcontext.cpp +++ b/src/client/qwaylandinputcontext.cpp @@ -71,9 +71,9 @@ QWaylandInputContext::~QWaylandInputContext() bool QWaylandInputContext::isValid() const { #if QT_WAYLAND_TEXT_INPUT_V4_WIP - return mDisplay->textInputManagerv2() != nullptr || mDisplay->textInputManagerv4() != nullptr; + return mDisplay->textInputManagerv2() != nullptr || mDisplay->textInputManagerv1() != nullptr || mDisplay->textInputManagerv4() != nullptr; #else // QT_WAYLAND_TEXT_INPUT_V4_WIP - return mDisplay->textInputManagerv2() != nullptr; + return mDisplay->textInputManagerv2() != nullptr || mDisplay->textInputManagerv1() != nullptr; #endif // QT_WAYLAND_TEXT_INPUT_V4_WIP } |