diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-20 07:29:25 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-20 20:25:32 +0200 |
commit | a54294369d8bc7b98ed7d9d8ecf61774eec29782 (patch) | |
tree | 8750562208b442f1a4ba2b537170fa3d201281a2 /src/tools/rcc/main.cpp | |
parent | dc4e5af752810d4f02b0485ecef2f1247b22beaa (diff) |
rcc: Fix line endings on Windows when redirected
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>
Diffstat (limited to 'src/tools/rcc/main.cpp')
-rw-r--r-- | src/tools/rcc/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index 0c3290b34b..be205d47f1 100644 --- a/src/tools/rcc/main.cpp +++ b/src/tools/rcc/main.cpp @@ -357,8 +357,7 @@ int runRcc(int argc, char *argv[]) // Make sure QIODevice does not do LF->CRLF, // otherwise we'll end up in CRCRLF instead of // CRLF. - if (list) - mode &= ~QIODevice::Text; + mode &= ~QIODevice::Text; #endif // Q_OS_WIN // using this overload close() only flushes. out.open(stdout, mode); |