summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Regenerate projectswip/cmakeAlexandru Croitor2019-11-156-16/+44
| | | | | | Change-Id: I8a925463317cda1a507d430266d9e884ada3c6b3 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Port to CMakeSimon Hausmann2019-10-299-4/+148
| | | | | | | | | | Also removed dependencies.yaml to fix the build as that's not used in wip/cmake yet. Fixes: QTBUG-78170 Change-Id: Ibe3a9bb5ddc7d3b4bf979847af6ad3467bf2d866 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtx11extrasQt Submodule Update Bot2019-10-021-1/+1
| | | | | Change-Id: I34c3a598425228391699c2d20f117d0041bb7f37 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtx11extrasQt Submodule Update Bot2019-10-021-1/+1
| | | | | Change-Id: Iab49120ee4e044b550f9c589f72661b9de0d7abc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-282-0/+40
|\
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-282-0/+40
| |\ |/ / | | | | Change-Id: I37b439555d5e87a6aa372821a3de60059ad7ffd4
| * Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
| |\
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
| | |\ | |/ / | | | | | | Change-Id: I11a1e0bc97482e312814393be2347c3236355351
| | * Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta2v5.14.0-beta1v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+40
| | |\
| | | * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| | | |\ | | |/ / | | | | | | | | Change-Id: I08f84cbdf60a2a672e9e9ff1c7761b49f7ab6312
| | | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | | | |\ | | | |/ / | | | | | | | | | | Change-Id: I0523903eddfc21a719e59c55906273ab0e678690
| | | | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | | | |\
| | | | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | | | |\ | | | | |/ / | | | | | | | | | | | | Change-Id: I88eb497f4f64a8318d5f0b7751e93db1e1efa0e6
| | | | | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-231-0/+20
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 10cc8dece051ec715a0db5c48ebcecebfe9d6c63 Bump version Change-Id: I77abbb575cd8a006a018b33862e96899494e972b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| | | |\ \
| | | | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | | | |\ \ | | | |/ / / | | | | | | | | | | | | Change-Id: I74192e8961b3cfc12ac9d253312789cb04c75e7a
| | | | * | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-07-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 3b568d78454026b1d3abb46dd29d5eaca24aaf51 Bump version + 2fe9b682bbba406356a38cc4661330259dd97b97 Add changes file for Qt 5.12.4 + cd886cd4f08570953f1db3557eed974cc3c3737c Bump version + 10cc8dece051ec715a0db5c48ebcecebfe9d6c63 Bump version + 88b80225939fe85bd8f99d7a1ec4b9e757bda0f3 Doc: Replace example file lists with links to code.qt.io Change-Id: Id0d76710683a5b4d4dbb1c69acc1c444c41a1741 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | | | Update dependencies on 'dev' in qt/qtx11extrasQt Submodule Update Bot2019-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I393fb7707ac363d794d434748bb7523389ac3a7d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | | Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev"Simon Hausmann2019-09-191-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-09-191-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I49dcc6cf9548ab40f7c48ff535a669d3d07f757d
| | * | | | | 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>
* | | | | | | Update dependencies on 'dev' in qt/qtx11extrasQt Submodule Update Bot2019-09-191-0/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3546f85631fdb9a34cc1de28211c98137e772726 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | | Bump versionKari Oikarinen2019-08-271-1/+1
| |/ / / / |/| | | | | | | | | | | | | | Change-Id: I432054f4e53033c80c26fcf12b1c18e9ecb921b2
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-131-0/+8792
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-131-0/+8792
| |\ \ \ \ \ |/ / / / / / | | | _ / / | | | / / Change-Id: Icdbf38c0b7a0c35038da7441b394cf904d083434
| * | | | Binary compatibility file against Qt5.13.0 for QtX11ExtrasMilla Pohjanheimo2019-08-121-0/+8792
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | BC file added. Change-Id: I3b36b4f0b21806719bbcecb47de4c1ec969f13c4 Reviewed-by: David Faure <david.faure@kdab.com>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-161-0/+1
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: Ifb48ec22be7825d34a4ed4e8b3db8100857e1f15
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ica78e08be2c41d921d9d4b80a3edab02082c4f98
| | | * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I637594ef8ee08baf90586da60be9606d76017d2b
| * | | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I901e895fbc548793fcf728d85c5e740105e67f7e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
| |\ \ \ |/ / / / | | _ / | | / | | | | | | | | | Conflicts: .qmake.conf Change-Id: I424306a2fd8aa2aef3bb7b17de5af66d1eb69b5d
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: Iefd2c970d05518121ff350642b81facc0e325db5
* | | 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
View Lorry Controller Status