diff options
author | Eike Ziller <eike.ziller@qt.io> | 2023-04-26 11:07:54 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2023-04-26 11:07:54 +0200 |
commit | fd93ad897f00db5b553ee89d928815ad5a5d4098 (patch) | |
tree | 88aca4a650b21016e25abd9eddd714f3dc0c110a /src/libs/utils/fileutils.cpp | |
parent | 8903e7f387e1c96a51f13ab66d3a247bfcbf398d (diff) | |
parent | fa5c352668b497e626fe74c50e33250404d06960 (diff) |
Merge remote-tracking branch 'origin/10.0'
Change-Id: I02df4ad5e4a074f572cd6dd33551864e7c82f51c
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 22d855fea3..98d190e296 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; } |