QNetworkCookie: Rename sameSite to sameSitePolicy

As suggested in the API review.
Amends 37bd7b5733c7f1a4eb6ac5458fdc46f94a91194a

Change-Id: Ic3e8567f349568dc3b4dbf79be27c304b39480cf
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit a7dac8e35be35462973f2f3f653e5d1986005cb2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 11 insertions, 11 deletions

diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp
index cfc3b14c9e..13fc147c15 100644
--- a/src/network/access/qnetworkcookie.cpp
+++ b/src/network/access/qnetworkcookie.cpp
@@ -227,9 +227,9 @@ void QNetworkCookie::setSecure(bool enable)
     string, \c SameSite::Default if not present.
 
     \since 6.1
-    \sa setSameSite()
+    \sa setSameSitePolicy()
 */
-QNetworkCookie::SameSite QNetworkCookie::sameSite() const
+QNetworkCookie::SameSite QNetworkCookie::sameSitePolicy() const
 {
     return d->sameSite;
 }
@@ -238,9 +238,9 @@ QNetworkCookie::SameSite QNetworkCookie::sameSite() const
     Sets the "SameSite" option of this cookie to \a sameSite.
 
     \since 6.1
-    \sa sameSite()
+    \sa sameSitePolicy()
 */
-void QNetworkCookie::setSameSite(QNetworkCookie::SameSite sameSite)
+void QNetworkCookie::setSameSitePolicy(QNetworkCookie::SameSite sameSite)
 {
     d->sameSite = sameSite;
 }
@@ -469,7 +469,7 @@ static QPair<QByteArray, QByteArray> nextField(const QByteArray &text, int &posi
         This is the default in modern browsers (since mid 2020).
     \value Strict   Cookies will only be sent in a first-party context.
 
-    \sa setSameSite(), sameSite()
+    \sa setSameSitePolicy(), sameSitePolicy()
 */
 
 namespace {
@@ -1065,7 +1065,7 @@ QList<QNetworkCookie> QNetworkCookiePrivate::parseSetCookieHeaderLine(const QByt
                 } else if (field.first == "httponly") {
                     cookie.setHttpOnly(true);
                 } else if (field.first == "samesite") {
-                    cookie.setSameSite(sameSiteFromRawString(field.second));
+                    cookie.setSameSitePolicy(sameSiteFromRawString(field.second));
                 } else {
                     // ignore unknown fields in the cookie (RFC6265 section 5.2, rule 6)
                 }
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index 736a9d7149..265f3a7124 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -87,8 +87,8 @@ public:
     void setSecure(bool enable);
     bool isHttpOnly() const;
     void setHttpOnly(bool enable);
-    SameSite sameSite() const;
-    void setSameSite(SameSite sameSite);
+    SameSite sameSitePolicy() const;
+    void setSameSitePolicy(SameSite sameSite);
 
     bool isSessionCookie() const;
     QDateTime expirationDate() const;
diff --git a/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
index b71934fc15..7f1b8e6369 100644
--- a/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
+++ b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
@@ -688,11 +688,11 @@ void tst_QNetworkCookie::parseMultipleCookies()
 void tst_QNetworkCookie::sameSite()
 {
     QList<QNetworkCookie> result = QNetworkCookie::parseCookies(QByteArrayLiteral("a=b;domain=qt-project.org"));
-    QCOMPARE(result.first().sameSite(), QNetworkCookie::SameSite::Default);
+    QCOMPARE(result.first().sameSitePolicy(), QNetworkCookie::SameSite::Default);
     result = QNetworkCookie::parseCookies(QByteArrayLiteral("a=b;domain=qt-project.org;samesite=strict"));
-    QCOMPARE(result.first().sameSite(), QNetworkCookie::SameSite::Strict);
+    QCOMPARE(result.first().sameSitePolicy(), QNetworkCookie::SameSite::Strict);
     result = QNetworkCookie::parseCookies(QByteArrayLiteral("a=b;domain=qt-project.org;samesite=none;secure"));
-    QCOMPARE(result.first().sameSite(), QNetworkCookie::SameSite::None);
+    QCOMPARE(result.first().sameSitePolicy(), QNetworkCookie::SameSite::None);
     QCOMPARE(result.first().toRawForm(), QByteArrayLiteral("a=b; secure; SameSite=None; domain=qt-project.org"));
 
 }