summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt/qtwayland/0001-qwaylandintegration-Keep-previous-check-related-to-i.patch
blob: 77362dac3d29be23e8e224061cfd41282886ce14 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
From 81213fb5e1bdd19f4f8135bcddcc1efaeb1b42a5 Mon Sep 17 00:00:00 2001
From: Marius Vlad <marius.vlad@collabora.com>
Date: Wed, 26 Jul 2023 13:57:30 +0300
Subject: [PATCH] qwaylandintegration: Keep previous check related to
 inputContext()

Avoid touching inputContext() when QT_LOGGING_RULES are enabled. This
check ensures we're still able to debug Qt issues.

Bug-AGL: SPEC-4770
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
---
 src/client/qwaylandintegration.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index c53ccb78..6d3d9559 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -479,7 +479,9 @@ void QWaylandIntegration::reconfigureInputContext()
     }
 #endif
 
-    qCDebug(lcQpaWayland) << "using input method:" << inputContext()->metaObject()->className();
+    bool mUsingInputContextFromCompositor = qobject_cast<QWaylandInputContext *>(mInputContext.data());
+    if (mUsingInputContextFromCompositor)
+        qCDebug(lcQpaWayland) << "using input method:" << inputContext()->metaObject()->className();
 }
 
 QWaylandShellIntegration *QWaylandIntegration::createShellIntegration(const QString &integrationName)
-- 
2.35.1
="c1"># OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. # ################################################################################ ################################################################################# # IMPORTANT NOTICE # # This script is a compatiblity script with previous (AGL 1.0) envsetup script # It has been replaced by another script named "aglsetup.sh". # ################################################################################ # detect if this script is sourced: see http://stackoverflow.com/a/38128348/6255594 SOURCED=0 if [ -n "$ZSH_EVAL_CONTEXT" ]; then [[ $ZSH_EVAL_CONTEXT =~ :file$ ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $0) && pwd -P); } elif [ -n "$KSH_VERSION" ]; then [[ "$(cd $(dirname -- $0) && pwd -P)/$(basename -- $0)" != "$(cd $(dirname -- ${.sh.file}) && pwd -P)/$(basename -- ${.sh.file})" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- ${.sh.file}) && pwd -P); } elif [ -n "$BASH_VERSION" ]; then [[ $0 != "$BASH_SOURCE" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $BASH_SOURCE) && pwd -P); } fi if [ $SOURCED -ne 1 ]; then unset SOURCED unset SOURCEDIR echo "Error: this script needs to be sourced in a supported shell" >&2 echo "Please check that the current shell is bash, zsh or ksh and run this script as '. $0 <args>'" >&2 return 1 else unset SOURCED if [ -z $1 ]; then echo -e "Usage: source envsetup.sh <board/device> [build dir]" return 1 fi if [ -n "$2" ]; then BUILD_DIR="$2" else BUILD_DIR=build fi # echo "DEPRECATED..." | figlet -f big -w 80 -c cat <<'EOF' >&2 ------------------------------------------------------------------------------ | using this script is... | | _____ ______ _____ _____ ______ _____ _______ ______ _____ | | | __ \| ____| __ \| __ \| ____/ ____| /\|__ __| ____| __ \ | | | | | | |__ | |__) | |__) | |__ | | / \ | | | |__ | | | | | | | | | | __| | ___/| _ /| __|| | / /\ \ | | | __| | | | | | | | |__| | |____| | | | \ \| |___| |____ / ____ \| | | |____| |__| | _ _ | | |_____/|______|_| |_| \_\______\_____/_/ \_\_| |______|_____(_|_|_) | | | | To support the newest/upcoming features, please use the script aglsetup.sh. | ------------------------------------------------------------------------------ EOF . $SOURCEDIR/aglsetup.sh -m $1 -b $BUILD_DIR agl-devel agl-netboot agl-demo rc=$? unset SOURCEDIR unset BUILD_DIR return $rc fi