diff options
| author | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2023-04-24 16:31:22 +0200 |
|---|---|---|
| committer | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2023-04-25 08:35:46 +0000 |
| commit | 2e384d9c125864b6893464e445041591dd56d9aa (patch) | |
| tree | 37467cd48f1d7d9e87df277f2b6e79e1e4fd2387 /src/libs/utils/fileutils.cpp | |
| parent | 05f80a132d38c34c747108192858b136870be789 (diff) | |
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>
Diffstat (limited to 'src/libs/utils/fileutils.cpp')
| -rw-r--r-- | src/libs/utils/fileutils.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index 69c3172914..1f6d89c43a 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; } |