summaryrefslogtreecommitdiffstats
path: root/src/core/network_delegate_qt.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-09 14:28:30 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-09 14:28:56 +0200
commitc727b8dea9df50ca9a08bff483128bba6263ac65 (patch)
treeb2e2b7c20ba400a33721ed86ca51a8da8e8b0d79 /src/core/network_delegate_qt.cpp
parentd364c05de52f9ab39034e56cac4e0a7981dc541d (diff)
parente3d94abf9356bb8ee6e402fb7b9813c96919faf2 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'src/core/network_delegate_qt.cpp')
-rw-r--r--src/core/network_delegate_qt.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp
index b1a2faf8d..ff0e8320c 100644
--- a/src/core/network_delegate_qt.cpp
+++ b/src/core/network_delegate_qt.cpp
@@ -90,7 +90,6 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C
{
Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
Q_ASSERT(m_requestContextGetter);
- Q_ASSERT(m_requestContextGetter->m_browserContext);
const content::ResourceRequestInfo *resourceInfo = content::ResourceRequestInfo::ForRequest(request);
@@ -104,7 +103,7 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C
const QUrl qUrl = toQt(request->url());
- QWebEngineUrlRequestInterceptor* interceptor = m_requestContextGetter->m_browserContext->requestInterceptor();
+ QWebEngineUrlRequestInterceptor* interceptor = m_requestContextGetter->m_requestInterceptor;
if (interceptor) {
QWebEngineUrlRequestInfoPrivate *infoPrivate = new QWebEngineUrlRequestInfoPrivate(static_cast<QWebEngineUrlRequestInfo::ResourceType>(resourceType)
, static_cast<QWebEngineUrlRequestInfo::NavigationType>(navigationType)