summaryrefslogtreecommitdiff
path: root/scripts/git/t/10-git-qtqa-combine.t
Commit message (Collapse)AuthorAgeFilesLines
* Use SPDX license identifiersLucie Gérard2022-06-081-27/+2
| | | | | | | | | | | Replace the current license header in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: master Task-number: QTBUG-67283 Change-Id: I6ae743e055bbf1cf514abe604157068923fb03c6 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Fix licensingJani Heikkinen2017-06-011-17/+12
| | | | | | | | | | - Remove unnecessary license files and license header templates - Tools and test are licensed under GPL-EXCEPT nowdays, update correct license header there - Update test data to match current license headers Change-Id: Ia25c9e0989be326e0edeb0325af399edc26f0054 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update copyright headersAntti Kokko2015-02-131-22/+14
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I5999ee256134fe82ab13f6f06fcd1d0aa150b688 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-141-1/+1
| | | | | | Change-Id: I02eaa709ff91d158a3e34f4e719254f2adce873e Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Fixed git-qtqa-combine test with unset git user.name, user.emailRohan McGovern2012-10-031-0/+9
| | | | | | | | | | If `git commit' is run with no configuration for user.name or user.email, it may abort with an error. Avoid this situation by always setting some fake config when running git from this test. Change-Id: Idfb404a9e7e7070ae9e1bb2811c754a80d245ed1 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-241-24/+24
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I0122cd74f6246a5f20eee2b33ceb328df77a32db Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Added "git-qtqa-combine" for maintaining vendor branchesRohan McGovern2012-05-091-0/+471
This script can take the sources from public git repositories and combine them with sources from other repositories, retaining the content and the git history from all repositories. It is intended to be used for vendor branches of Qt, consisting of the upstream source code merged with a few device-specific files on top (e.g. packaging scripts). Change-Id: I9a1d15c67082e02f7cdee702e39df78fc2c905d9 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
View Lorry Controller Status