From ddc43b7329045cc9f12be75821ef140689c6f3b0 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Wed, 2 Dec 2015 15:45:18 +0100
Subject: [PATCH] Fix that html tags instead of F1 button were for QML tool
tips
Regression introduced by 6ed775f56a17a6fc3bb48323bd43373d8589b7b0
Change-Id: Ibef3453339d431dcd7b890d18c27f42f198070e8
Task-number: QTCREATORBUG-15225
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
src/plugins/qmljseditor/qmljshoverhandler.cpp | 2 +-
src/plugins/texteditor/basehoverhandler.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp
index 7cefaa5a1a1..1015b6b7b25 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.cpp
+++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp
@@ -375,7 +375,7 @@ void QmlJSHoverHandler::operateTooltip(TextEditorWidget *editorWidget, const QPo
else if (m_colorTip.isValid())
Utils::ToolTip::show(point, m_colorTip, editorWidget);
else
- Utils::ToolTip::show(point, toolTip(), editorWidget);
+ BaseHoverHandler::operateTooltip(editorWidget, point);
}
void QmlJSHoverHandler::prettyPrintTooltip(const Value *value,
diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h
index eff2b75a06f..dafe0bd0974 100644
--- a/src/plugins/texteditor/basehoverhandler.h
+++ b/src/plugins/texteditor/basehoverhandler.h
@@ -65,13 +65,13 @@ protected:
void setLastHelpItemIdentified(const HelpItem &help);
const HelpItem &lastHelpItemIdentified() const;
+ virtual void decorateToolTip();
+ virtual void operateTooltip(TextEditorWidget *editorWidget, const QPoint &point);
private:
void clear();
void process(TextEditorWidget *widget, int pos);
virtual void identifyMatch(TextEditorWidget *editorWidget, int pos) = 0;
- virtual void decorateToolTip();
- virtual void operateTooltip(TextEditorWidget *editorWidget, const QPoint &point);
bool m_diagnosticTooltip;
QString m_toolTip;
--
GitLab