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/qwebengineprofile.cpp | |
| parent | 0caabd54a24ffa3a2d2de5cb6f1fce2af3588eb7 (diff) | |
| parent | a2c365cb1f22431845380159c29048da76c2b2a9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty
Change-Id: I64b46801bbaac4e96e32fece30f24f1d6cfc97a4
Diffstat (limited to 'src/webenginewidgets/api/qwebengineprofile.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebengineprofile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp index 237d68473..f9fcc6136 100644 --- a/src/webenginewidgets/api/qwebengineprofile.cpp +++ b/src/webenginewidgets/api/qwebengineprofile.cpp @@ -658,7 +658,8 @@ bool QWebEngineProfile::visitedLinksContainsUrl(const QUrl &url) const Returns the collection of scripts that are injected into all pages that share this profile. - \sa QWebEngineScriptCollection, QWebEngineScript, QWebEnginePage::scripts() + \sa QWebEngineScriptCollection, QWebEngineScript, QWebEnginePage::scripts(), + {Script Injection} */ QWebEngineScriptCollection *QWebEngineProfile::scripts() const { |