diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-01-17 19:15:23 +0000 |
|---|---|---|
| committer | Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com> | 2012-01-20 14:16:01 +0100 |
| commit | 943dc8e4a58a32a5b5a14c456d60bd3601e42618 (patch) | |
| tree | 81c54dea638a4ed471b526d5c6088edced2636d4 | |
| parent | d12761a3a5490c986d05eb0670a293baba3acc80 (diff) | |
| download | qt4-tools-943dc8e4a58a32a5b5a14c456d60bd3601e42618.tar.gz | |
Fix QAbstractFileEngine autotest failure on windows/symbian
File size does not match when CRLF translation occurs.
Added .gitattributes file to fix this.
Change-Id: I86ab538d17534b51177486ef1c4626ec52f55c5b
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
(cherry picked from commit 4e7b29b6f4175c70e1aefad8216e80aae70f9099)
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
| -rw-r--r-- | tests/auto/qabstractfileengine/qabstractfileengine.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qabstractfileengine/resources/.gitattributes | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qabstractfileengine/qabstractfileengine.pro b/tests/auto/qabstractfileengine/qabstractfileengine.pro index cdfba9c5fc..e7e7acde39 100644 --- a/tests/auto/qabstractfileengine/qabstractfileengine.pro +++ b/tests/auto/qabstractfileengine/qabstractfileengine.pro @@ -4,5 +4,3 @@ QT = core testlib SOURCES = tst_qabstractfileengine.cpp RESOURCES += qabstractfileengine.qrc - -CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qabstractfileengine/resources/.gitattributes b/tests/auto/qabstractfileengine/resources/.gitattributes new file mode 100644 index 0000000000..af8bf9f5ae --- /dev/null +++ b/tests/auto/qabstractfileengine/resources/.gitattributes @@ -0,0 +1 @@ +file.txt -crlf
\ No newline at end of file |