summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+30
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+30
| |/| | | | | | | | | | | | | | Change-Id: I14b34ece31efdb2195e1cb57c3a98e25a9202d21
| | * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-081-0/+30
| | | | | | | | | | | | | | | | | | | | Change-Id: I903368058c4783b03de075e9f99c6c5a6e4cb58e Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
| * | | Doc: Fix \sa statement in qabstractoauth.cppNico Vertriest2019-05-081-1/+1
| |/ / | | | | | | | | | | | | Change-Id: I6e99234909dc30da3609c9374d8f226acfc0e1a2 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-231-0/+20
|\| | | | | | | | | | | Change-Id: I4f87afd577c1b346404236e907d6c2812f6db66e
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
| |\| | | | | | | | | | Change-Id: I5df71e4d308d220e74dfa738e84c995ec08c6ed3
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I6a1c68fa4e2de38aaa5d3cd8b7fcbd948652d211
| | | * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-021-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 88fa9ac94241a182f8ad92a692eccabbc0caa9cc Bump version Change-Id: I3a2bb3d3c0efd140d6c3189a4ec833a7f267c22d Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-300-0/+0
|\| | | | | | | | | | | Change-Id: Id5594409c1f3dea2893eb5c4ddddafc20804ede8
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5553a72b4463dcbd89ba66e7962baf1cd8d84b33
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: I1702aa3a3f62b3ec2d379cdbca806ddd6e1c9d1e
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-231-0/+20
|\| | | | | | | | | | | Change-Id: Ic1bd809cea526353e30bf423f1d4eb5c8ff5982a
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
| |\| | | | | | | | | | Change-Id: I71e2996e2c4d98462eec603e65f970c2af7eb84f
| | * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I4dbb3bd28c1e7dc487074522eb2a1a9f66b9244e
| | | * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-211-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | + c4ac0d51133be25aace898b357a6744094d20125 Bump version + 2d58e369ed692c8a7e639919d15ff6299a76f810 examples: require widgets explicitly + 8363321174f64a1497952d2d7fec895a2a7e18f3 Do show module license on all help pages Change-Id: I6a16f75f92b8aa49ffea084b25e38a11f84a38d8 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-161-5/+5
|\| | | | | | | | | | | Change-Id: I4151811a4f92cb0f91d72b160276ce391557985a
| * | Doc: Fix link errors in qabstractoauth.cppNico Vertriest2019-03-141-5/+5
| | | | | | | | | | | | | | | Change-Id: Idbc3c7f71726b3bedb44d963cbdc13353cdff503 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: Id0de422c7a95b879c5051e45e6866b711813c2c6
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-191-0/+1
|\| | | | | | | | | | | Change-Id: Ieba004bbd79f6e0be460195a6102ba760b19e43b
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-161-0/+1
| |\| | | | | | | | | | Change-Id: I4e1a6df8587f1bc7c6670d7981cc87c56bd6129c
| | * Do show module license on all help pagesKai Koehne2019-02-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the example of the other GPLv3 modules and show the license as part of all pages. Change-Id: I43c0722b3153a5d6bb278a7939d9581409547a78 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-052-3/+30
|\| | | | | | | | | | | Change-Id: Ia03e3779256cc2234ff10f855bf3b1cad97b953c
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-022-3/+30
|/| | | |/ | | | | Change-Id: I66dc4717f21c717adefac63bb8bdbf322e00bbf5
| * examples: require widgets explicitlyLiang Qi2019-02-011-3/+6
| | | | | | | | | | | | Task-number: QTQAINFRA-1975 Change-Id: I79d056f32e2cb78458b95744d78c58f4cf762081 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+24
| |\ | | | | | | | | | Change-Id: Ia6418f05e18dec59ff8fd9ad4c1cd10e72289267
| | * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-151-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + ffb63277ac2ac90b4a99a710660d5e66920a8c5a Bump version + 90ae677b45570e45adc9d03ba9967065fdfa0432 Add changes file for Qt 5.11.3 + c85304484261af2fc046c909087549799a5979f9 Use 127.0.0.1 for redirect URI + c6d51bdf097c133955a247c9ebc600c5bc6cff58 Bump version Change-Id: Ie963030517993612e9dc21064bea48ba621f781d Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Add method to prepare network requestsFelix Barz2019-01-2816-16/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending authenticated requests is limited to the APIs the QAbstractOAuth class provides. With the newly added prepareRequest and sendCustomRequest methods, one can set the correct headers etc. on any custom created network request, including the verb that is used to the request as well the body to be sent. This includes a modifcation to the QOAuth1Signature class to make it possible to sign requests with a custom method. [ChangeLog][QOAuth1Signature] Added customMethodString and setCustomMethodString methods to support signing requests with custom methods. [ChangeLog][QAbstractOAuth] Added prepareRequest and sendCustomRequest methods to authenticate any custom request, including custom verbs and bodies. Change-Id: I86459844ee919e8c9d60d349257b57afbc3fa07a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie5d125f89a911bbd1d98daa24b430028d956e9b6
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ | | | | | | Change-Id: I66c2ef769de2214e36e894d1d746e11ff6d752d5
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I66da02a5c2184928aa38fa34464c2b0a73de199e
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: If85de7f7f770a503b1a42d1ed831655c3e52212a
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\| | | | | | | Change-Id: Ifd7c77fff8ef271e6aebf731b6faac3841903a65
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ | | | | | | | | | Change-Id: I135b657a7ea5bc61ca1808fab5476bdef0b84364
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Ib07a3904762e9d485dff400aa1416c6ecf327e83
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-191-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + ffb63277ac2ac90b4a99a710660d5e66920a8c5a Bump version Change-Id: Ia18352f686cb178543e4d99dfe2dda71d252e4aa Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-081-0/+26
|\| | | | | | | | | | | Change-Id: I0e17d825d642d71b9166dacd70f4589b717ac6f5
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+26
| |\ \ | | | | | | | | | | | | Change-Id: Id7e9a9167444ce2bbf51b66cf027c1be1dae3297
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-081-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: I4f67cebdbf10b9ea1aab8579cd827b42d9a53021 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-244-6/+6
|\| | | | | | | | | | | | | | | Change-Id: Icb3c5cddb6148e4e642b9c7669eef8e46114eda3
| * | | Use 127.0.0.1 for redirect URISamuel Gaist2018-11-224-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following section 8.3 of RFC 8252 (https://tools.ietf.org/html/rfc8252#section-8.3), it is specifically not recommended to use localhost but 127.0.0.1. This patch fixes that. [ChangeLog][General] Use 127.0.0.1 in place of localhost for redirect URI following RFC 8252. Fixes: QTBUG-67528 Change-Id: I6f5a8dd26134cde2373185eaf2c8853d6f500e98 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\| | | | | | | | | | | | | | | Change-Id: Ia275fefd556975e43d21891f08244975bfa742eb
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: .qmake.conf Change-Id: I62f3652c932530c112e650a5e52ec5b7b70263ff
| | * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: I4e9c602159602dc49e2b9a921d0385af7d961cce
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-134-0/+8
|\| | | | | | | | | | | Change-Id: I014288aa913225595dcf3200e234b057967ae763
| * | Fix compilation when QT_NO_HTTP is definedv5.12.0-beta4v5.12.0-beta3v5.12.0-beta2Eskil Abrahamsen Blomfeldt2018-10-094-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | The feature macros are defined in a header, so it has to be included first. Change-Id: I3ed7c4978cb9cdde23ed37d0e963a24a6b07f335 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: I6b8e8c19b63b42bbe2fe6f1bdfe2d8538133adb8
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-291-0/+1
|\| | | | | | | | | | | Change-Id: I43be2939e955dd4ea8967aa8fc600e34a6cc5b13
| * | Require Qt Network for buildingv5.12.0-beta1Eskil Abrahamsen Blomfeldt2018-09-261-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I19b75ad2a90c6e1426b3cbbb611ec31b9645deae Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-153-8/+40
|\| | | | | | | | | | | Change-Id: Iff7e5363a1198e2ac1d8520a28b817c4008311b6
| * | Fix grant process by passing oauth parameters to headerPoren Chiang2018-09-142-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, `parameters` passed to `QOAuth1Private::requestToken` are used as HTTP GET or POST parameters directly. This commit fixes the non-standard compliant behavior by inserting parameters with `oauth_` prefix to `headers`; this fix also allows parameter `oauth_callback` to be inserted only during `OAuth1::grant()` but not all token requests. Several approaches had been taken under consideration: * strip `const` from `parameters` function signature * make a copy of `const QVariantMap &parameters` * insert relevant headers and leave parameters intact * current: copy oauth-inrelevant parameters to another map Task-number: QTBUG-69709 Change-Id: I892f0e6b9a70c9e425fef976f6703ef065ee9163 Reviewed-by: Poren Chiang <ren.chiang@gmail.com> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>