summaryrefslogtreecommitdiffstats
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-06-22 01:14:45 +0200
commit587b21cf18bcb689aef58411837ed616b02c952b (patch)
tree61b36391fdfd98410655187fe989f4d0f6eb1b08
parentd0df22b6b234f08aee2e3d99ee0f5b4d32b33868 (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>
-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 00000000..d3be669b
--- /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 cdafd9ed..d964dfe7 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