diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-27 11:25:29 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-27 11:25:29 +0100 |
| commit | 01d4c6440b52f2ce26ced45b6ad193e909db44af (patch) | |
| tree | adf466a63806aa8a9c504642f17a2466a945232a /src/webenginewidgets | |
| parent | 2d8d15047fdbf046cdee9fba103587c19808d7d2 (diff) | |
| parent | df5d831bae99662fab43ed2628187113c18aac2c (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/core/renderer_host/web_channel_ipc_transport_host.cpp
tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
Change-Id: I47f2b893bc9f27cd9df641f76badc9e53b482ad4
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 54e4dd9af..ad6196850 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1897,13 +1897,12 @@ void QWebEnginePagePrivate::visibleChanged(bool visible) Registers the request interceptor \a interceptor to intercept URL requests. The page does not take ownership of the pointer. This interceptor is called - after any interceptors on the profile, and unlike profile interceptors, is run - on the UI thread, making it thread-safer. Only URL requests from this page are - intercepted. + after any interceptors on the profile, and unlike profile interceptors, only + URL requests from this page are intercepted. To unset the request interceptor, set a \c nullptr. - \sa QWebEngineUrlRequestInfo, QWebEngineProfile::setRequestInterceptor() + \sa QWebEngineUrlRequestInfo, QWebEngineProfile::setUrlRequestInterceptor() */ void QWebEnginePage::setUrlRequestInterceptor(QWebEngineUrlRequestInterceptor *interceptor) |