summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2020-07-09 14:21:46 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-07-10 12:04:51 +0000
commitd4e2c39daedb310c1d2c52d3c4ad3caefba5f243 (patch)
treeafc27c752cba078cd266eee93b3f56498dff4a9a /src/3rdparty
parenta0adcb7bd92f755183446c2ceca4867c4bfb9f95 (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 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit c92528b6cc502a541d5b55daf27c2d78d883d26a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/3rdparty')
-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