From 73dee5fea8170c09cb2b25f80d4287ca1430aff1 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 17 Sep 2020 15:39:55 +0200 Subject: [PATCH] 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 --- src/libs/utils/textfileformat.cpp | 2 ++ 1 file changed, 2 insertions(+) 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; }