From 40fdc4f44cd07c91f2372ef222b1948b417f27c6 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 25 Apr 2017 15:46:24 +0200 Subject: Check for qApp before using it in ibus plugin We might call updatePreeditText from the QCoreApplication dtor by running an event loop from inside a "post routine" added with qAddPostRoutine(). Task-number: QTBUG-60000 Change-Id: I04c08fe36bfa63ac345a06e50952d2ec83a78ac0 Reviewed-by: Gatis Paeglis --- src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index 0a55f689c6..1ee81fa9c9 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -267,6 +267,9 @@ void QIBusPlatformInputContext::commitText(const QDBusVariant &text) void QIBusPlatformInputContext::updatePreeditText(const QDBusVariant &text, uint cursorPos, bool visible) { + if (!qApp) + return; + QObject *input = qApp->focusObject(); if (!input) return; -- cgit v1.2.3