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