diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:37:36 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:37:36 +0300 |
| commit | 01315e31c5164c896a524175854c4b6df17fe166 (patch) | |
| tree | aad54e36233ee5f31e4144401ec64c92a9975aea | |
| parent | 9e698881cb07ebf04319f5cfa7b065c8bc2c1afb (diff) | |
| parent | fc8c5909de7d9d982da9101035ddaef45fbacdcb (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl
Change-Id: Ic9887c409b8734264060e786023107dd76ce793c
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/oauth/doc/src/qtnetworkauth.qdoc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0357fc5..4364741 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.5 +MODULE_VERSION = 5.15.6 diff --git a/src/oauth/doc/src/qtnetworkauth.qdoc b/src/oauth/doc/src/qtnetworkauth.qdoc index c2ab112..3810d79 100644 --- a/src/oauth/doc/src/qtnetworkauth.qdoc +++ b/src/oauth/doc/src/qtnetworkauth.qdoc @@ -66,7 +66,6 @@ \li \l {https://tools.ietf.org/html/rfc6749} {OAuth 2} \li \l {http://openid.net} {OpenID} \li \l {http://openid.net/connect/} {OpenID Connect} - \li \l {https://developer.mozilla.org/Persona} {Mozilla Persona} \endlist These systems allow the application developers to create applications which |