qtwayland: Clean-up and adapt inputContext() patch
[AGL/meta-agl-demo.git] / recipes-qt / qt / qtwayland / 0001-qwaylandintegration-Keep-previous-check-related-to-i.patch
1 From 81213fb5e1bdd19f4f8135bcddcc1efaeb1b42a5 Mon Sep 17 00:00:00 2001
2 From: Marius Vlad <marius.vlad@collabora.com>
3 Date: Wed, 26 Jul 2023 13:57:30 +0300
4 Subject: [PATCH] qwaylandintegration: Keep previous check related to
5  inputContext()
6
7 Avoid touching inputContext() when QT_LOGGING_RULES are enabled. This
8 check ensures we're still able to debug Qt issues.
9
10 Bug-AGL: SPEC-4770
11 Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
12 ---
13  src/client/qwaylandintegration.cpp | 4 +++-
14  1 file changed, 3 insertions(+), 1 deletion(-)
15
16 diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
17 index c53ccb78..6d3d9559 100644
18 --- a/src/client/qwaylandintegration.cpp
19 +++ b/src/client/qwaylandintegration.cpp
20 @@ -479,7 +479,9 @@ void QWaylandIntegration::reconfigureInputContext()
21      }
22  #endif
23  
24 -    qCDebug(lcQpaWayland) << "using input method:" << inputContext()->metaObject()->className();
25 +    bool mUsingInputContextFromCompositor = qobject_cast<QWaylandInputContext *>(mInputContext.data());
26 +    if (mUsingInputContextFromCompositor)
27 +        qCDebug(lcQpaWayland) << "using input method:" << inputContext()->metaObject()->className();
28  }
29  
30  QWaylandShellIntegration *QWaylandIntegration::createShellIntegration(const QString &integrationName)
31 -- 
32 2.35.1
33