summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into ↵v5.15.14-lts-lgpl5.15Tarja Sundqvist2024-05-081-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iaedceafa7fa8cb7229adc3effce4b1d7062ddc55
| * Bump version to 5.15.14Tarja Sundqvist2023-03-011-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgplTarja Sundqvist2024-01-041-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ie6426d191915067d83213fa0b0a06b2eefd33009
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: I7f0c62584ea048f9b9e577f5d47a7da9c8ec972c Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-111-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I0d411b5a2d08c93a8e8370ee7cfd34815800a3bc
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: I82cc84d67ec2f60c31418d844120cf1475015242
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-091-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I0802a262fdb05947753b90e6148d7877682277e8
| * Bump versionTarja Sundqvist2022-06-151-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-241-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I43f5eb617c2e52c389d097e09d99439201e87202
| * Bump versionTarja Sundqvist2022-04-061-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-231-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I9bcee7bd93151241cca9f30fd2caa90cb3095139
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ibc668c931b54c9d4d6fbb4348c1736ac2fc1fdc7
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I2b385e75fa3f96688b3468d8f6e02754b9026c9d
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I217254dc3ff4c7af25d7f465bedec2ba720494c1
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-162-2/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ic9887c409b8734264060e786023107dd76ce793c
| * Doc: Remove mention of Mozilla PersonaPaul Wicking2021-06-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Mozilla Persona was shut down by Mozilla on 30 Nov 2016 (https://developer.mozilla.org/en-US/docs/Archive/Mozilla/Persona). Remove this from the docs, as the link causes a 404 anyway, and doesn't have a sensible replacement. Change-Id: Ie9dd4449651b7795858a63dd1aeef948bcb53131 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 3247752473f130e36550de0c83608ded813d83fc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-161-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iaa81d3957955724f5b5165f6abc71f1d82584aa9
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I64a084d0f3183de60212719a8f4e8b1b285f47c9
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I270b9c2f26d6722ea51de1f768b964b25e90efb0
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: Ifefdcc502b17bfac30476c047908757286efb307
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2424-264/+264
|/ | | | | | | | | | | This reverts commit 7c58247c2526df0c1687f320842fd03f31ec7e90. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I019003c7659be267a6c215b9c7c21725574fd654 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-2624-264/+264
| | | | | | | | | | | | | | | Updated header.COMM to files in tqtc-qtnetworkauth. Examples, documentation files or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4172 Change-Id: Ifb1913c903f76d6428beb49a2e3e2fc0f3648059 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-281-0/+34
| | | | | | | | | | | | | + c4563c236dc52fbe8789773bdd546d512ac10405 Use RedirectPolicyAttribute instead of FollowRedirectsAttribute + 304005c1288e8b76138285e051ea51b88d44273a Bump version + 6bfbe5ceeb692ca96e43222327edb75b52b6a319 Add changes file for Qt 5.12.10 + c7dba0796324c9846ffb9dac470045da35520337 Add client id and shared secret to token refresh requests + 129044b2c2d812b779c42afbe5163b2135645b13 Fix extra tokens for OAuth2 Change-Id: Ia8e4e9943d07e9f15cfd6d2a008bf674ef0cd4ee Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit fb2d6d47a0c961278d63309789a1141c3734818b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: Ie37c6bcbe90c3955912ee45f2c6ad933566139d8
* Fix extra tokens for OAuth2Nadim Asaduzzaman2020-10-231-0/+8
| | | | | | | Change-Id: Ia6991dd552c118a74472319d4c4a1b76903c6647 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit ff298041f784a64b9156d7e42c33f4f9e8c41f39)
* Add client id and shared secret to token refresh requestsFrederik Gladhorn2020-10-191-0/+2
| | | | | | | | | | | | | | | | In order to refresh the authorization based on a refresh token the server needs to know for which client the refresh is made. At least Google refuses to do anything without these, after this change the refresh is successful. [ChangeLog][OAuth2] Fixed starting a new session with some servers (e.g. Google) when using a refresh token. Fixes: QTBUG-87703 Change-Id: I1fd123d223aed0894743e6d9b3eba27da143a030 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit a7d697498be7d19bd86d343474845febc9f46b68) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I142afadf0a892e9557b6cb67dbedf784770611d8 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit 2bcf17c3e4131b0b5b15c96ed104fceede3c3990) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I13710a0d12c682d78695aeb3d06c99cee653dbe4
* Use RedirectPolicyAttribute instead of FollowRedirectsAttributeMårten Nordheim2020-09-141-1/+1
| | | | | Change-Id: I9c6909fb3429ae2e0182d938ac5cf007c6d4af20 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Bump versionv5.15.1Alexandru Croitor2020-07-301-1/+1
| | | | Change-Id: Ibc4ceaeaef0afff639e64f1ce6a86f574aa17ea4
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-142-2/+22
|\ | | | | | | Change-Id: I6528515dcd93b8757297c400aaa8a575e04d38ff
| * Add one missed QSKIP for unreachable hostv5.15.0-rc2v5.15.0Mårten Nordheim2020-05-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | And fix the typo for the others Fixes: QTBUG-84071 Pick-to: 5.15 Change-Id: I0ec87f8c82cd2863b3d62ea1c9628657f7471872 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit 22fd06a3cb2e96db0afb9666016280b1feb7c8b7) Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc1Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: I918fc54d521bd91eb298a5a4998ce7b67f66ecd7
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: I48eecc15d5abcf38188d77ff8b0197871a2ba919
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I8f3ec28396dd6f875893067d0a6d70256742d7f4
| | * | Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | + 5e31c8a64073a3d2d88c23f211f22e719ffcd8a0 Bump version Change-Id: I4046f06c0aea2879f2b664a1303f26ef56dff505 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+18
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | + 2b5e2bf759946d3c3f3eddafc4092338b05923ae Bump version + ce84933d7466a6eb966da03591f6b45fbc0dcb47 Use QNetworkReply::networkError() instead of simple error() + 82263fbfc261e0c90caacdf42cae14e1c4bda8c5 Fix deprecation warnings about using QMultiMap methods on QMap + b77ec222d88b5d9a579c8cbca3298e07cc08e265 Suppress remaining uses of QVariantMap::unite + 3e3f047e59db88e806b3c1fd94c4a996f5317b68 Fix deprecation warning against Qt::SystemLocaleShortDate + 1afc99397bd35fc3cd24913f5dc10743de1833dc Revert "Use QNetworkReply::networkError() instead of simple error()" + 72f5b40b00178710b36edc7ed1769321182e7fa6 QNetworkReply: Fix warnings from deprecated error signal Change-Id: I08e0456ce501c1c57e13b150c20ae4c97f437eb9 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* | QNetworkReply: Fix warnings from deprecated error signalv5.15.0-beta4v5.15.0-beta3Mårten Nordheim2020-03-232-2/+2
| | | | | | | | | | | | | | | | And update old-style connect even if there's no warning Task-number: QTBUG-82605 Change-Id: Ia12fe93a43fac24017faf55b931ad28ae959f245 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* | Revert "Use QNetworkReply::networkError() instead of simple error()"v5.15.0-beta2Timur Pocheptsov2020-02-243-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ce84933d7466a6eb966da03591f6b45fbc0dcb47. QProcess takes precedence. Naming in QProcess is considered to be the correct one. Change-Id: Ie54f27c31ac0753a54632be1fa37280016ebb671 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* | Fix deprecation warning against Qt::SystemLocaleShortDatev5.15.0-beta1Edward Welbourne2020-02-181-1/+1
| | | | | | | | | | Change-Id: I4acbe4df6f96c1600496195e934dd8c77134c584 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I04fa78ff07aafdaf7a0718bca10242413a9a9ec9
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I44f64d17eb4ec585e786f73a738addad7bfe86a4
* | Suppress remaining uses of QVariantMap::uniteMårten Nordheim2020-01-301-3/+6
| | | | | | | | | | | | | | | | By going through a QMultiMap. Change-Id: I2c2c111f1d9a551dcf1d54715455a92e0855babe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: I2b073913516dad48ff948e27b6d321f2425f0d9e
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I5b93c7dafa1472219f19fc6b3474745f258f6ef2
| | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| |/ | | | | | | | | | | | | + 923f889ff7ba000efcd0c51eadcb452181899fcc Bump version Change-Id: I1f7156867661190043b83836e9b5d3ae7f36ec34 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Fix deprecation warnings about using QMultiMap methods on QMapFriedemann Kleint2020-01-233-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QMap::insert() instead QMultiMap::unite() in the tests. In the module itself, change the parameter type to a QMultiMap since apparently duplicate keys are expected. Although possibly a pre-existing bug, to be on the safe side we change QMap::insert to QMultiMap::replace. Fixes qoauth1signature.cpp: In member function ‘QList<QString> QOAuth1Signature::keys() const’: qoauth1signature.cpp:344:37: warning: ‘QList<T> QMap<K, V>::uniqueKeys() const [with Key = QString; T = QVariant]’ is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations] qoauth1.cpp: In member function ‘void QOAuth1Private::appendSignature(QAbstractOAuth::Stage, QVariantMap*, const QUrl&, QNetworkAccessManager::Operation, QVariantMap)’: qoauth1.cpp:147:75: warning: ‘QMap<K, V>& QMap<K, V>::unite(const QMap<K, V>&) [with Key = QString; T = QVariant]’ is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations] qoauth1.cpp: In member function ‘void QOAuth1::setup(QNetworkRequest*, const QVariantMap&, QNetworkAccessManager::Operation)’: qoauth1.cpp:766:81: warning: ‘QMap<K, V>& QMap<K, V>::unite(const QMap<K, V>&) [with Key = QString; T = QVariant]’ is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations] const auto parameters = QVariantMap(oauthParams).unite(signingParameters); qoauth1.cpp: In member function ‘void QOAuth1::setup(QNetworkRequest*, const QVariantMap&, const QByteArray&)’: qoauth1.cpp:806:81: warning: ‘QMap<K, V>& QMap<K, V>::unite(const QMap<K, V>&) [with Key = QString; T = QVariant]’ is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations] const auto parameters = QVariantMap(oauthParams).unite(signingParameters); Change-Id: Iaec7850335a188a6b198a672d220b01edc2c10ea Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 07:39:05 +0000