diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
| commit | 7439343d169095a510d122ad7c69646a5946cdce (patch) | |
| tree | 8540b2bac1e495533585a645e216eaab66b06bd2 /src/core/renderer_host | |
| parent | 3ecd61aea90cc4b283ffe9409cc10f5fd3476ecf (diff) | |
| parent | f8c132ffb7cd32d52bbfe09caa811665a3cb1069 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginesettings.cpp
Change-Id: Ie4abadb076c51d070cbb05f29b9ebcd9705933ad
Diffstat (limited to 'src/core/renderer_host')
| -rw-r--r-- | src/core/renderer_host/resource_dispatcher_host_delegate_qt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h index a8a65cfb7..6690f9a0f 100644 --- a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h +++ b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h @@ -76,7 +76,7 @@ private: int m_renderProcessId; int m_renderFrameId; - net::AuthChallengeInfo *m_authInfo; + scoped_refptr<net::AuthChallengeInfo> m_authInfo; // The request that wants login data. // Must only be accessed on the IO thread. |