diff options
author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-11-26 17:19:31 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-12-01 22:05:00 +0000 |
commit | 0f64c6ae03a583e1fb060d87fc9b9dedf3b14dd6 (patch) | |
tree | 83bb7885a89ed3eca8d4e7e5bba0a2e44bad821e /src/webengine | |
parent | 6ef32812ccf6676e94e7d7fa7c3ae301d1069ca5 (diff) |
Rename QWebEngineCookieStoreClient to QWebEngineCookieStore
Change-Id: I8f9a4c5c155a65ede24908799218fd867db0767c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/webengine')
-rw-r--r-- | src/webengine/api/qquickwebengineprofile.cpp | 6 | ||||
-rw-r--r-- | src/webengine/api/qquickwebengineprofile_p.h | 4 | ||||
-rw-r--r-- | src/webengine/doc/src/qtwebengine-overview.qdoc | 2 | ||||
-rw-r--r-- | src/webengine/plugin/plugins.qmltypes | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp index 6e734cf66..303f038a8 100644 --- a/src/webengine/api/qquickwebengineprofile.cpp +++ b/src/webengine/api/qquickwebengineprofile.cpp @@ -40,7 +40,7 @@ #include "qquickwebenginedownloaditem_p_p.h" #include "qquickwebengineprofile_p_p.h" #include "qquickwebenginesettings_p.h" -#include "qwebenginecookiestoreclient.h" +#include "qwebenginecookiestore.h" #include <QQmlEngine> @@ -421,10 +421,10 @@ QQuickWebEngineProfile *QQuickWebEngineProfile::defaultProfile() return profile; } -QWebEngineCookieStoreClient *QQuickWebEngineProfile::cookieStoreClient() const +QWebEngineCookieStore *QQuickWebEngineProfile::cookieStore() const { const Q_D(QQuickWebEngineProfile); - return d->browserContext()->cookieStoreClient(); + return d->browserContext()->cookieStore(); } QQuickWebEngineSettings *QQuickWebEngineProfile::settings() const diff --git a/src/webengine/api/qquickwebengineprofile_p.h b/src/webengine/api/qquickwebengineprofile_p.h index 1ed15aec2..5839d51a5 100644 --- a/src/webengine/api/qquickwebengineprofile_p.h +++ b/src/webengine/api/qquickwebengineprofile_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE class QQuickWebEngineDownloadItem; class QQuickWebEngineProfilePrivate; class QQuickWebEngineSettings; -class QWebEngineCookieStoreClient; +class QWebEngineCookieStore; class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineProfile : public QObject { Q_OBJECT @@ -122,7 +122,7 @@ public: static QQuickWebEngineProfile *defaultProfile(); - Q_REVISION(1) Q_INVOKABLE QWebEngineCookieStoreClient *cookieStoreClient() const; + Q_REVISION(1) Q_INVOKABLE QWebEngineCookieStore *cookieStore() const; signals: void storageNameChanged(); diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 0e306db1d..7eb7994b6 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -140,7 +140,7 @@ schemes. Requests for the scheme are then issued to QWebEngineUrlSchemeHandler::requestStarted() as QWebEngineUrlRequestJob objects. - The QWebEngineCookieStoreClient class provides functions for accessing HTTP cookies of Chromium. + The QWebEngineCookieStore class provides functions for accessing HTTP cookies of Chromium. The functions can be used to synchronize cookies with QNetworkAccessManager, as well as to set, delete, and intercept cookies during navigation. diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes index 7a310d268..4fce34a21 100644 --- a/src/webengine/plugin/plugins.qmltypes +++ b/src/webengine/plugin/plugins.qmltypes @@ -611,7 +611,7 @@ Module { name: "downloadFinished" Parameter { name: "download"; type: "QQuickWebEngineDownloadItem"; isPointer: true } } - Method { name: "cookieStoreClient"; revision: 1; type: "QWebEngineCookieStoreClient*" } + Method { name: "cookieStore"; revision: 1; type: "QWebEngineCookieStore*" } } Component { name: "QQuickWebEngineScript" |