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-05-03 10:51:24 +0200 |
| commit | baed5f96589273eaac5ed844b165f5391d5e17bb (patch) | |
| tree | ab79accc1062f3bc0d45aae55713ee761e120d3d | |
| parent | 5bedc7d7f51ea010257cdaa23d98cbb0c26aedc5 (diff) | |
doc: Correct outdated info about text input methods
The pure-qml example now supports multiple text input methods at the
same time, but the documentation had not been updated to reflect this.
Fixes: QTBUG-110924
Change-Id: I0c23f06db7eefec6442eff50f75d0f78ba2203d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit f39be90d321e2fa3845e98959f3977b234cd372e)
Reviewed-by: Inho Lee <inho.lee@qt.io>
| -rw-r--r-- | examples/wayland/pure-qml/doc/src/pure-qml.qdoc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/examples/wayland/pure-qml/doc/src/pure-qml.qdoc b/examples/wayland/pure-qml/doc/src/pure-qml.qdoc index d73c82e98..d4538aec6 100644 --- a/examples/wayland/pure-qml/doc/src/pure-qml.qdoc +++ b/examples/wayland/pure-qml/doc/src/pure-qml.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 Pure QML example only supports the - \c{qt_text_input_method_unstable_v1} protocol. + is done via a \c{text-input} extension. The Pure QML example supports both the + \c{text_input_unstable_v2} protocol as well as Qt's \c{qt_text_input_method_unstable_v1} + protocol. \snippet pure-qml/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 |