diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-20 13:59:30 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-20 13:59:30 +0100 |
| commit | d3525d33cb9085cf1ee61b437931555fe7d932ae (patch) | |
| tree | 527adee7c481769d0a77f96b25669ec86a606099 /src/core/network_delegate_qt.cpp | |
| parent | f3aaa7531e7b429d958e7002e642f4b59568ff74 (diff) | |
| parent | 3c356bcf7c0fd4af7fb86824276c5a170ae10ace (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If884b8b8bc087a6a726476b49cdb48a0efaa173e
Diffstat (limited to 'src/core/network_delegate_qt.cpp')
| -rw-r--r-- | src/core/network_delegate_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp index 51acbb644..427e24332 100644 --- a/src/core/network_delegate_qt.cpp +++ b/src/core/network_delegate_qt.cpp @@ -114,7 +114,7 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C QWebEngineUrlRequestInfo requestInfo(infoPrivate); interceptor->interceptRequest(requestInfo); if (requestInfo.changed()) { - int result = infoPrivate->shouldBlockRequest ? net::ERR_ABORTED : net::OK; + int result = infoPrivate->shouldBlockRequest ? net::ERR_BLOCKED_BY_CLIENT : net::OK; if (qUrl != infoPrivate->url) *newUrl = toGurl(infoPrivate->url); |