0001-Add-missing-define-guards.patch 1.1 KB

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