diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-11 11:24:20 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-11 11:24:20 +0100 |
commit | c254868dc2bd5772494a48686ebbc3e867a86adf (patch) | |
tree | 76c33df85ab2ef13e44f7677b43439c7b0d3b36a /src/core/browser_context_qt.cpp | |
parent | fca9015175950b04bafb9b3af7d4e693eb0243d9 (diff) | |
parent | aa1b2d20a80f53ce5e7f6097114d41a018d9350b (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/core/browser_context_qt.cpp
src/webengine/api/qquickwebengineview_p.h
Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c
Diffstat (limited to 'src/core/browser_context_qt.cpp')
-rw-r--r-- | src/core/browser_context_qt.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp index 4c17171d4..8dc4a3da2 100644 --- a/src/core/browser_context_qt.cpp +++ b/src/core/browser_context_qt.cpp @@ -62,7 +62,12 @@ BrowserContextQt::~BrowserContextQt() base::FilePath BrowserContextQt::GetPath() const { - return base::FilePath(toFilePathString(m_adapter->path())); + return base::FilePath(toFilePathString(m_adapter->dataPath())); +} + +base::FilePath BrowserContextQt::GetCachePath() const +{ + return base::FilePath(toFilePathString(m_adapter->cachePath())); } bool BrowserContextQt::IsOffTheRecord() const @@ -123,7 +128,7 @@ content::PushMessagingService *BrowserContextQt::GetPushMessagingService() net::URLRequestContextGetter *BrowserContextQt::CreateRequestContext(content::ProtocolHandlerMap *protocol_handlers) { - url_request_getter_ = new URLRequestContextGetterQt(GetPath(), protocol_handlers); + url_request_getter_ = new URLRequestContextGetterQt(GetPath(), GetCachePath(), protocol_handlers); static_cast<ResourceContextQt*>(resourceContext.get())->set_url_request_context_getter(url_request_getter_.get()); return url_request_getter_.get(); } |