Commit Graph

6 Commits

Author SHA1 Message Date
Fawzi Mohamed 26e5200400 qmlformat: improve testing of file based options
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>
2021-11-04 13:35:48 +01:00
Mitch Curtis 16436239cd Merge qtquickcontrols2 into qtdeclarative
Task-number: QTBUG-95173
Change-Id: I2cf31e30127e8cc2f10304cabf4ff7f5050633b8
2021-07-28 11:21:25 +02:00
J-P Nurmi 8b2a1ec431 Import the Qt Quick Controls 2 prototype
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
2015-02-05 14:50:29 +02:00
Thiago Macieira ca30abfdf7 Update the git-archive export options
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>
2012-09-10 14:24:05 +02:00
Roberto Raggi 212204b4ff Fix rewrite of multiline string literals.
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>
2012-02-23 10:43:44 +01:00
axis dbbcc4dff0 Added .tag file with Git revision. 2011-05-03 16:23:50 +02:00