summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'v6.5.8-lts' into tqtc/lts-6.5-opensourcev6.5.8-lts-lgplTarja Sundqvist2025-12-013-3/+16
|\ | | | | | | | | | | | | | | | | Qt 6.5.8-lts release Conflicts solved: dependencies.yaml Change-Id: I5695cfa64896b2967d310a9a969c51e48ac3c622
| * Add extraTokensChanged signal emissionJuha Vuolle2024-11-223-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | QAbstractOAuth defines 'extraTokens' property with change signal. However it seems the signal is never emitted. This commit adds the emission of this signal. Change-Id: I20c5d875cd5337daa1290670f241c9814787f998 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 24c3eff4c96a8a39b760e958513612c4d85ceffe) (cherry picked from commit ffbe85d3f20889b79ed7ab019542a30066f1d174) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Refrain from logging authorization URLJuha Vuolle2024-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | As a general practice it's better not to log anything that may contain sensitive data. Change-Id: I478d9bd7085815b84037c9d28721829288192b45 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit e5dcbbcfb16a36ad6eb972e491bd7223a8fdd5f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c2c8865d3304ec9160e648a7888efa5550998864)
* | Merge tag 'v6.5.7-lts' into tqtc/lts-6.5-opensourcev6.5.7-lts-lgplTarja Sundqvist2025-10-095-23/+71
|\| | | | | | | | | | | | | | | | | | | Qt 6.5.7-lts release Conflicts solved: dependencies.yaml src/oauth/qabstractoauth.cpp Change-Id: If85eac30d0ca25fb7cefcea4d14f3ffa9ab95c24
| * Encode 'state' parameter during authorizationJuha Vuolle2024-08-261-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use encoding defined by RFC 6749 4.1.1 Authorization Request. The pre-existing implementation worked with internally generated random states, but had trouble especially with characters such as + and space ' ' which the user may set manually. I tested this against for major public Authorization Server providers, and with this patch they work with states like "foo %b+ar" (all of them don't work without this patch). Fixes: QTBUG-104655 Change-Id: I849dd720c287e74f30be3fd7b1e631871ade9c12 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit cbc09724824c2ae38c74ad5d5d4188168843a777) (cherry picked from commit ac159586777d3030f8a6ec460537be372e168c9e) Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit fe978f54d2d5a3e71deea893c595e1fb7fb06b01)
| * Don't clear QAbstractOAuth2::scope upon empty server responseJuha Vuolle2024-08-092-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation set the 'scope' unconditionally to scopes the authorization server returned in access token response. The returned and requested scopes can differ, and a server might also omit the 'scope' altogether, causing the Qt classes 'scope' to be just cleared. The scope behavior is specified by OAuth2 RFC 6749, chapter 5.1. Returning differing and empty scopes is common and acceptable. In case of empty scope, we can assume that the server granted the scope that was requested. Furthermore amend the 'scope' property documentation to reflect these two roles it serves. In a later Qt version we should introduce two new properties which clearly separate these roles. [ChangeLog][QAbstractOAuth2][Important Behavior Changes] If the authorization server returns an empty 'scope' response, the requested scope is not cleared anymore. Instead, it is assumed that the requested 'scope' was granted. Fixes: QTBUG-66415 Change-Id: I0685507c3ac7633fcf1d177958ba45ec6fd87bd2 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit d867b77770c09c9b6a970edcbd8041cff6b64e4a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f7a6cdf8e2b10fd25ab7c810224bb8637aded3fc) (cherry picked from commit 0924f639cc2af43ea462082cb8be766fd401e932)
| * QAbstractOAuth: use QByteArray::toBase64() to encode random to textThiago Macieira2024-07-191-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The alphabet we had was 62 characters long, which made for clumsy division/modulus operations. If we extend to 64, the operations are simpler. And if we're going to do that anyway, we may as well use QByteArray to encode pure random data. That's what I use to generate random strings, actually: $ dd if=/dev/random bs=3 count=4 status=none | basenc --base64url IjlwaN9HD_7HeNX0 Change-Id: Ie30a3caf09ef4176bb36fffd17cd9b2c7a5cf58c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 90d5571d02887a8f61ec767699bb05c76c437153) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 5ac0a08a08821be91f2c3a2d143b17483b164daf) (cherry picked from commit d20f62567e3ef4acf30443876f86ca6c7ffe8273)
| * QAbstractOAuth: just use QRandomGenerator::system()Thiago Macieira2024-07-191-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This amends 5c0c90b6e5c3cdabd6ad41d5b6478250c8877f48 to remove the Mersenne Twister and uniform distribution generator from <random> in favor of just using QRandomGenerator::bounded(). This function is used by QOAuth1::nonce() to generate the nonce, so using the best random generator we have available (within reason) is a good idea. The Mersenne Twister is probably (more than) good enough, but the system generator is definitely better. Given this is used to generate only 8 characters (with a maximum of 255) in something used in a network transaction, it won't violate the rule of using QRandomGenerator::system() for too much data. Pick-to: 6.2 5.15 Change-Id: Ie30a3caf09ef4176bb36fffd17cd9a7551caf999 Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit d2a285f90ae131b9851b9d12b6f6c7e12f2268a1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 058207b5fe99c793d333dea0eb6bde34340c169d) (cherry picked from commit d41860edcd65867222b99eb671d767807616c30f)
| * Cache callback value / redirect_uri for later useJuha Vuolle2024-05-242-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to 'RFC 8252 Section 8.3' the loopback listening should be closed after receiving authorization response. There were however two things preventing application developers from doing this: 1) The callback (aka redirect_uri) is needed in the subsequent access token request (note: listening is not needed anymore). 2) The callback (aka redirect_uri) is currently used also in refresh token request (this is unnecessary though, and should be removed in a follow-up commit). But the problem for these two was that the QOAuthHttpServerReplyHandler::callback() code asserted (debug) or just returned a wrong value (release) if the handler wasn't listening. This made it unfeasible to close the handler in a timely manner. With this commit the callback/redirect_uri is cached, and consequently the handler can be closed immediately after authorization. Pick-to: 6.2 Fixes: QTBUG-124333 Change-Id: I063637029908ed4fa0390a0cb07511c92bd51874 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 67b2aec9dd987fc4ea0a7c817639b36380ccaf80) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 649288461116e5dfe7a13bdb07bd5fb61b245e5f)
| * QAbstractOAuth: fix data race and poor seeding in generateRandomString()Marc Mutz2024-05-091-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While not explicitly documented as thread-safe, this function maintains unprotected global state, and OAuth classes are surely used outside the main thread, so independent OAuth objects performing this operation at the same time means data race, iow: UB. Protect with a mutex. As a drive-by, use Q_GLOBAL_STATIC instead of magic statics, and make the char array constexpr instead of static const, to statically assert that it plays no role in thread-safety. Also seed the PRNG with QRandomGenerator::system() instead of the moral equivalent of gettimeoday(). The OAuth1 RFC5849¹ doesn't mention it, but the OpenID² spec asks for the nonce to be "unguessable to attackers". A gettimeofday()-seeded PRNG, esp. with only millisecond resolution, clearly doesn't fulfil that requirement. QRandomGenerator::system(), OTOH, is documented to be "securely seeded", and provides a seed_seq-like interface so the _whole_ mt19937 state can be seeded, not just a 32-bit fraction of it. Keep the local PRNG to not exhaust the kernel's entropy pool through excessive system() usage. ¹ https://datatracker.ietf.org/doc/html/rfc5849#section-3.3 ² https://openid.net/specs/openid-connect-core-1_0.html#NonceNotes Amends a6dc1c01da723a93e1c174a6950eb4bab8cab3fc. Pick-to: 6.2 5.15 Change-Id: Id09b04cc2ae342a7374a9f7a6803c860360d132c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit 5c0c90b6e5c3cdabd6ad41d5b6478250c8877f48) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d80240186bae84449acac527b1a88111ca64dd23)
* | Merge tag 'v6.5.6-lts' into tqtc/lts-6.5-opensourceTarja Sundqvist2025-04-151-4/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Qt 6.5.6-lts release Conflicts solved: dependencies.yaml Change-Id: I50178a99dbdd7555c02e374049860008000ce4bb
| * | QAbstractOAuth: fix data race and poor seeding in generateRandomString()Marc Mutz2024-05-141-4/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While not explicitly documented as thread-safe, this function maintains unprotected global state, and OAuth classes are surely used outside the main thread, so independent OAuth objects performing this operation at the same time means data race, iow: UB. Protect with a mutex. As a drive-by, use Q_GLOBAL_STATIC instead of magic statics, and make the char array constexpr instead of static const, to statically assert that it plays no role in thread-safety. Also seed the PRNG with QRandomGenerator::system() instead of the moral equivalent of gettimeoday(). The OAuth1 RFC5849¹ doesn't mention it, but the OpenID² spec asks for the nonce to be "unguessable to attackers". A gettimeofday()-seeded PRNG, esp. with only millisecond resolution, clearly doesn't fulfil that requirement. QRandomGenerator::system(), OTOH, is documented to be "securely seeded", and provides a seed_seq-like interface so the _whole_ mt19937 state can be seeded, not just a 32-bit fraction of it. Keep the local PRNG to not exhaust the kernel's entropy pool through excessive system() usage. ¹ https://datatracker.ietf.org/doc/html/rfc5849#section-3.3 ² https://openid.net/specs/openid-connect-core-1_0.html#NonceNotes Amends a6dc1c01da723a93e1c174a6950eb4bab8cab3fc. Change-Id: Id09b04cc2ae342a7374a9f7a6803c860360d132c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit 5c0c90b6e5c3cdabd6ad41d5b6478250c8877f48) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d80240186bae84449acac527b1a88111ca64dd23) (cherry picked from commit d93473dd959bbd5f5958c1b067aec124061f6835)
* / Revert "Update commercial SPDX-License-Identifier"Tarja Sundqvist2025-01-0324-24/+24
|/ | | | | | | | | | This reverts commit b2464fb31554e7d44e7a28e920c89240ad8f2312. Revert of commercial SPDX license identifiers is required for the Qt 6.5.x opensource releases, Qt 6.5.4 onwards. Change-Id: I017fd7dfcff99904a43aee53bd736c156024217f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove commercial SPDX-License-Identifier from build filesTarja Sundqvist2023-11-232-2/+2
| | | | | | | | | | | The build files should not include a commercial SPDX-License-Identifier. Instead, a BSD-3-Clause license identifier is used. This change is related to b2464fb31554e7d44e7a28e920c89240ad8f2312 which updated the licenses in the build files even if it shouldn't. Task-number: QTQAINFRA-5900 Change-Id: Iaa80fa787b968dc1e516a3a896479028046ce3d3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update commercial SPDX-License-IdentifierTarja Sundqvist2023-11-1426-26/+26
| | | | | | | | | | Updated the commercial SPDX-License-Identifier to the files in tqtc-qtnetworkauth. Examples, tests, or documentation files are not updated. Task-number: QTQAINFRA-5900 Change-Id: I5dcb68f58fbfa3799df2d153bd7ff483d55113ef Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Don't leak token request network repliesVolker Krause2023-06-262-1/+5
| | | | | | | | | | Also, document how network replies passed to QAbstractAuthReplyHandler are deleted. Change-Id: Id504776d0111f67dd3206b13e5ba3ccce1ca9be4 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 3e7c834b40cb952cb6685329dd86748386201806) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove Q_DECLARE_METATYPEAmir Masoud Abdol2023-04-251-2/+0
| | | | | | | | | | | This seems to be unnecessary, and it breaks the unity build. Task-number: QTBUG-109394 Change-Id: Ic12fb0039ca868e117411c0de8260c9753aca1fa Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit db332f446d1c632a0ef9dfc8755ce310584bf6b6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QOAuth1Signature::hmacSha1(): use static QMessageAuthenticationCode::hash()Marc Mutz2023-03-021-4/+2
| | | | | | | | | | | It's much faster than creating a QMessageAuthenticationCode object just to setKey(), addData(), and result(). Change-Id: Id5fb09ab86175b7eed97b50178fedd27d8fe687c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 0be0d9881e36bfd20c36a5be68323f0cd317605d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Disambiguate typedefsFriedemann Kleint2023-02-022-55/+57
| | | | | | | | | | | | They cause clashes in CMake Unity (Jumbo) builds. As a drive-by, introduce modern string literals. Task-number: QTBUG-109394 Change-Id: Id53f223d8be956b54098f889e89965bbe4df2577 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 661656bc185373c3859d08c8c778f79634338605) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Tweak new sslConfiguration, sslConfigurationChanged documentationKai Köhne2022-12-221-2/+2
| | | | | | | | | | | Make the wording a bit stronger - technically, deriving classes can ignore the provided settings when establishing a TLS connection, but that would be a bit of a misuse. Change-Id: I11b704098d5a9d209fac0b90df4ee49cb0e248a9 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit e38da074b567f08032c7dd3130739d03bcca40c3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* OAuth2: allow to specify TLS configurationIvan Solovev2022-09-145-0/+73
| | | | | | | | | | | | | | | | | | Specifying a custom TLS configuration is necessary when it is required to establish a Mutual TLS connection between the client and the Authentication Server. [ChangeLog][QAbstractOAuth2] Introduce a new sslConfiguration parameter which allows to specify a TLS configuration used during the authentication process. This patch also applies the new parameter to QOAuth2AuthorizationCodeFlow class. Fixes: QTBUG-88325 Change-Id: I5daac3d97e4df1ecc35597e168a2d111881d704a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-232-2/+2
| | | | | | | Task-number: QTBUG-105718 Change-Id: Id6065ca3122682b7ba7cf27480314b3d8fced417 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Remove "Changes in Qt 6" stubKai Köhne2022-07-082-26/+0
| | | | | | | | | The page was just a stub; apparently nothing worthwhile to report changed in Qt Network Authorization for Qt 6. Pick-to: 6.2 6.3 6.4 Change-Id: I3db912905529d5a906eae870768f01cc5cdecb99 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-072-0/+6
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I75a84023fdf965b72410e39bf40f81f7941d6d16 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Use SPDX license identifiersLucie Gérard2022-06-1627-750/+54
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: Ic012e87171ed4cef6871eff7d76f56994ea3ca1f Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Fix missing includesVille Voutilainen2022-05-181-0/+1
| | | | | | | | There's been recent header refactorings, this fixes the fallout. Pick-to: 6.3 6.2 Change-Id: I64f369a4806aef4b00fc9f33925fa855520b829f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: Use find_package(Qt6 REQUIRED COMPONENTS ...) idiomKai Köhne2022-05-131-1/+1
| | | | | | | | | | | Using REQUIRED as a prefix instead of suffix works better with OPTIONAL_COMPONENTS, and is also the order in the CMake manual. Pick-to: 6.3 Task-number: QTBUG-98867 Change-Id: I9217fc21f63c91bd4d941d0edc1f8b34e8c406b7 Reviewed-by: Rui Oliveira Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Make sure all private headers include at least one otherThiago Macieira2022-03-092-1/+3
| | | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Move Q_DECLARE_PUBLIC to the public sectionThiago Macieira2021-11-232-2/+2
| | | | | | | This is now required to use QObjectPrivate::connect. Change-Id: Iccb47e5527544b6fbd75fffd16b8bd87f0818ad5 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Doc: Update link to RFC-5849 and RFC-6749Luca Di Sera2021-09-171-2/+2
| | | | | | | | | | | | | | | | | | The old `tools.ietf.org/html/*` web pages containing RFCs now redirect to `datatracker.ietf.org/doc/html/*`. While the redirection work, our script to catch broken links on dev-snapshots builds of the documentation doesn't handle redirection correctly, reporting it as broken. Both to appease the broken-links script and to avoid an unneccesary redirection the RFC links in `qtnetworkauth.doc` was modified to point to the new address. Task-number: QTBUG-96127 Pick-to: 6.2 6.2.0 Change-Id: I063a94d9cce0f2b38a039a45f23a962ac3eb5ab0 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Remove unsupported customFiltersKai Köhne2021-08-251-4/+0
| | | | | | Task-number: QTBUG-95987 Change-Id: Ic932398343f76350fcb2f6a3b2088a8b5418e958 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* 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. Pick-to: 6.2 6.1 5.15 Change-Id: Ie9dd4449651b7795858a63dd1aeef948bcb53131 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Remove qmake project filesJoerg Bornemann2021-04-292-44/+0
| | | | | | | Task-number: QTBUG-88742 Change-Id: I97c112a9d2794881a75441591d17b2a0ce487cad Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* wasm: Work around compilation failures when FEATURE_http=OFFAlexandru Croitor2021-04-273-0/+6
| | | | | | | | | | | | | | | | | | | | | | Some of the header and source files incorrectly check for QT_NO_HTTP without including the necessary QtNetwork/qtnetwork-config.h header. Because CMake's AUTOGEN still runs moc on those files and then includes them into mocs_compilation.cpp, this causes compilation failures. Work around the compilation failures by including the moc files directly in the respective cpp files. Note that this ensures archiving works in a static build, but results in a an unusable library. This was the case for Qt 5.15 as well. A follow up change will be done to clean up this state, but for now this change unblocks adding the WebAssembly platform into CI. Task-number: QTBUG-78647 Task-number: QTBUG-93243 Change-Id: I9b6657d5ae539fdb09a741637cc5a19e652c9272 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update overview documentation to include CMakeKai Köhne2021-02-242-14/+22
| | | | | | Pick-to: 6.1 Change-Id: Ic9cb94fec0bb5913758b52dcc51eabf983b7528d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Do not highlight Twitter Timeline ExampleKai Koehne2020-12-021-1/+1
| | | | | | | | | | | | The example won't work out of the box in the online installer for 6.0.0 - it needs conan to be integrated first, which will require extensions in the example and Qt Creator. Change-Id: I3a88a5234e16d17af9982f380372f1f3b6c62a3e Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io> Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit b0523c2519d97a352ef2cd78d82155d85453a5fd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Resolve a Qt 6 todoMårten Nordheim2020-11-119-34/+23
| | | | | Change-Id: I788630034a71d78a7c16b0a94e85f15aa41af4b6 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Rename "Porting" pages to "Changes"Jerome Pasion2020-11-092-3/+3
| | | | | | | | | | | | | | The content in the porting guides are closer to a changelog than a porting guide. At this point, it is easier for maintainers and contributors to write in a changelog than a guide. This change should help with readability and is closer to the usage of "Changes" in documentation. Part of a rename in other submodules. Task-number: QTBUG-87156 Change-Id: Ia63ff48c96b221b83f51f4eeec03232883ad2b55 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix deprecation warningsMårten Nordheim2020-11-051-3/+3
| | | | | Change-Id: Icd8645e0595640471c32ff2ff1d37019057af6f3 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Http reply handler: various clean-upMårten Nordheim2020-11-021-5/+11
| | | | | | | | | | | | | Just various changes I noticed could be made while I was looking into a bugreport. The socket->read(1) creates a QByteArray each time, let's just read one char. Use QByteArray::number instead of QString::number().toUtf8 Change-Id: I0c508fee0c350a76fc9e0d6ea6db5379a4075ab1 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* 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>
* 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 Pick-to: 5.15 Change-Id: I1fd123d223aed0894743e6d9b3eba27da143a030 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-10-011-2/+2
| | | | | | | | Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I6dfd4a015e177bf868e38e5ac2916ea30615aa33 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Doc: Add Qt 6 changes filePaul Wicking2020-09-212-0/+50
| | | | | | Task-number: QTBUG-84051 Change-Id: I4a9588881e3238e076ba3d27a8c542c2a8af8df4 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Remove use of FollowRedirectsAttributeMårten Nordheim2020-08-111-1/+0
| | | | | | | | | In Qt 6 the default behavior is the same as FollowRedirectsAttribute provides. Task-number: QTBUG-85901 Change-Id: Ic094f102d7dbc5214a579993695537b951ddca6f Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* QVariantMap -> QMultiMap<QString, QVariant> in many casesMårten Nordheim2020-08-1110-41/+41
| | | | | | | | | | | | | | Following the separation of QMap and QMultiMap we can no longer create a QMultiMap<QString, QVariant> from a QVariantMap so entries need to be inserted through a raw loop. QMap can also no longer hold multiple values per key and as such parameters where this would be expected have changed to QMultiMap<QString, QVariant> as well. Task-number: QTBUG-85930 Change-Id: I5bdfe38c22ea0cdde5bd1336a0070514e8d6474f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Doc: Update docs with cmake package informationNico Vertriest2020-06-301-0/+1
| | | | | | Task-number: QTBUG-85179 Change-Id: I5bff21dba86104067ff04fa7aecdfdc48f28f2b8 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-291-2/+2
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I116cbcd0b4b5e10ac886a3b6af0f65649b95f65c Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Silence warning about deprecated codeAndy Shaw2020-06-221-1/+1
| | | | | Change-Id: I69b2e29b47144b5c72ea3828840bbd5d01ea7c37 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-03-242-0/+35
|\ | | | | | | | | | | | | | | Conflicts: dependencies.yaml coin/module_config.yaml Change-Id: Ibdaaddae3887694fa72bbd8d25d78d586c4ab803