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

Only escape the code tooltip when it is used as rich text

Browse Source 
Since the fix in 01a0ec161c, sometimes
& would turn up in the tooltips due to them being escaped but not
interpreted as HTML.
This commit is contained in:
Thorbjørn Lindeijer
2010-04-21 14:50:35 +02:00
parent c4dbe9530e
commit 8999b35fcf
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cppeditor/cpphoverhandler.cpp
View File

@@ -413,21 +413,17 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
} }
} }
if (!formatTooltip.isEmpty()) { if (!formatTooltip.isEmpty())
m_toolTip = formatTooltip; m_toolTip = formatTooltip;
}
if (!m_toolTip.isEmpty())
m_toolTip = Qt::escape(m_toolTip);
if (!m_helpId.isEmpty() && !helpLinks.isEmpty()) { if (!m_helpId.isEmpty() && !helpLinks.isEmpty()) {
if (showF1) { if (showF1) {
m_toolTip = QString(QLatin1String("<table><tr><td valign=middle><nobr>%1</td>" m_toolTip = QString(QLatin1String("<table><tr><td valign=middle><nobr>%1</td>"
"<td><img src=\":/cppeditor/images/f1.png\"></td></tr></table>")) "<td><img src=\":/cppeditor/images/f1.png\"></td></tr></table>"))
.arg(m_toolTip); .arg(Qt::escape(m_toolTip));
} }
editor->setContextHelpId(m_helpId); editor->setContextHelpId(m_helpId);
} else if (!m_toolTip.isEmpty() && Qt::mightBeRichText(m_toolTip)) { } else if (!m_toolTip.isEmpty() && Qt::mightBeRichText(m_toolTip)) {
m_toolTip = QString(QLatin1String("<nobr>%1")).arg(m_toolTip); m_toolTip = QString(QLatin1String("<nobr>%1")).arg(Qt::escape(m_toolTip));
} }
} }