diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-09-03 21:52:22 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 21:17:39 +0200 |
| commit | fba0a307914772b286e8f315e0d1dec5ce7935f8 (patch) | |
| tree | 10908de0f4da40445ff5db2072a7e7ccc532a0ef /src/corelib/io/qprocess_win.cpp | |
| parent | dd9d6b3d5b21281707440db4413707e1d818889e (diff) | |
add QProcess::Forwarded{Output,Error}Channel
Change-Id: Ifc5ed20c38f3228ef25c28681f296d0456b61abe
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/io/qprocess_win.cpp')
| -rw-r--r-- | src/corelib/io/qprocess_win.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index 880cbf659d..f545386f56 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -160,7 +160,8 @@ bool QProcessPrivate::createChannel(Channel &channel) } else { QWindowsPipeReader *pipeReader = 0; if (&channel == &stdoutChannel) { - if (processChannelMode != QProcess::ForwardedChannels) { + if (processChannelMode != QProcess::ForwardedChannels + && processChannelMode != QProcess::ForwardedOutputChannel) { if (!stdoutReader) { stdoutReader = new QWindowsPipeReader(q); q->connect(stdoutReader, SIGNAL(readyRead()), SLOT(_q_canReadStandardOutput())); @@ -170,7 +171,8 @@ bool QProcessPrivate::createChannel(Channel &channel) duplicateStdWriteChannel(channel.pipe, STD_OUTPUT_HANDLE); } } else /* if (&channel == &stderrChannel) */ { - if (processChannelMode != QProcess::ForwardedChannels) { + if (processChannelMode != QProcess::ForwardedChannels + && processChannelMode != QProcess::ForwardedErrorChannel) { if (!stderrReader) { stderrReader = new QWindowsPipeReader(q); q->connect(stderrReader, SIGNAL(readyRead()), SLOT(_q_canReadStandardError())); |