3 files changed, 26 insertions, 4 deletions
diff --git a/src/oauth/doc/snippets/src_oauth_replyhandlers.cpp b/src/oauth/doc/snippets/src_oauth_replyhandlers.cpp
index 4566ce4..b0c7b9a 100644
--- a/src/oauth/doc/snippets/src_oauth_replyhandlers.cpp
+++ b/src/oauth/doc/snippets/src_oauth_replyhandlers.cpp
@@ -67,7 +67,7 @@ HttpExample::HttpExample()
 
     //! [httpserver-service-configuration]
     m_oauth.setAuthorizationUrl(QUrl(authorizationUrl));
-    m_oauth.setAccessTokenUrl(QUrl(accessTokenUrl));
+    m_oauth.setTokenUrl(QUrl(accessTokenUrl));
     m_oauth.setClientIdentifier(clientIdentifier);
     m_oauth.setRequestedScope({scope});
     //! [httpserver-service-configuration]
@@ -336,7 +336,7 @@ void HttpExample::authorize()
 {
     if (!m_handler) {
         m_oauth.setAuthorizationUrl(QUrl(authorizationUrl));
-        m_oauth.setAccessTokenUrl(QUrl(accessTokenUrl));
+        m_oauth.setTokenUrl(QUrl(accessTokenUrl));
         m_oauth.setClientIdentifier(clientIdentifier);
         m_oauth.setRequestedScope({scope});
 
@@ -434,7 +434,7 @@ UriSchemeExample::UriSchemeExample()
 
     //! [uri-service-configuration]
     m_oauth.setAuthorizationUrl(QUrl(authorizationUrl));
-    m_oauth.setAccessTokenUrl(QUrl(accessTokenUrl));
+    m_oauth.setTokenUrl(QUrl(accessTokenUrl));
     m_oauth.setClientIdentifier(clientIdentifier);
     m_oauth.setRequestedScope({scope});
     //! [uri-service-configuration]
diff --git a/src/oauth/qoauth2authorizationcodeflow.cpp b/src/oauth/qoauth2authorizationcodeflow.cpp
index 2ea17fb..b75b1a1 100644
--- a/src/oauth/qoauth2authorizationcodeflow.cpp
+++ b/src/oauth/qoauth2authorizationcodeflow.cpp
@@ -44,8 +44,12 @@ using namespace Qt::StringLiterals;
     QOAuthHttpServerReplyHandler, and QOAuthUriSchemeReplyHandler.
 */
 
+#if QT_REMOVAL_QT7_DEPRECATED_SINCE(6, 13)
 /*!
     \property QOAuth2AuthorizationCodeFlow::accessTokenUrl
+    \deprecated [6.9] Use QAbstractOAuth2::tokenUrl instead. This property will
+    be removed in Qt 7.0.
+
     \brief This property holds the URL used to convert the temporary
     code received during the authorization response.
 
@@ -53,6 +57,7 @@ using namespace Qt::StringLiterals;
     \l {https://tools.ietf.org/html/rfc6749#section-4.1.3}{Access
     Token Request}
 */
+#endif
 
 QOAuth2AuthorizationCodeFlowPrivate::QOAuth2AuthorizationCodeFlowPrivate(
         const QUrl &authorizationUrl, const QUrl &accessTokenUrl, const QString &clientIdentifier,
@@ -262,7 +267,11 @@ QOAuth2AuthorizationCodeFlow::QOAuth2AuthorizationCodeFlow(const QString &client
 QOAuth2AuthorizationCodeFlow::~QOAuth2AuthorizationCodeFlow()
 {}
 
+#if QT_REMOVAL_QT7_DEPRECATED_SINCE(6, 13)
 /*!
+    \deprecated [6.13] Use QAbstractOAuth2::tokenUrl() instead. This method
+    will be removed in Qt 7.0.
+
     Returns the URL used to request the access token.
     \sa setAccessTokenUrl()
 */
@@ -273,6 +282,9 @@ QUrl QOAuth2AuthorizationCodeFlow::accessTokenUrl() const
 }
 
 /*!
+    \deprecated [6.13] Use QAbstractOAuth2::setTokenUrl() instead. This method
+    will be removed in Qt 7.0.
+
     Sets the URL used to request the access token to
     \a accessTokenUrl.
 */
@@ -283,8 +295,9 @@ void QOAuth2AuthorizationCodeFlow::setAccessTokenUrl(const QUrl &accessTokenUrl)
         return;
 
     setTokenUrl(accessTokenUrl);
-    Q_EMIT accessTokenUrlChanged(accessTokenUrl);
+    QT_IGNORE_DEPRECATIONS(Q_EMIT accessTokenUrlChanged(accessTokenUrl);)
 }
+#endif // QT_REMOVAL_QT7_DEPRECATED_SINCE(6, 13)
 
 /*!
     \enum QOAuth2AuthorizationCodeFlow::PkceMethod
diff --git a/src/oauth/qoauth2authorizationcodeflow.h b/src/oauth/qoauth2authorizationcodeflow.h
index 8b5465d..8fb2f66 100644
--- a/src/oauth/qoauth2authorizationcodeflow.h
+++ b/src/oauth/qoauth2authorizationcodeflow.h
@@ -19,10 +19,12 @@ class QOAuth2AuthorizationCodeFlowPrivate;
 class Q_OAUTH_EXPORT QOAuth2AuthorizationCodeFlow : public QAbstractOAuth2
 {
     Q_OBJECT
+#if QT_REMOVAL_QT7_DEPRECATED_SINCE(6, 13)
     Q_PROPERTY(QUrl accessTokenUrl
                READ accessTokenUrl
                WRITE setAccessTokenUrl
                NOTIFY accessTokenUrlChanged)
+#endif
     Q_CLASSINFO("RegisterEnumClassesUnscoped", "false")
 
 public:
@@ -47,8 +49,12 @@ public:
 
     ~QOAuth2AuthorizationCodeFlow();
 
+#if QT_REMOVAL_QT7_DEPRECATED_SINCE(6, 13)
+    QT_DEPRECATED_VERSION_X_6_13("Use QAbstractOAuth2::tokenUrl() instead.")
     QUrl accessTokenUrl() const;
+    QT_DEPRECATED_VERSION_X_6_13("Use QAbstractOAuth2::setTokenUrl() instead.")
     void setAccessTokenUrl(const QUrl &accessTokenUrl);
+#endif
 
     enum class PkceMethod : quint8 {
         S256,
@@ -71,7 +77,10 @@ protected:
                                     const QMultiMap<QString, QVariant> &parameters = {}) override;
 
 Q_SIGNALS:
+#if QT_REMOVAL_QT7_DEPRECATED_SINCE(6, 13)
+    QT_DEPRECATED_VERSION_X_6_13("Use QAbstractOAuth2::tokenUrlChanged() instead.")
     void accessTokenUrlChanged(const QUrl &accessTokenUrl);
+#endif
 
 private:
     Q_DISABLE_COPY(QOAuth2AuthorizationCodeFlow)