summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/.gitattributes
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2020-07-09 14:21:46 +0200
committerAndy Shaw <andy.shaw@qt.io>2020-07-10 11:38:00 +0200
commitc92528b6cc502a541d5b55daf27c2d78d883d26a (patch)
tree33aeacc65b1388ecff05eff07c5a2d27e2739ac6 /src/3rdparty/.gitattributes
parentacc3f19038f8ab86fbcf512f54af23b5ae0f1809 (diff)
Mark gradlew with Unix eol endings as it is a script
Since this could end up being copied from a Windows machine to another when it is part of a project using Android then we should make sure the line endings are preserved to be on the safe side. This avoids a strange problem when deploying due to gradle failing to run. Change-Id: Ie170461a351c9279092b58d4e8353b81cc8561d3 Pick-to: 5.15 5.12 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/3rdparty/.gitattributes')
-rw-r--r--src/3rdparty/.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/.gitattributes b/src/3rdparty/.gitattributes
index c0f08ed4d7..ba613186e9 100644
--- a/src/3rdparty/.gitattributes
+++ b/src/3rdparty/.gitattributes
@@ -1,3 +1,4 @@
+gradle/gradlew eol=lf
libpng/projects/cbuilder5/libpng.bpf -crlf
libpng/projects/cbuilder5/libpng.bpg -crlf
libpng/projects/cbuilder5/libpng.bpr -crlf