summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Re-add dependencies.yaml now that qt5.git wip/qt6 builds fine"wip/qt6Alexandru Croitor2019-08-281-4/+0
| | | | | | | | | | This reverts commit ccde32dd8ed91702fc7e58850cf462bcaf15390d. As discussed we shouldn't use the files until we have an easier mechanism for updating in place. Change-Id: I942e0e28a08af639478d6d4287ef865ff9e2f240 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Re-add dependencies.yaml now that qt5.git wip/qt6 builds fineAlexandru Croitor2019-08-221-0/+4
| | | | | Change-Id: I959a72311aabc78b46d64998b8b1709889cf383f Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* Bump module version to 6.0.0Simon Hausmann2019-07-111-1/+1
| | | | | Change-Id: Icc1c7fd6aac680d7f4537678e64db2fa649800b5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-291-0/+20
|\
| * Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-0/+20
| |\ |/ / | | | | Change-Id: I09fe09b369086933e0b3558ca1757d7303dadcb3
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| | |\ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic9209322e9471e7e6b50b8482435dae5cd0aa249
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | |\ | | |/ / | | | | | | | | Change-Id: I0d0b14d7e7052e007dca9b168f23edad0671b9e1
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: I61e4d4978158acfa25131dddfe96084003428136 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | |/ | | | | | | | | | Change-Id: If375f49d8fe38f7b2cd6d1c2b6e77067371bbe74
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-221-0/+18
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-221-0/+18
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I9817185094669af585b38707e181c5b1ba7bb021
| * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| | |\ \ | |/ / / | | | | | | | | Change-Id: Ie1cdf7f35539b1863f374777b4dc039955298539
| | * | 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.13' into devQt Forward Merge Bot2019-04-231-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I9cba1c899e11d8e7a7b7766ed2795bb05d38d97c
| * | 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.13' into devQt Forward Merge Bot2019-03-300-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I60130dc961c00a9912db955a93ccd7f142a1e7c3
| * | 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.13' into devQt Forward Merge Bot2019-03-191-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I478468800e29dc0924290b0f6c4d1b77951a2efe
| * | 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>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: Ia50482dc2c7e40260ff1ddd54e90df032af66b91
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-052-0/+8442
|\ \ \ | |/ / | | | | | | Change-Id: Ib7a393dba8ccf118e23f62d8ee061b117a8ed012
| * | 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
View Lorry Controller Status