diff options
| author | Weng Xuetian <wengxt@gmail.com> | 2022-06-16 19:46:59 -0700 |
|---|---|---|
| committer | Weng Xuetian <wengxt@gmail.com> | 2022-07-13 10:07:04 -0700 |
| commit | 07dd6afa70cab374958468a45098a9b3ee57819f (patch) | |
| tree | 00daa3e47b275b3e6aa828c32153017bd2e062bd /tests | |
| parent | baed02440c1919cf6a535bec0c8a2492eab45a76 (diff) | |
| download | qtwayland-07dd6afa70cab374958468a45098a9b3ee57819f.tar.gz | |
Also use text-input if QT_IM_MODULE is empty or "wayland"
Previously, text input can only be used when only when QT_IM_MODULE is
unset, it is counter-intuitive when empty and null has different meaning.
Additionally making "wayland" to use text input to make it easier to enforce
wayland context. Gtk's relevant value is also "wayland" so it will be more
consistent.
Pick-to: 6.4 6.3 6.2
Change-Id: I39b8c899b0ab7965d4b17ca29ed9eadc14f17e88
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/client/inputcontext/tst_inputcontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/client/inputcontext/tst_inputcontext.cpp b/tests/auto/client/inputcontext/tst_inputcontext.cpp index 9e3d75e0..9bcfa9e7 100644 --- a/tests/auto/client/inputcontext/tst_inputcontext.cpp +++ b/tests/auto/client/inputcontext/tst_inputcontext.cpp @@ -98,8 +98,9 @@ void tst_inputcontext::selectingInputContext_data() // Test compositor with Text Input extension QTest::newRow("ibus:text-input") << QByteArray("ibus") << mIbusModule; QTest::newRow("compose:text-input") << QByteArray("compose") << mComposeModule; - QTest::newRow("empty:text-input") << QByteArray("") << mComposeModule; + QTest::newRow("empty:text-input") << QByteArray("") << mTextInputModule; QTest::newRow("null:text-input") << QByteArray() << mTextInputModule; + QTest::newRow("wayland:text-input") << QByteArray("wayland") << mTextInputModule; QTest::newRow("fake:text-input") << QByteArray("fake") << mComposeModule; } |