diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-23 14:20:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-23 14:20:07 +0200 |
| commit | dffe673c3044a6351aa72b69a5bf60429259c08c (patch) | |
| tree | e0feba0056896b981a287704b2ef7383f9b95266 /src/webengine/api/qquickwebengineprofile.cpp | |
| parent | 9be23eb946580519b2b0600cc854ec8050b90659 (diff) | |
| parent | 8f32ce028a48ddc6a7333b7af635424c78437ed7 (diff) | |
| download | qtwebengine-dffe673c3044a6351aa72b69a5bf60429259c08c.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I5d0d5f65575256673c35558e0fcbf749a1439793
Diffstat (limited to 'src/webengine/api/qquickwebengineprofile.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineprofile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp index b06345b83..a678fe5fa 100644 --- a/src/webengine/api/qquickwebengineprofile.cpp +++ b/src/webengine/api/qquickwebengineprofile.cpp @@ -419,16 +419,16 @@ QQuickWebEngineProfile *QQuickWebEngineProfile::defaultProfile() return profile; } -QQuickWebEngineSettings *QQuickWebEngineProfile::settings() const +QWebEngineCookieStoreClient *QQuickWebEngineProfile::cookieStoreClient() const { const Q_D(QQuickWebEngineProfile); - return d->settings(); + return d->browserContext()->cookieStoreClient(); } -void QQuickWebEngineProfile::setCookieStoreClient(QWebEngineCookieStoreClient* client) +QQuickWebEngineSettings *QQuickWebEngineProfile::settings() const { - Q_D(QQuickWebEngineProfile); - d->browserContext()->setCookieStoreClient(client); + const Q_D(QQuickWebEngineProfile); + return d->settings(); } QT_END_NAMESPACE |