Merge remote-tracking branch 'origin/10.0'

Change-Id: I02df4ad5e4a074f572cd6dd33551864e7c82f51c

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;
 }