From 2e384d9c125864b6893464e445041591dd56d9aa Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Mon, 24 Apr 2023 16:31:22 +0200
Subject: [PATCH] Utils: Fix line ending conversion in FileReader

FilePath::fileContents always uses "binary" mode when reading files.

FileReader::fetch previously used QFile with QIODevice::Text mode to
read (local) files, which converts \r\n to \n. This patch re-introduces
the conversion.

Fixes: QTCREATORBUG-29040
Change-Id: I0a16b056bea456512e6526497b725c73b0a1bd11
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/libs/utils/fileutils.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index 69c31729149..1f6d89c43ae 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -62,6 +62,10 @@ bool FileReader::fetch(const FilePath &filePath, QIODevice::OpenMode mode)
         return false;
     }
     m_data = *contents;
+
+    if (mode & QIODevice::Text)
+        m_data = m_data.replace("\r\n", "\n");
+
     return true;
 }