Merge pull request #1283 from laanwj/2012_05_prevent_tooltip_infiniteloop

Prevent tooltip filter from ever causing infinite loops
This commit is contained in:
Wladimir J. van der Laan 2012-05-13 13:04:20 -07:00
commit 524843af01

View File

@ -257,7 +257,7 @@ bool ToolTipToRichTextFilter::eventFilter(QObject *obj, QEvent *evt)
{ {
QWidget *widget = static_cast<QWidget*>(obj); QWidget *widget = static_cast<QWidget*>(obj);
QString tooltip = widget->toolTip(); QString tooltip = widget->toolTip();
if(!Qt::mightBeRichText(tooltip) && tooltip.size() > size_threshold) if(tooltip.size() > size_threshold && !tooltip.startsWith("<qt/>") && !Qt::mightBeRichText(tooltip))
{ {
// Prefix <qt/> to make sure Qt detects this as rich text // Prefix <qt/> to make sure Qt detects this as rich text
// Escape the current message as HTML and replace \n by <br> // Escape the current message as HTML and replace \n by <br>