diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-09-24 12:03:59 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-09-24 13:03:43 +0200 |
| commit | 52345f558f55e04ea68a8fa30d9862ca69131a18 (patch) | |
| tree | 3bd9da3e6842af2d0b9c04b46693c66ab437fd2e /src/webenginewidgets/api/qwebengineprofile.cpp | |
| parent | 16192598a84eaf9ac9a50b7cca6ac5e4c21bb5e8 (diff) | |
| parent | d8fe250e542519012247952a034e78b0d492b730 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
config.tests/glibc/glibc.cpp
src/3rdparty
src/core/configure.json
src/core/profile_io_data_qt.cpp
src/webengine/configure.json
src/webenginewidgets/api/qwebenginepage.cpp
tests/auto/widgets/qwebenginepage/BLACKLIST
Change-Id: I3e1781048c3cb09bfbf7427dfc5dd1fec11a2b97
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 4a77eb8cf..09f5ce2fd 100644 --- a/src/webenginewidgets/api/qwebengineprofile.cpp +++ b/src/webenginewidgets/api/qwebengineprofile.cpp @@ -661,7 +661,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 { |