Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into 'master'
[maliit-framework] Don't crash if Qt focus handling gets into bad state. Contributes to JB#36706

@martinjones

See merge request !5
  • Loading branch information
pvuorela committed Oct 28, 2016
2 parents e459695 + f771091 commit cd3f65f
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions maliit-framework/input-context/minputcontext.cpp
Expand Up @@ -826,6 +826,11 @@ void MInputContext::updateInputMethodExtensions()
}
if (debug) qDebug() << InputContextName << __PRETTY_FUNCTION__;

if (!qGuiApp->focusObject()) {
qWarning() << "Qt focus handling broken!";
return;
}

QVariantMap extensions = qGuiApp->focusObject()->property("__inputMethodExtensions").toMap();
QVariant value;
value = extensions.value("enterKeyIconSource");
Expand Down

0 comments on commit cd3f65f

Please sign in to comment.