QProcess: allow merged channels forwarding for detached processes

[ChangeLog][QtCore][QProcess] Added support for QProcess::MergedChannels
mode with startDetached().

Change-Id: I953ad2063322015332269522a297f8e2842e438c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>

2 files changed, 5 insertions, 1 deletions

diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/main.cpp b/tests/auto/corelib/io/qprocess/testForwardingHelper/main.cpp
index 682ca7346b..c902db9410 100644
--- a/tests/auto/corelib/io/qprocess/testForwardingHelper/main.cpp
+++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/main.cpp
@@ -36,8 +36,8 @@ int main(int argc, char *argv[])
         return 1;
     }
     fputs("out data", stdout);
-    fputs("err data", stderr);
     fflush(stdout);
+    fputs("err data", stderr);
     fflush(stderr);
     std::ofstream out(argv[1]);
     out << "That's all folks!";
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index cd0f928094..3c72e9ba8a 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -1125,6 +1125,10 @@ void tst_QProcess::forwardedChannels_data()
             << true
             << int(QProcess::SeparateChannels) << int(QProcess::ManagedInputChannel)
             << QByteArray("out data") << QByteArray("err data");
+    QTest::newRow("detached-merged-forwarding")
+            << true
+            << int(QProcess::MergedChannels) << int(QProcess::ManagedInputChannel)
+            << QByteArray("out data" "err data") << QByteArray();
 }
 
 void tst_QProcess::forwardedChannels()