Disambiguate input method constants
They cause clashes in CMake Unity (Jumbo) builds. Pick-to: 6.5 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>
This commit is contained in:
parent
25d387c614
commit
e8a052bc8f
@ -26,7 +26,7 @@ namespace QtWaylandClient {
|
||||
|
||||
namespace {
|
||||
|
||||
const Qt::InputMethodQueries supportedQueries = Qt::ImEnabled |
|
||||
const Qt::InputMethodQueries supportedQueries1 = Qt::ImEnabled |
|
||||
Qt::ImSurroundingText |
|
||||
Qt::ImCursorPosition |
|
||||
Qt::ImAnchorPosition |
|
||||
@ -92,7 +92,7 @@ void QWaylandTextInputv1::updateState(Qt::InputMethodQueries queries, uint32_t f
|
||||
if (!surface || (surface != m_surface))
|
||||
return;
|
||||
|
||||
queries &= supportedQueries;
|
||||
queries &= supportedQueries1;
|
||||
|
||||
// Surrounding text, cursor and anchor positions are transferred together
|
||||
if ((queries & Qt::ImSurroundingText) || (queries & Qt::ImCursorPosition) || (queries & Qt::ImAnchorPosition))
|
||||
|
@ -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))
|
||||
|
@ -31,7 +31,7 @@ QWaylandTextInputv4::~QWaylandTextInputv4()
|
||||
}
|
||||
|
||||
namespace {
|
||||
const Qt::InputMethodQueries supportedQueries = Qt::ImEnabled |
|
||||
const Qt::InputMethodQueries supportedQueries4 = Qt::ImEnabled |
|
||||
Qt::ImSurroundingText |
|
||||
Qt::ImCursorPosition |
|
||||
Qt::ImAnchorPosition |
|
||||
@ -51,7 +51,7 @@ void QWaylandTextInputv4::zwp_text_input_v4_enter(struct ::wl_surface *surface)
|
||||
m_pendingDeleteAfterText = 0;
|
||||
|
||||
enable();
|
||||
updateState(supportedQueries, update_state_enter);
|
||||
updateState(supportedQueries4, update_state_enter);
|
||||
}
|
||||
|
||||
void QWaylandTextInputv4::zwp_text_input_v4_leave(struct ::wl_surface *surface)
|
||||
@ -177,7 +177,7 @@ void QWaylandTextInputv4::zwp_text_input_v4_done(uint32_t serial)
|
||||
QCoreApplication::sendEvent(focusObject, &event);
|
||||
|
||||
if (serial == m_currentSerial)
|
||||
updateState(supportedQueries, update_state_full);
|
||||
updateState(supportedQueries4, update_state_full);
|
||||
}
|
||||
|
||||
void QWaylandTextInputv4::reset()
|
||||
@ -225,7 +225,7 @@ void QWaylandTextInputv4::updateState(Qt::InputMethodQueries queries, uint32_t f
|
||||
if (!surface || (surface != m_surface))
|
||||
return;
|
||||
|
||||
queries &= supportedQueries;
|
||||
queries &= supportedQueries4;
|
||||
bool needsCommit = false;
|
||||
|
||||
QInputMethodQueryEvent event(queries);
|
||||
|
Loading…
x
Reference in New Issue
Block a user