Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Id171407c17533846e8efe0e586d6793a61543438

2 files changed, 14 insertions, 2 deletions

diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp
index ee82093a5..5fcd46064 100644
--- a/src/core/api/qwebenginecookiestore.cpp
+++ b/src/core/api/qwebenginecookiestore.cpp
@@ -200,7 +200,7 @@ bool QWebEngineCookieStorePrivate::canAccessCookies(const QUrl &firstPartyUrl, c
                                                                 toGurl(firstPartyUrl),
                                                                 net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
 
-    QWebEngineCookieStore::FilterRequest request = { thirdParty, firstPartyUrl, url };
+    QWebEngineCookieStore::FilterRequest request = { firstPartyUrl, url, thirdParty, false, 0};
     return filterCallback(request);
 }
 
@@ -400,6 +400,16 @@ void QWebEngineCookieStore::setCookieFilter(std::function<bool(const FilterReque
 */
 
 /*!
+    \variable QWebEngineCookieStore::FilterRequest::_reservedFlag
+    \internal
+*/
+
+/*!
+    \variable QWebEngineCookieStore::FilterRequest::_reservedType
+    \internal
+*/
+
+/*!
     \variable QWebEngineCookieStore::FilterRequest::origin
     \brief The URL of the script or content accessing a cookie.
 
diff --git a/src/core/api/qwebenginecookiestore.h b/src/core/api/qwebenginecookiestore.h
index a62765f77..87d7390a3 100644
--- a/src/core/api/qwebenginecookiestore.h
+++ b/src/core/api/qwebenginecookiestore.h
@@ -62,9 +62,11 @@ class QWEBENGINE_EXPORT QWebEngineCookieStore : public QObject {
 
 public:
     struct FilterRequest {
-        bool thirdParty;
         QUrl firstPartyUrl;
         QUrl origin;
+        bool thirdParty;
+        bool _reservedFlag;
+        ushort _reservedType;
     };
     virtual ~QWebEngineCookieStore();