2022-11-15 06:32:27 +00:00
|
|
|
From 297c4e075068bffe4a396b2553afc4798c97fb4c Mon Sep 17 00:00:00 2001
|
2022-05-17 08:42:37 +00:00
|
|
|
From: Joni Poikelin <joni.poikelin@qt.io>
|
|
|
|
|
Date: Thu, 3 Feb 2022 14:01:50 +0200
|
2022-11-15 06:32:27 +00:00
|
|
|
Subject: [PATCH 34/40] Fix crash if no input method module could be loaded
|
2022-05-17 08:42:37 +00:00
|
|
|
|
|
|
|
|
Pick-to: 6.2 6.3 5.15
|
|
|
|
|
Change-Id: I8f346def616606a6c5540856bd08a84ee7ed5ca2
|
|
|
|
|
Reviewed-by: David Edmundson <davidedmundson@kde.org>
|
|
|
|
|
(cherry picked from commit 49fb7248f6ab7de046e2179c7861951ea1169e9b)
|
|
|
|
|
---
|
|
|
|
|
src/client/qwaylandintegration.cpp | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
|
|
|
|
|
index 3b876047..fbf00c6b 100644
|
|
|
|
|
--- a/src/client/qwaylandintegration.cpp
|
|
|
|
|
+++ b/src/client/qwaylandintegration.cpp
|
|
|
|
|
@@ -491,7 +491,7 @@ void QWaylandIntegration::reconfigureInputContext()
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
- qCDebug(lcQpaWayland) << "using input method:" << inputContext()->metaObject()->className();
|
|
|
|
|
+ qCDebug(lcQpaWayland) << "using input method:" << (inputContext() ? inputContext()->metaObject()->className() : "<none>");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QWaylandShellIntegration *QWaylandIntegration::createShellIntegration(const QString &integrationName)
|
|
|
|
|
--
|
|
|
|
|
2.35.1
|
|
|
|
|
|
