diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-11 10:57:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-11 10:57:50 +0200 |
| commit | d41f0bed7ddbdacb4f6444a84773a029e46988f3 (patch) | |
| tree | 15a68979470278f0c13b2521cb614d5670288271 /src/webenginewidgets/api/qwebenginepage.cpp | |
| parent | 0caabd54a24ffa3a2d2de5cb6f1fce2af3588eb7 (diff) | |
| parent | a2c365cb1f22431845380159c29048da76c2b2a9 (diff) | |
| download | qtwebengine-d41f0bed7ddbdacb4f6444a84773a029e46988f3.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty
Change-Id: I64b46801bbaac4e96e32fece30f24f1d6cfc97a4
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 7e6265fda..f252137ae 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1827,7 +1827,7 @@ void QWebEnginePagePrivate::setToolTip(const QString &toolTipText) } // Update tooltip if text was changed. - QString wrappedTip = QLatin1String("<p style=\"white-space:pre\">") + QString wrappedTip = QLatin1String("<p style=\"white-space:pre-wrap\">") % toolTipText.toHtmlEscaped().left(MaxTooltipLength) % QLatin1String("</p>"); if (view->toolTip() != wrappedTip) @@ -2159,7 +2159,7 @@ void QWebEnginePage::runJavaScript(const QString& scriptSource, quint32 worldId, In addition, a page might also execute scripts added through QWebEngineProfile::scripts(). - \sa QWebEngineScriptCollection, QWebEngineScript + \sa QWebEngineScriptCollection, QWebEngineScript, {Script Injection} */ QWebEngineScriptCollection &QWebEnginePage::scripts() |