diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-03 19:36:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-03 19:36:29 +0100 |
| commit | 90d3044e3a6ad58819be6787b5edcbc9daa948dc (patch) | |
| tree | 27d54322988fe60a420bbb058608b9b9d637329b /src/core/url_request_context_getter_qt.cpp | |
| parent | 03301c0fbdf034fb987e1c1ed1bec7c206dcd27e (diff) | |
| parent | d0ae9b50cc01e4c0f65f17467276d4af40284ae1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00
Diffstat (limited to 'src/core/url_request_context_getter_qt.cpp')
| -rw-r--r-- | src/core/url_request_context_getter_qt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp index 32ceb5db5..121a103b0 100644 --- a/src/core/url_request_context_getter_qt.cpp +++ b/src/core/url_request_context_getter_qt.cpp @@ -74,8 +74,8 @@ #include "network_delegate_qt.h" #include "proxy_config_service_qt.h" #include "qrc_protocol_handler_qt.h" -#include "qwebenginecookiestoreclient.h" -#include "qwebenginecookiestoreclient_p.h" +#include "qwebenginecookiestore.h" +#include "qwebenginecookiestore_p.h" #include "type_conversion.h" namespace QtWebEngineCore { @@ -204,7 +204,7 @@ void URLRequestContextGetterQt::generateCookieStore() // Unset it first to get a chance to destroy and flush the old cookie store before before opening a new on possibly the same file. m_storage->set_cookie_store(0); m_cookieDelegate->setCookieMonster(0); - m_cookieDelegate->setClient(m_browserContext->cookieStoreClient()); + m_cookieDelegate->setClient(m_browserContext->cookieStore()); net::CookieStore* cookieStore = 0; switch (m_browserContext->persistentCookiesPolicy()) { |