Merge remote-tracking branch 'origin/4.9'

Change-Id: I873266bc23680ea02aaff6387790f2a834335113
This commit is contained in:
Eike Ziller
2019-02-05 09:02:01 +01:00
20 changed files with 112 additions and 60 deletions

View File

@@ -8020,7 +8020,7 @@ void BaseTextEditor::setContextHelp(const HelpItem &item)
void TextEditorWidget::contextHelpItem(const IContext::HelpCallback &callback)
{
if (!d->m_contextHelpItem.isValid() && !d->m_hoverHandlers.isEmpty()) {
if (d->m_contextHelpItem.isEmpty() && !d->m_hoverHandlers.isEmpty()) {
d->m_hoverHandlers.first()->contextHelpId(this,
Text::wordStartCursor(textCursor()).position(),
callback);