diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-01 14:35:30 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-13 08:32:40 +0000 |
| commit | 7d339afdb919da3978ef92094f831fd06ea64250 (patch) | |
| tree | 97843580b8ef749cb64a936c828f397da52387d8 /src/client/qwaylandtextinputv2.cpp | |
| parent | bf35eea0cf838a3bb125f22d0b7a10c39cb621eb (diff) | |
| download | qtwayland-7d339afdb919da3978ef92094f831fd06ea64250.tar.gz | |
Disambiguate input method constants
They cause clashes in CMake Unity (Jumbo) builds.
Task-number: QTBUG-109394
Change-Id: I13b33c894818d8aebce763eaf6c961d806961a63
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
(cherry picked from commit 6ec8ce9a06e5ccb16f5fc3a5f857425f3db87c80)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/client/qwaylandtextinputv2.cpp')
| -rw-r--r-- | src/client/qwaylandtextinputv2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/qwaylandtextinputv2.cpp b/src/client/qwaylandtextinputv2.cpp index 4dec15d5..a799793e 100644 --- a/src/client/qwaylandtextinputv2.cpp +++ b/src/client/qwaylandtextinputv2.cpp @@ -27,7 +27,7 @@ namespace QtWaylandClient { namespace { -const Qt::InputMethodQueries supportedQueries = Qt::ImEnabled | +const Qt::InputMethodQueries supportedQueries2 = Qt::ImEnabled | Qt::ImSurroundingText | Qt::ImCursorPosition | Qt::ImAnchorPosition | @@ -98,7 +98,7 @@ void QWaylandTextInputv2::updateState(Qt::InputMethodQueries queries, uint32_t f if (!surface || (surface != m_surface)) return; - queries &= supportedQueries; + queries &= supportedQueries2; // Surrounding text, cursor and anchor positions are transferred together if ((queries & Qt::ImSurroundingText) || (queries & Qt::ImCursorPosition) || (queries & Qt::ImAnchorPosition)) |