aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* qmlformat: improve testing of file based optionsFawzi Mohamed2021-11-041-0/+1
| | | | | | | | | | | | | Add an option to run qmlformat from the original file to a copy, thus picking up automatically settings related to those options. This does not in place replacing, but does not need any special setup to run the test. Ensure that git preserves the old macos line endings (CR) in the reference file by renaming it to *_mac_cr.* and change .gitattributes accordingly. Change-Id: Ibd9685613fc737146d67abcae19c67300343aa88 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Merge qtquickcontrols2 into qtdeclarativeMitch Curtis2021-07-281-4/+5
|\ | | | | | | | | Task-number: QTBUG-95173 Change-Id: I2cf31e30127e8cc2f10304cabf4ff7f5050633b8
| * Import the Qt Quick Controls 2 prototypeJ-P Nurmi2015-02-051-0/+4
| | | | | Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Update the git-archive export optionsThiago Macieira2012-09-101-1/+3
| | | | | | | | | | | | | | The .gitattributes and .gitignore files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: I5850800f9706dda342596a9db383e9d2c60e3c3e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix rewrite of multiline string literals.Roberto Raggi2012-02-231-0/+1
| | | | | | | | | | This commits ensures that we don't rewrite `\'-terminated multiline string literals. Also, it fixes the processing of \r characters inside the string literals. Change-Id: If3d7c1b83c7306b9ccb1be31412b6f8e76434c41 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Added .tag file with Git revision.axis2011-05-031-0/+1