diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-09-17 15:39:55 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-09-18 11:31:02 +0000 |
| commit | 73dee5fea8170c09cb2b25f80d4287ca1430aff1 (patch) | |
| tree | 37441795f8c9ca9b1ba5291fa964decf432745a8 /src/libs/utils/textfileformat.cpp | |
| parent | f244a7ea4c1babd6ad24f15004f9878a77f4e34b (diff) | |
Utils: Fix TextFileFormat::readUtf8()
... with regards to line separator conversion.
This fixes two C++ unit test cases on Windows.
Change-Id: I79256a574221ec83076d984b8f353bc4c0e528a9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/utils/textfileformat.cpp')
| -rw-r--r-- | src/libs/utils/textfileformat.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp index 6e7a7536a00..6f117346246 100644 --- a/src/libs/utils/textfileformat.cpp +++ b/src/libs/utils/textfileformat.cpp @@ -289,6 +289,8 @@ TextFileFormat::ReadResult TextFileFormat::readFileUTF8(const QString &fileName, if (format.codec->name() == "UTF-8" || !format.decode(data, &target)) { if (format.hasUtf8Bom) data.remove(0, 3); + if (format.lineTerminationMode == TextFileFormat::CRLFLineTerminator) + data.replace("\r\n", "\n"); *plainText = data; return TextFileFormat::ReadSuccess; } |