feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix that html tags instead of F1 button were for QML tool tips

Browse Source 
Regression introduced by 6ed775f56a

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>
This commit is contained in:
Eike Ziller
2015-12-02 15:45:18 +01:00
parent b2f2b92713
commit ddc43b7329
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljshoverhandler.cpp
View File

@@ -375,7 +375,7 @@ void QmlJSHoverHandler::operateTooltip(TextEditorWidget *editorWidget, const QPo
else if (m_colorTip.isValid()) else if (m_colorTip.isValid())
Utils::ToolTip::show(point, m_colorTip, editorWidget); Utils::ToolTip::show(point, m_colorTip, editorWidget);
else else
Utils::ToolTip::show(point, toolTip(), editorWidget); BaseHoverHandler::operateTooltip(editorWidget, point);
} }
void QmlJSHoverHandler::prettyPrintTooltip(const Value *value, void QmlJSHoverHandler::prettyPrintTooltip(const Value *value,

4
src/plugins/texteditor/basehoverhandler.h
View File

@@ -65,13 +65,13 @@ protected:
void setLastHelpItemIdentified(const HelpItem &help); void setLastHelpItemIdentified(const HelpItem &help);
const HelpItem &lastHelpItemIdentified() const; const HelpItem &lastHelpItemIdentified() const;
virtual void decorateToolTip();
virtual void operateTooltip(TextEditorWidget *editorWidget, const QPoint &point);
private: private:
void clear(); void clear();
void process(TextEditorWidget *widget, int pos); void process(TextEditorWidget *widget, int pos);
virtual void identifyMatch(TextEditorWidget *editorWidget, int pos) = 0; virtual void identifyMatch(TextEditorWidget *editorWidget, int pos) = 0;
virtual void decorateToolTip();
virtual void operateTooltip(TextEditorWidget *editorWidget, const QPoint &point);
bool m_diagnosticTooltip; bool m_diagnosticTooltip;
QString m_toolTip; QString m_toolTip;