summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-071-0/+18
| | | | | Change-Id: I0c1219b0c663f75cba00b6cd25b0361fdefb5bc2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
|\ | | | | | | Change-Id: I8d25efc6a9506c6479c6556c02f137984eb8515f
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| |\ | | | | | | | | | Change-Id: Ia3ad656284a19550d1267e7df2ec5805df7cd4c1
| | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-021-0/+20
| |/ | | | | | | | | | | | | + 11ee82ab6c256e50a39758272f1a8ca19dc8d4f3 Bump version Change-Id: I8774f3178ce1cf983e836b7fdd7639eaf338b817 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | 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: Ib4743e4010167934f07a80fafd32734119b1da50
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I14b14f3f8f4c7e7e9968e0a2715ed661767fcbf2
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
|\ \ | |/ | | | | Change-Id: I968576d6cef8f962d90618b8e4b68a707b211a33
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| |\ | | | | | | | | | Change-Id: I59f41cdc408d29cde0a245d13a8b3fd6acbede5f
| | * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-211-0/+20
| |/ | | | | | | | | | | | | + d5a574ec945cce6f53232c53030d9b3b691f9032 Bump version Change-Id: I3ee25b06779b7ee22d84fea6f4953f6c93494466 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1v5.13.0-alpha1Qt Forward Merge Bot2019-02-022-0/+8442
|\ \ | |/ | | | | Change-Id: If864392eb1dbadc9aab0752190629bed2956d0c2
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+8442
| |\ | | | | | | | | | Change-Id: Ic47d7d9f6f5371d571c39471af030433d924c1cf
| | * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 25abe51f8455fbdaab9d6c4bcb6c8ce7b45f5e13 Bump version + 7dd26dd9c760cbc4c8078948b32811ac4ac20a8d fix build with non-global xcb installations + 877c585bc474934e3bb1044293a62c72cb01b9cf Add changes file for Qt 5.11.3 + 0249c2d58619e4f38f72304b1476ade60f970dee Add binary compatibility file for QtX11Extras for Qt 5.12 + c3f2f14d64c8301cdce8b1a9b383ca8eaaec6406 Bump version Change-Id: I585a068a5c72053905c919d759dcfc685a9978e5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-083-1/+23
| | |\ | | | | | | | | | | | | Change-Id: I128bb697b99a16a967814d24f09facf3c48eb45d
| | * | Add binary compatibility file for QtX11Extras for Qt 5.12Milla Pohjanheimo2018-12-171-0/+8422
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility file added. Change-Id: I49774e6285b3dee9d0d5fa7d7610847f6fdec32f Reviewed-by: David Faure <david.faure@kdab.com>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I10219b6e7ca13f2f9ff20b86e440659bef3995c6
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | |/ | |/| | | | | | | Change-Id: I4cc6fa2fc06e08235b26f56ad0a83e7fc384f5bb
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I95b6b6364e8d9f45b77cdd4362951685b261db2e
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | | | | | Change-Id: Ib5122464bd82d5194b86423ec36d1cdf500fcbe7
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-152-0/+22
|\ \ \ | |/ / | | | | | | Change-Id: Iad2181af670c8b12fc2c06dabbe4b1aed8b33563
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-112-0/+22
| |\ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2144151d80b976ebd54c4d921a48a5a52c805352
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I682e8830ccb9f002af31064086bd20a4a03fe6fb
| | | * Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + 25abe51f8455fbdaab9d6c4bcb6c8ce7b45f5e13 Bump version Change-Id: I640ac6ea80327034a45d5420fd15774ccc12450b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | fix build with non-global xcb installationsOswald Buddenhagen2018-11-121-0/+2
| | |/ | | | | | | | | | | | | | | | | | | Fixes: QTBUG-71672 Change-Id: Ifec963bad7f2612146b2ea624d3c52fe24e7eb88 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: David Faure <david.faure@kdab.com>
| | * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: I8c08b024639fd00cf9dc762760ec812bcc0d3a8b
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-081-0/+18
|\ \ \ | |/ / | | | | | | Change-Id: I5ac6b45402b1254e5b1b97998292868ae2e67dbc
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+18
| |\ \ | | | | | | | | | | | | Change-Id: I8958f6b1706b5e1e38270cb435e3d7cdaad15965
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.05.12.0Antti Kokko2018-10-311-0/+18
| |/ / | | | | | | | | | | | | Change-Id: Idf4facdf94fcaa6fbbea94738e47376b31f7055e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: Ib70b2b3dd9de6a2fe2efb3d55be2f4c00f44c17f
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\ \ \ | |/ / | | | | | | Change-Id: Ib550bac79a6f7c293388dc52856c5673ae142fc1
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
| |\ \ |/ / / | | _ | | Change-Id: I1f3e7cf2a67de4548f727fd6b6d7896961236318
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: Ib88c1f6445169f20136e1c3bfd6250c6cfb744b8
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I9e60cc9bcff14c6cd6ff11bc690de9a9de67e360 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-072-0/+48
|\ \ | |/ | | | | Change-Id: Ia284293cbbfbeb5b38661f8e8408628cfa9e2b5a
| * Add changes file for Qt 5.9.5Antti Kokko2018-07-311-0/+24
| | | | | | | | | | | | | | Change-Id: I442bf22a2b9a6e9d35c7c4ced6cc78ef89285d41 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit a82b308b0138d585337f4ad65edb89209dae94f6) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Add changes file for Qt 5.9.6Antti Kokko2018-07-311-0/+24
| | | | | | | | | | | | | | Change-Id: Id985cb2e466c47d3973e1697c8af66a72ddc0310 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit b51ac2d46ca54769e242702f87bc6762f9f68ea9) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1ca6ec9966768bd3a1b910c1987f225e4c31a045
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: Ib9b180ef76db4cf0c359ba397e25e1182f171d70
* | Fix return type of appRootWindow for Qt 6Frederik Gladhorn2018-07-302-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | This is minor, but it's a bit silly to cast down to a 32 bit type in return and then cast it up to 64 bit again on the same line. The returned value is most likely used to other x11 calls which expect 32 bit. I think this is so minor that it doesn't even need a change log entry for Qt 6. Change-Id: I3b54394c7934eb62026dfcf241e983c20b7e7d9c Reviewed-by: David Faure <david.faure@kdab.com>
* | Use nullptr and shared nullFrederik Gladhorn2018-07-301-6/+6
| | | | | | | | | | | | | | | | | | | | Relying on the implicit cast for QByteArray from 0 actually does not result in returning sharedNull and is confusing to read. Change-Id: I0aeef058e9f15b9fe5a53a7ed93f378bc2c74b96 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-212-6/+61
|\ \ | |/ | | | | Change-Id: I9c347b8f3f941ad15beee7a6f90b048d09c0321b
| * Doc: Mark a \snippet entry with a .pro fileVenugopal Shivashankar2018-07-192-6/+61
| | | | | | | | | | | | | | | | | | | | This enables excluding the snippet from the documentation in some cases. In addition, moved the literal code blocks to a separate snippet file. Change-Id: I892bce6f249f67c06b5285244e0bf4f5701e7272 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-235-1667/+24
|\ \ | |/ | | | | Change-Id: I024f831891f8fb1908137ed598e197874199706c
| * Remove unused license filesKai Koehne2018-06-195-1689/+0
| | | | | | | | | | | | | | These got replaced by newer variants. Change-Id: I01868c427f3b81d798c7086e251d33ce9cb64f26 Reviewed-by: David Faure <david.faure@kdab.com>
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: I1d17e600f302f339513a52026ccb7527ff6b6f3e
| | * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-131-0/+24
| |/ | | | | | | | | Change-Id: I72f7b056020705d7d96b2514460d2d7acf905186 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-0/+8357
|\ \ | |/ | | | | Change-Id: I0dcd1dc40c1f916df7e1b39f640cdfd03ceb017f
| * Add binary compatibility file for 5.11 for QtX11ExtrasMilla Pohjanheimo2018-06-051-0/+8357
| | | | | | | | | | | | | | File for bic test added. Change-Id: I6559936484daf6edd3f636296a89965255896bd1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-040-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie6db682d14c1a14cda19c1628ebfd12489dea8f8
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: Id0e5023dfae224fd185bd3e492866065c5c605b2
* | Remove LGPL_EXCEPTION.txtEdward Welbourne2018-05-311-22/+0
| | | | | | | | | | | | | | | | It became obsolete when we switched to LGPL3, as discussed on the developer mailing list in April 2017. Change-Id: If58eeda2ad78e0eed61ad2e4c3c51e486700ba6a Reviewed-by: Lars Knoll <lars.knoll@qt.io>