From cc4bd3b7388f889d9fc5a8a86fba9f19c3f14c4c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 23 Oct 2020 09:55:01 +0200 Subject: [PATCH] TextEditor: Add "F1" hint to tooltip if and only if help is available Note that this does not have performance implications, as we already call HelpItem::isValid() in the same code path. Fixes: QTCREATORBUG-24782 Change-Id: I8495099c97233e4df4b8d2a30579fb6324122e92 Reviewed-by: Eike Ziller --- src/plugins/texteditor/basehoverhandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index 34eb326b812..f1a1053e5d9 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -143,9 +143,9 @@ void BaseHoverHandler::identifyMatch(TextEditorWidget *editorWidget, int pos, Re void BaseHoverHandler::operateTooltip(TextEditorWidget *editorWidget, const QPoint &point) { - const QVariant helpItem = m_lastHelpItemIdentified.isEmpty() - ? QVariant() - : QVariant::fromValue(m_lastHelpItemIdentified); + const QVariant helpItem = m_lastHelpItemIdentified.isValid() + ? QVariant::fromValue(m_lastHelpItemIdentified) + : QVariant(); const bool extractHelp = m_lastHelpItemIdentified.isValid() && !m_lastHelpItemIdentified.isFuzzyMatch(); const QString helpContents = extractHelp ? m_lastHelpItemIdentified.firstParagraph()