summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-03-25 16:21:22 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-03-26 12:28:48 +0000
commit0d1351132e7b848247fc50343796d22b5dcf1e3b (patch)
tree1104f5e8b999a0b89fb56247232454041ac94c4b
parent159a1c8da5eb3d105f2fb47d5b15fce8d1010786 (diff)
Fix escaped characters in tooltip
Go back to making the tooltip richtext, but set a white-space:pre to keep the tooltip mostly unwrapped. Fixes: QTBUG-74659 Change-Id: I5e30ee0098a608eda969b090355915a75f55405f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--src/webenginewidgets/api/qwebenginepage.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 63863ab34..dd720a41b 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -1850,9 +1850,11 @@ void QWebEnginePagePrivate::setToolTip(const QString &toolTipText)
}
// Update tooltip if text was changed.
- QString escapedTip = toolTipText.toHtmlEscaped().left(MaxTooltipLength);
- if (view->toolTip() != escapedTip)
- view->setToolTip(escapedTip);
+ QString wrappedTip = QLatin1String("<p style=\"white-space:pre\">")
+ % toolTipText.toHtmlEscaped().left(MaxTooltipLength)
+ % QLatin1String("</p>");
+ if (view->toolTip() != wrappedTip)
+ view->setToolTip(wrappedTip);
}
void QWebEnginePagePrivate::printRequested()