1From 05658e127dedfff65789860415537c6920ec574d Mon Sep 17 00:00:00 2001 2From: Samuli Piippo <samuli.piippo@qt.io> 3Date: Thu, 22 Apr 2021 15:29:56 +0300 4Subject: [PATCH] Add missing define guards 5 6Ammend cca1b94190a094b5d1d7ce492b6533e2d330c5e8 to use m_composeState 7only if xcbcommon is available. 8 9Pick-to: 5.15 10Change-Id: I48332b15def3282c5bda3e1c7c393ea7e9849cbe 11Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org> 12[Backported from: 05658e127dedfff65789860415537c6920ec574d] 13Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> 14--- 15 src/client/qwaylandinputcontext.cpp | 2 ++ 16 1 file changed, 2 insertions(+) 17 18diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp 19index 16e03ea1..cbf63cde 100644 20--- a/src/client/qwaylandinputcontext.cpp 21+++ b/src/client/qwaylandinputcontext.cpp 22@@ -408,8 +408,10 @@ bool QWaylandInputContext::isValid() const 23 void QWaylandInputContext::reset() 24 { 25 qCDebug(qLcQpaInputMethods) << Q_FUNC_INFO; 26+#if QT_CONFIG(xkbcommon) 27 if (m_composeState) 28 xkb_compose_state_reset(m_composeState); 29+#endif 30 31 QPlatformInputContext::reset(); 32 33-- 342.35.1 35 36