summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-191-0/+9
|\ \ | |/ | | | | Change-Id: Iee808a11759e452c298a74754ae3a60bc02f7c41
| * Doc: Add license details to index pageKai Koehne2018-05-141-0/+9
| | | | | | | | | | Change-Id: Ia2dac7d47542666e3c9529efb480cb6238899ceb Reviewed-by: David Faure <david.faure@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\ \ | |/ | | | | Change-Id: Iffc898301e4284bb91e6efc0d088beb4cd18baf7
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: I9f738af3f1e92fc4b2550a6df04d88ffc8c04a20
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-231-0/+22
| |/ | | | | | | | | Change-Id: If03e7f12dfeeb71a66f9ccf557ca3217d31f300c Reviewed-by: David Faure <david.faure@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-282-6/+32
|\ \ | |/ | | | | Change-Id: I5abddc28efee08aaa909c509145279b1dd3a1035
| * Silence GCC8 warnings in qx11infov5.11.0-beta4v5.11.0-beta3v5.11.0-beta2Ville Voutilainen2018-02-281-6/+6
| | | | | | | | | | Change-Id: I50fe500de9d274f1b78151992162344a25894b1d 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: I2a5ab4ebc65b26af8424dbf6b2e99a096704491f
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: Iaf6168f680a1bc2a7b33b4c838ba0dd70db6147c
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
| |\ \ | | | | | | | | | | | | Change-Id: I69753ae515bfd90b423020346d285abcd2f33506
| | * | Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: I5ca4d9ed2661d2dacba6e55c685bd70d928d1d81 Reviewed-by: David Faure <david.faure@kdab.com>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: I0de416679d93c4b20c549eff56b4e0737ba026a4
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-203-0/+8406
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If6efef73040c49ac57f448baacc444493cfd6c0a
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-181-0/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I99628cda14bb3747fe0964021cb6abe7a0945dea
| | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-051-0/+25
| | | | | | | | | | | | | | | Change-Id: Ifc3e2570184c900821414ef95c060d76bab3008b Reviewed-by: David Faure <david.faure@kdab.com>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: Ic1be1eefa15eec3b11f6e6f878763095a5b4b970
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I1a10e8f01638ac2d5e12b277c28520f736022904
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I536d2ce99db96419bb83ce4913c9c425714d1e36
| * | | Add binary compatibility file for QtX11Extras for 5.10Milla Pohjanheimo2017-12-141-0/+8357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | File to test binary compatibility for 5.10 added Change-Id: I02e51146c2d3c319391e4cfc944daf2416a4865e Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I9804ca1321e6ba67874efee3c3c533a7114b5867
| | * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-211-0/+24
| | |\ \ \ | |/ / / / | | | | _ | | | | Change-Id: I1cfc5e1b9aa8f3047b8084b8ae85b98cb9b40a44
| | * | Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-131-0/+24
| | |/ | | | | | | | | | | | | Change-Id: Idb27ccd16ea91c0fc4ec8689ce670363e689c3d2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2013-13/+573
|\ \ \ | |/ / | | | | | | Change-Id: Iefeabec872d521c5788b6cde315ae87bd1c1140a
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-131-0/+30
| | | | | | | | | | | | | | | Change-Id: I3596283dc79f99b3763a152ab30624efabfcc964 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-304-10/+34
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie24e49d8396394f78f98367ad3485d2540ba3156
| | * Fix outdated FDL license headerKai Koehne2017-10-172-10/+10
| | | | | | | | | | | | | | | Change-Id: Ie88e763f3028467fdb096124118855bc82fbf88e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: I948a1f253679ad608f88027584a0e1b51c5b01a2
| | * Add changes file for Qt 5.9.2v5.9.25.9.2Liang Qi2017-09-281-0/+12
| | | | | | | | | | | | | | | Change-Id: Ia642277037f89b4e5373a83a7d4795345dc5b9fd Reviewed-by: Liang Qi <liang.qi@qt.io>
View Lorry Controller Status