aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-181-0/+25
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1370a8ebdfbbcfbf605ed95769dcb600417d4134
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| |\ | | | | | | | | | Change-Id: I5720a38d3b1606860a4aa6901a5ba40283308812
| | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-081-0/+25
| |/ | | | | | | | | Change-Id: I9fb0ec962fb51a222a399f39cca5861c8dbf525d Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | Change-Id: I2bdb804fc9c28a38ad507fb9f3a46b8b15aa138f
| * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| |\ | | | | | | | | | Change-Id: Ie133ba28e789ef8eb2fa998311affd141c13d506
* | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: I21c51d11238fd0e311c038eb7cec5774f717a312
* | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
|\ \ \ | | | | | | | | | | | | Change-Id: I2dd6be3c7b4483a8b9ff22e43e0ecf0a0a820471
| * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+24
|/| | | | | |/ | |/| | | | Change-Id: I0857b5fb59148daec27ef164d135dfa708734fb3
| * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-081-0/+24
| |/ | | | | | | | | Change-Id: I5c0bb8b9e1a26fb9f64066a828b09a8a0dfad262 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Update Qt version used in the changes fileChristian Strømme2017-11-131-1/+1
| | | | | | | | | | | | | | | | The version we keep binary compatibility with is the 5.9.x series, not 5.10.x Change-Id: I7a21dc7e4d31c64f4e6132d3bdbcba5fd3124837 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Add changes file for Qt 5.10.0Antti Kokko2017-11-101-0/+24
| | | | | | | | | | Change-Id: Ia6e998e1c88c2ec389f5650cc90e55f6f9ff2070 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-308-14/+81
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I67661e95e931fd7c6992f8f1769c50472c5e5f15
| * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+23
| |\ | | | | | | | | | Change-Id: Icbc1c9d3a0ea1b35fcead3e023f8be9c48fadf6f
| | * Add changes file for Qt 5.9.2v5.9.2Antti Kokko2017-09-221-0/+23
| | | | | | | | | | | | | | | Change-Id: Ib87bfbde880cc4f2d3acc310aad661f114699d9d Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: I933fa0a9453bceb5ad23786147015386f98a1359
| * | Fix outdated BSD headerKai Koehne2017-09-292-2/+22
| | | | | | | | | | | | | | | Change-Id: Icfe3f6a712a8e457dd695b5f0f982760eb78f4f1 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * | Fix outdated FDL headerKai Koehne2017-09-294-12/+12
| |/ | | | | | | | | Change-Id: Ia4fbd4718a698e0d4a0835869e51852c12b1442d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Add changes file for Qt 5.6.3Antti Kokko2017-09-061-0/+24
| | | | | | | | | | | | Task-number: QTBUG-62721 Change-Id: Ibfbebdcde96ea39531f58fa12c4a7038270b1bbf Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Liang Qi2017-08-151-0/+24
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2fa03b94d0263d222453e4ef164427b077f6422d
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: I56fcabea98ccb2ad71fec36d8c164c838cde0f8d
| * Add changes file for 5.9.1v5.9.1Antti Kokko2017-06-191-0/+24
| | | | | | | | | | Change-Id: Ic6c99522794ff490f0c97f77c58c145d04c282ec Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Add public API for Android new Permission ModelBogDan Vatra2017-07-262-0/+88
| | | | | | | | | | | | Task-number: QTBUG-50759 Change-Id: Ie7fef30049e6be28c3fba2eb5b54b56552df8c9d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Say hello to low level Android Service & Binder implementationsBogDan Vatra2017-07-2628-3/+1878
| | | | | | | | | | | | | | | | | | | | These are the building blocks for higher level APIs such as Qt Remote Objects. [ChangeLog][Android] Added low level APIs for Android Service & Binder. Change-Id: I320214d310a398541bbde985ecf67bf6101c0b67 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | [doc] Add doc for QtAndroid::RunnableBogDan Vatra2017-07-041-0/+6
| | | | | | | | | | Change-Id: Ib9d88dee71459d61d12bb975e24e8e59e687434d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-072-0/+43
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2620ebe62524c41b71c607347391e33a217ad88a
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+21
| |\ | | | | | | | | | Change-Id: I3920aa18e8110343d8ce7b49b5c986b1e8c2c8ea
| | * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.0Antti Kokko2017-05-111-0/+21
| | | | | | | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: Ib8fa3ca55f9f470415dcb9a3a32764e40b15c714 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| |/ | | | | | | Change-Id: I979287a2fc75cf1002b5f65ddc2762007a644cc4
| * Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta4v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Liang Qi2017-03-101-0/+22
| |\ | | | | | | | | | Change-Id: I96aab23702bdd34d365b0f7ce82a4161e3ca3863
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.85.8Liang Qi2017-01-261-0/+22
| | |\ | | | | | | | | | | | | Change-Id: Id390565398c6b9819e31aec3cc136f7a0259bf1c
| | | * Add changes file for 5.8.0v5.8.0-rc1v5.8.0Antti Kokko2016-12-031-0/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: I3da695d463878716f4ae934db3de894614cd35cb Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | | Android: Allow timeout to fade out splash screenMathias Hasselmann2017-03-202-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If78fe57fd5ceccad541fb2b3d7a92eefcda06057 Task-number: QTBUG-59200 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ / / | | | | | | | | | Change-Id: I9ea800aa0de21297a1d12e5b1c27079fd039efbe
* | | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-241-10/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1fea0d1f4b2f99021b94d0922dc1e07bf4d935b1
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| |/ | | | | | | Change-Id: I85f0256ce61e41566f8de7877e50a630c83e9b94
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-10/+0
| |\ | | | | | | | | | Change-Id: I97c7c7fc4d3b3cd1489a1d056959805cd684fecf
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-10/+0
| | |\ | | | | | | | | | | | | Change-Id: Ib43b28edce5ffad5abdad30b06d717d2a7d66935
| | | * remove dependencies from sync.profileOswald Buddenhagen2016-11-051-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: I07ca9907ddf15527804027070f38a9156b93ca6d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-216-1689/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia3e6cc1426587473c7079c0b20e76cfbd31cfeea
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-beta1Liang Qi2016-09-185-1689/+0
| |\| | | | | | | | | | | | | | Change-Id: Ia2b6356a24b3783af13ed86d48528a81df11061f
| | * | Removed unnecessary license filesv5.7.1Jani Heikkinen2016-08-045-1689/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Idf9a99c72e98171c323d0df1e123a0039366dbee Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | | Mark this module as Q_FOREACH-freeMarc Mutz2016-09-071-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I238604bec632fe15791d29955ef57de943a5e334 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ / / | | | | | | | | | Change-Id: I9b07a118a4cd622f280aebedffbce613bbaa3a9b
* | | Add QtAndroid::androidContext()v5.8.0-alpha1Alex Blasche2016-08-042-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtAndroidExtras][QtAndroid] Added QtAndroid::androidContext() Task-number: QTBUG-55102 Change-Id: I95122c8939e227acffb13ea9ba1a338a9d05595a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-027-229/+298
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0d8be58f3552d5714faedf586523dc3525ebfaf8
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-016-229/+253
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idbbad4585c05ea7c42c5d60e8b74ec20ca3d8737
| | * Workaround clang buggy explicit specializations function templates exportv5.6.2BogDan Vatra2016-07-191-225/+225
| | | | | | | | | | | | | | | | | | | | | | | | Should be reverted when https://github.com/android-ndk/ndk/issues/34 is fixed Change-Id: Idcc951ff432dbadd57a09851bcb7486b019b3426 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-174-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I7eb1329e7215b99664b7c59f692de5858858a846 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-091-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I315e9fde41e59ec5ad8ec98ad979904af0cbda02
| | | * Add changelog for 5.6.1v5.6.1-1v5.6.1Christian Strømme2016-05-231-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: Id11e8627d0ed9b594281f21958bbf7f3f8cdea52 Reviewed-by: BogDan Vatra <bogdan@kdab.com>