diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-03-20 13:15:35 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-04-03 14:20:33 +0100 |
| commit | f39be90d321e2fa3845e98959f3977b234cd372e (patch) | |
| tree | b51b617dc6f15c2b72955ce0c8b7a4eb28e79d1e | |
| parent | fa1a070cf690a5ffe9867bc0cc8d3d502f7cf0b6 (diff) | |
| download | qtwayland-f39be90d321e2fa3845e98959f3977b234cd372e.tar.gz | |
doc: Correct outdated info about text input methods
The fancy-compositor now supports multiple text input methods at the
same time, but the documentation had not been updated to reflect this.
Pick-to: 6.5
Fixes: QTBUG-110924
Change-Id: I0c23f06db7eefec6442eff50f75d0f78ba2203d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
| -rw-r--r-- | examples/wayland/fancy-compositor/doc/src/fancy-compositor.qdoc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/examples/wayland/fancy-compositor/doc/src/fancy-compositor.qdoc b/examples/wayland/fancy-compositor/doc/src/fancy-compositor.qdoc index 4ccd8356..cb275054 100644 --- a/examples/wayland/fancy-compositor/doc/src/fancy-compositor.qdoc +++ b/examples/wayland/fancy-compositor/doc/src/fancy-compositor.qdoc @@ -59,20 +59,18 @@ on-screen keyboard. Finally, we need a way for the compositor to communicate the text input to its clients. This - is done via a \c{text-input} extension. The Fancy Compositor example only supports the - \c{qt_text_input_method_unstable_v1} protocol. + is done via a \c{text-input} extension. The Fancy Compositor example supports both the + \c{text_input_unstable_v2} protocol as well as Qt's \c{qt_text_input_method_unstable_v1} + protocol. \snippet fancy-compositor/qml/main.qml text input - The extension is added to the compositor by instantiating the \l QtTextInputMethodManager as - a child of the \l{WaylandCompositor}. + The \c{qt_text_input_method_unstable_v1} extension is added to the compositor by instantiating + the \l QtTextInputMethodManager as a child of the \l{WaylandCompositor}, and + \l{TextInputManager} adds \c{text_input_unstable_v2}. - In order for the on-screen keyboard to work, this protocol must also be supported by the client. - Therefore, the \l QtTextInputMethodManager is most useful if the clients are also Qt - applications. - - \note Qt also supports \l{TextInputManager}, which is an implementation of the - \c{text_input_unstable_v2} protocol. + Newer Qt applications will pick \c{qt_text_input_method_unstable_v1} when it is available, + while other clients can use \c{text_input_unstable_v2}. \section1 Transitions |