summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgpl5.15Tarja Sundqvist2023-03-231-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I14c18d6488b60ba7527507d382a4a843838ff998
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ic65c886b6ed5cae616fc1e250a1b8000ee961bc8
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I1f5c1713fbafa7e5bee43d5ebfc463f0fafc72fb
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: Ia3294487c3049da036c5d00f52921dde57006f8b
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-162-1/+2
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I24fafb7caf27c7de45b69c20fa627d9af50e12d6
| * Update obsoleted functionality in preparation for Qt 6Tor Arne Vestbø2021-07-161-0/+1
| | | | | | | | | | | | | | | | | | Functionality that is obsoleted without a replacement will have instructions in the Qt 6 porting guide. Task-number: QTBUG-93633 Change-Id: I794eb4286f2021aed0708f5af231b77c584b3f73 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-06-021-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I4e1e0c5c6c0e0ca264fcdfe82c5acbcf523ea66c
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: Ibdcea12b388a96dbf7c25c0cb9f076069502b3db
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I7e3de51d9d915d85990b96615becd7eeca9246ae
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I8c47a6d6abd22fc89f9d06d312dc73bdb44c14bb
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-243-61/+61
|/ | | | | | | | | | | This reverts commit 2c3c665cf1629aa55fec9c24d9d1324c28ebfc0b. Revert of commerciali license header changes is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Iba840af51eb3098b259da337a7808cbdd6709287 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-273-61/+61
| | | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtx11extras. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4170 Change-Id: I110fd6e0975c35ff40e92a04cd5b13e246f71252 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I0342739c107ef388fb950844f25218b4f88ad28a
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I13315804f509640b7964f0563ece99f4e76354a0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit be7f01d16d143681be394a13e19eb4d816aa8a97) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: If91813656befb3ac4540308aeff5d61cf5065502
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | | + bdca154ef2ef22034202aae55a7f16e6c0fa5e85 Add binary compatibility file for 5.15 for QtX11Extras + 59b3f8038383480b5e1c1cb31e0de0ebd6a095ba Bump version Change-Id: Ia9a82e1b63b7687b117826075a95104715e941ad Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit afa3ad1c1cb04ce1e51b0af4bdac028809f9d0d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I8d4828da68684b2e37febff3aae2ead9d4b2eb37
* Add binary compatibility file for 5.15 for QtX11ExtrasMilla Pohjanheimo2020-07-151-0/+8861
| | | | | | | Binary compatibility file added. Change-Id: I69a3714f30c194cd47b5b2a506d86349067353af Reviewed-by: David Faure <david.faure@kdab.com>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I5340d0d69b08599bea206ce3da4e6d43a00aeca6
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: I0e31a0e29094f54c42805a7af10948c1fdad1adb
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: I3b31f2eef35020f5d8fced207b771841f5ae4a86
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I6bb751f35384fc452dda022c1b626c6f33b01723
| | * | Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | + 57910a8015e05328a9ad412b4d76cc2137a853f3 Bump version Change-Id: If209aa1f82aaf10c8ff872ed13d31028ba1d772c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+18
| |/ |/| | | | | | | | | | | + 82d4d38d2037ae36b38fe81916b14feb4068972b Bump version Change-Id: I351ac504dfbbf27ddeaa2a0c76ac1f426e1c35af Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7200e8acab3b84235ab0c4f6fe93692682add968
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I7eeec228c134bbf096947669b1b3c3e3b230410c
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\ \ | |/ | | | | Change-Id: I8b3e6a746bb1b9f70c6b11f4eb7ec907792be0e8
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I02eea8b1ddd5d5bcdb7d6c5c1b44b3205e19422d
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-091-0/+20
| |/ | | | | | | | | | | | | | | + 93b89977b3d8f2ef9c49fd6e6b97b0b33617f865 Bump version + a40627760ad12dba8e7e0ecebcbffb6f23a024b3 Add binary compatibility file for qtx11extras 5.14 branch Change-Id: I8c313585d9460c2094f07adc906e9fdaf189fe3d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-0/+8846
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib6f7d9d9fc4f8e3db3440fa6969d6d01897f27e3
| * Add binary compatibility file for qtx11extras 5.14 branchMilla Pohjanheimo2019-12-171-0/+8846
| | | | | | | | | | | | | | BC file built against 5.14.0 added. Change-Id: I226fc18f24959e65fbbfd2f19b3349f7a7c3c2c2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: I8d09fdb1e76e1705ec033abe2b160d52769c35a7
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
|\ \ | |/ | | | | Change-Id: I969af2664bd69dd59fe2beaa46e4f1f185eadb8e
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\ | | | | | | | | | Change-Id: I9abb869e3bfb7f07ca4a3d5d2e491d11095297d3
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-251-0/+18
| |/ | | | | | | | | Change-Id: I5788b4c70d2ec1802b6f7ead4d0a0d1276beb781 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-161-2/+2
|\ \ | |/ | | | | Change-Id: I88c492f19463fa9d289c24cd04d9251cf11bd15e
| * Doc: Fix documentation warning for QX11Info::appRootWindow()Topi Reinio2019-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The QT_VERSION_CHECK macro interferes with QDoc's ability to match function documentation to the signature. Resolve this by moving the documentation comment to right above the function signature. Fixes: QTBUG-79825 Change-Id: I48491ab67922a61f21202eaa2213259c2624f80d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\ \ | |/ | | | | Change-Id: I63f23ea477f30bfec872fd5d4e1fb995e35eef2c
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I13eefcdefc2c2d754bce5f78cd24de307f728cb1
| | * Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | + 9f325067de14ffbed42775c2a3d1f9570bf696ae Binary compatibility file against Qt5.13.0 for QtX11Extras + 35ae66f89959e1dd98648cc4033e153e1e5240b4 Add changes file for Qt 5.12.5 Change-Id: I6404080fe613f7ace2333b0deda182f31844a4ca Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: I85987b5407da4b747b71cdda1ac10b5b757f2284
* | | 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
View Lorry Controller Status