1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rcc: Fix line endings on Windows when redirected

Browse Source 
Extend the fix 53d5811b0c432b845e453dfbef3f4237a1a71877
to work for the file generation mode as well.

Pick-to: 5.15
Fixes: PYSIDE-1273
Change-Id: I5a91e2de87b44658f276cea87cbd730452b1bd78
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Friedemann Kleint 2020-04-20 07:29:25 +02:00
parent dc4e5af752
commit a54294369d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/rcc/main.cpp
View File

@ -357,8 +357,7 @@ int runRcc(int argc, char *argv[])
// Make sure QIODevice does not do LF->CRLF, // Make sure QIODevice does not do LF->CRLF,
// otherwise we'll end up in CRCRLF instead of // otherwise we'll end up in CRCRLF instead of
// CRLF. // CRLF.
if (list) mode &= ~QIODevice::Text;
mode &= ~QIODevice::Text;
#endif // Q_OS_WIN #endif // Q_OS_WIN
// using this overload close() only flushes. // using this overload close() only flushes.
out.open(stdout, mode); out.open(stdout, mode);