summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
authorGlenn Watson <glenn.watson@nokia.com>2012-06-22 08:53:13 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-16 10:05:31 +0200
commitd68001808593fc9a89cfad05bae69ec83f431286 (patch)
tree72cb8d661cbc228787ea20a0dbc45ccd8bd7de3e /tests/auto/declarative
parent8de28b65bd18bea49fa57682d7ec3c3cd3cc4e7a (diff)
Fix error test on Windows.
Add missing .gitattributes file to ensure the test data file is checked out with LF line endings on Windows. Change-Id: I9ece655dbc8657d6e70c58ce1ada06ee021c92ad Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> (cherry picked from commit 587b21cf18bcb689aef58411837ed616b02c952b)
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/qdeclarativeerror/.gitattributes1
-rw-r--r--tests/auto/declarative/qdeclarativeerror/test.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeerror/.gitattributes b/tests/auto/declarative/qdeclarativeerror/.gitattributes
new file mode 100644
index 0000000000..d3be669b6d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeerror/.gitattributes
@@ -0,0 +1 @@
+test.txt eol=lf
diff --git a/tests/auto/declarative/qdeclarativeerror/test.txt b/tests/auto/declarative/qdeclarativeerror/test.txt
index cdafd9ed82..d964dfe787 100644
--- a/tests/auto/declarative/qdeclarativeerror/test.txt
+++ b/tests/auto/declarative/qdeclarativeerror/test.txt
@@ -1,3 +1,3 @@
-Line Content
+Line1 Content
Line2 Content
Line3 Content