summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|/| | | |/ | | | | Change-Id: Ibeb7200cd7590cbcd2c9dff6295ea583ec69985f
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: I866722f45d444c0ffb67001ab2802e94b5f40b22
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I410a40c9835c41d34e9079cdc4736c6f8a5a2de3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I00070de09ccb4c433e7c8a10ef6758f6ba192449
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I96daa628da80851d5c34863cd89fe554063d2874
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-143-1/+69
|\| | | | | | | Change-Id: I15f4c5c395a0b4991d0d9fce9524df3d96676cc8
| * Fix for second temporary token being interpreted as successMårten Nordheim2018-07-103-1/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code now keeps track of whether or not the final tokens were actually requested. Before if we received temporary tokens a second time it would behave as if the authorization succeeded and would simply fail any actual authorizing and would stop attempts to authorize again. By keeping track of whether or not an actual request was made we can now tell the temporary and the final tokens apart. Change-Id: I4a55e7beda9e7be9d8c693739f4d3985438837ea Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-072-1/+3
|\| | | | | | | Change-Id: Ia7b15fdde5acaebae8661441095730b2350437ca
| * Fix the twittertimeline exampleNicolas Ettlin2018-07-032-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The ‘twittertimeline’ example wasn’t working because it couldn’t find a callback URL to redirect the user to. This was fixed by forcing the HTTP server to listen to a specific port (1337), as it’s done in the Reddit example. This commit also updates the documentation to explain how the users should configure the callback URL on their Twitter app settings. Task-number: QTBUG-68632 Change-Id: Idaaa550ecc37b42f91efa80f63b03d9c222c2e96 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-264-3/+27
|\| | | | | | | Change-Id: I969dc5aaa41cb76b799d7ec0abf532ddfc503444
| * Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into ↵Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | refs/staging/5.11
| | * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I954fa842973f20a38b4aada55f25c58ff92ce5a8
| | | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-091-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: I462965d2c5ca69c8c5b050f07d6e172a7ef03f7d Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
| * | | Doc: Add missing dots (qtnetworkauth)Paul Wicking2018-06-192-2/+2
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: Iaa915bfb4158b06028885a98cdf9430f23c1fe09 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | Fix warningJesus Fernandez2018-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | Replaces a zero with a nullptr to remove a warning. Change-Id: I009b97a8605f842e283879a7f2ee440e16b3a62b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-191-0/+7
|\| | | | | | | | | | | Change-Id: I44b2fc349045be2921949177d564999110aaf5a1
| * | Document licensesKai Koehne2018-06-181-0/+7
| |/ | | | | | | | | Change-Id: I549e71d3f655d598d28c84f483b5c2d0823b4b35 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-040-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I20a98a6239fc57a67e0b83dbb124d711676600e7
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: Ica88a8a1ddcad0c3f2829be2cdcd2036c61ed9b8
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-281-0/+2
|\| | | | | | | Change-Id: I56be7b71310d6987e1ad02caff4cf7100daa500b
| * Improve Reddit Client Example documentationRyan Chu2018-04-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | To register the application on Reddit: 1. Choose installed app when creating the application. 2. Set the redirect URI to http://localhost:1337/. Task-number: QTBUG-67856 Change-Id: I92f77eda30bea2c127ce8042f5a8a033b2bcd429 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-141-0/+48
|\| | | | | | | Change-Id: I1336416b625061d2fd5cffbb0de480bc761fdb42
| * doc: add doc for overload functions in QAbstractOAuth2v5.11.0-rc2v5.11.0-rc1v5.11.0-beta4v5.11.0Liang Qi2018-04-061-0/+48
| | | | | | | | | | | | | | This amends 8cce9fa16f3531e1e094a798c007480afa2bcaab. Change-Id: I613abcc9a5b3606643aa2e4925739d19e4fdcd6b Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-055-10/+80
|\| | | | | | | Change-Id: I83f1fc441fe3853ebcf61c85b8a6284e48be2430
| * Doc: Fix documentation warningsv5.11.0-beta3Topi Reinio2018-03-272-7/+4
| | | | | | | | | | | | | | | | | | | | | | warning: Undocumented parameter 'modifyParametersFunction' in QAbstractOAuth::setModifyParametersFunction() warning: Undocumented parameter 'other' in QOAuth1Signature::operator=() Change-Id: I37d08a547b64d325d9a3b5106f639b3be36ded48 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * Add missing includev5.11.0-beta2Ville Voutilainen2018-02-271-0/+1
| | | | | | | | | | Change-Id: I7e13cc209356a90a339529124d0aff363ab1a34c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I68faa283a00eca945c8bdd8950c745ba56f77d46
| | * Bump versionv5.9.5Oswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: I572659aea0f196c3fae5c2d0eab56a9ce6c775a4
| * | Fix refresh token workflowv5.11.0-alpha1Jesus Fernandez2018-02-132-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workflow for refresh token was not working properly due to a missing QObject::connect(). Getting the access token and refreshing it later was working, but only because the connection was done in QOAuth2AuthorizationCodeFlow::requestAccessToken(). The patch adds a couple of tests to check both workflows. Task-number: QTBUG-65778 Change-Id: Id89f2e9f64d5285fc6cd24c9c4afd430b8925239 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Kamil Rojewski <kamil.rojewski@gmail.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Fix a leakJesus Fernandez2018-02-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The object was leaking memory because QAbstractOAuth::setReplyHandler() is not taking the ownership of the replyHandler. Change-Id: I05e6ba9a7781c062d7c860908306680486de49bd Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | Add property for refreshTokenErik Larsson2018-04-043-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Add a property to the already available C++ API for refreshToken. Change-Id: I34be1dd2a7b234cd7a24d8e56f959b8624269216 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Update refresh token only if a valid one is receivedErik Larsson2018-04-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When receiving a access token it is common to also receive the refresh token. But some api:s, for example Spotify[1], does not. That will result in loss of a valid refresh token. Make sure the refresh token is valid before updating it. [1] https://developer.spotify.com/web-api/authorization-guide Change-Id: If186dad353d97310d164476f89088668ffef9ca6 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / | | | | | | Change-Id: I3f1766e17f24db1903b147f5e066f7f918558081
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-2012-17/+249
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I815c33bbe5a821a47c66d3d4b43ffd3873337c20
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.15.10Liang Qi2018-01-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I967987aa49ae367010b2fa1247f79827c6eb911c
| | * Bump versionv5.9.4Oswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: Iea6b26671f64187feee7a3e4c2fe21c68b16a602
| * | Add a basic OAuth2 testJesus Fernandez2018-01-183-0/+109
| | | | | | | | | | | | | | | Change-Id: I62161dfdfd707a9e943516dde0c62abbb471ebad Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Fix reading body incomplete bodyJesus Fernandez2018-01-181-2/+9
| | | | | | | | | | | | | | | | | | | | | Sometimes the body was not available when reading. Change-Id: I2eab85b94b416ba1ed05a78732458b7eb5a5eb51 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | qtlite: Skip building examples when configured with no-feature-itemviewsRainer Keller2018-01-122-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-53141 Change-Id: I3e8c685219cca550d00ee1335b0b233574c465ea Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
| * | Add two overload functions for put and postLiang Qi2018-01-092-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | with QByteArray or QHttpMultiPart in QAbstractOAuth2 Task-number: QTBUG-65316 Change-Id: I893b2ad602de8c539ea08b72150dd1f92162b9dc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
| * | Fix QOAuth1::tokenSecret() return valueAndrea Scarpino2017-12-222-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit c071b588ce2b4d474845d553aa83120747dc46da broke QOAuth1::tokenSecret(), in fact, it were returning the clientIdentifierSharedKey instead. [ChangeLog][QOAuth1] Fix tokenSecret() return value. Task-number: QTBUG-65422 Change-Id: I72d6783220e7a030eac65e5c22e4421a1d6b106e Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
| * | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: I48d6a7ac8df4906c5bde304ab91546a3a68efa8b
| * | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-3/+2
| |\ \ | | | | | | | | | | | | Change-Id: I4019ef47866c0df0ca1fbcd8fda75013debcd4b3
| | * \ Merge 5.10 into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Oswald Buddenhagen2017-11-201-0/+147
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ia395f65e4e6cb7b7efbebab71e8653d87d028af4
| | * | | Doc: Add highlighting for Twitter Timeline ExampleTopi Reinio2017-11-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-60824 Change-Id: I229dc72963cac030a085e1d6988b9a2a9e7ff44a Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| | * | | Doc: Remove Technology Preview statusTopi Reinio2017-11-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01c49cfb4c18c01acc0ed762dcfc72ea027cd30f Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | | | Document QAbstractOAuthReplyHandler classJesus Fernandez2017-12-051-10/+74
| | |/ / | |/| | | | | | | | | | | | | | | | | | Change-Id: Ib3e478b7653702cf6d69978d3212f35484ee4702 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | | Doc: Remove QAbstractOAuth2::clientIdentifier property documentationTopi Reinio2018-01-121-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | clientIdentifier was moved to the base class in commit c071b588. Change-Id: I9cc2309948ad5a03b0a00c8a85c070404c435a8a Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2018-136/+383
|\| | | | | | | | | | | | | | | Change-Id: Ia46ca5acbe3a6ec127358bdfe99d7dc9c25dc182
| * | | QOAuth1Signature class documentationJesus Fernandez2017-11-141-0/+147
| |/ / | | | | | | | | | | | | Change-Id: Ib3ded30af5b9886d53db22c5feb2d91d9f10bfc5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>