From a54294369d8bc7b98ed7d9d8ecf61774eec29782 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 20 Apr 2020 07:29:25 +0200 Subject: [PATCH] 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 --- src/tools/rcc/main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index 0c3290b34b8..be205d47f1e 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);