whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QProcess: allow pipelining for detached processes 

[ChangeLog][QtCore][QProcess] Added support for
setStandardOutputProcess() with startDetached().

Change-Id: I61278cdb7084127f583c8c017688da392017b44c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
bb10
Alex Trotsenko 2020-12-30 20:03:43 +02:00 committed by Oswald Buddenhagen
parent 04c34eb799
commit e334d6f9a7
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/io/qprocess.cpp
View File

@ -982,33 +982,38 @@ bool QProcessPrivate::openChannels()
bool QProcessPrivate::openChannelsForDetached()
{
// stdin channel.
bool needToOpen = (stdinChannel.type == Channel::Redirect
|| stdinChannel.type == Channel::PipeSink);
if (stdinChannel.type != Channel::Normal
&& (stdinChannel.type != Channel::Redirect
&& (!needToOpen
|| inputChannelMode == QProcess::ForwardedInputChannel)) {
qWarning("QProcess::openChannelsForDetached: Inconsistent stdin channel configuration");
}
if (stdinChannel.type == Channel::Redirect && !openChannel(stdinChannel))
if (needToOpen && !openChannel(stdinChannel))
return false;
// stdout channel.
needToOpen = (stdoutChannel.type == Channel::Redirect
|| stdoutChannel.type == Channel::PipeSource);
if (stdoutChannel.type != Channel::Normal
&& (stdoutChannel.type != Channel::Redirect
&& (!needToOpen
|| processChannelMode == QProcess::ForwardedChannels
|| processChannelMode == QProcess::ForwardedOutputChannel)) {
qWarning("QProcess::openChannelsForDetached: Inconsistent stdout channel configuration");
}
if (stdoutChannel.type == Channel::Redirect && !openChannel(stdoutChannel))
if (needToOpen && !openChannel(stdoutChannel))
return false;
// stderr channel.
needToOpen = (stderrChannel.type == Channel::Redirect);
if (stderrChannel.type != Channel::Normal
&& (stderrChannel.type != Channel::Redirect
&& (!needToOpen
|| processChannelMode == QProcess::ForwardedChannels
|| processChannelMode == QProcess::ForwardedErrorChannel
|| processChannelMode == QProcess::MergedChannels)) {
qWarning("QProcess::openChannelsForDetached: Inconsistent stderr channel configuration");
}
if (stderrChannel.type == Channel::Redirect && !openChannel(stderrChannel))
if (needToOpen && !openChannel(stderrChannel))
return false;
return true;
@ -2175,6 +2180,7 @@ void QProcess::startCommand(const QString &command, OpenMode mode)
\li setStandardInputFile()
\li setStandardOutputFile()
\li setProcessChannelMode(QProcess::MergedChannels)
\li setStandardOutputProcess()
\li setWorkingDirectory()
\endlist
All other properties of the QProcess object are ignored.

6
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
View File

@ -2030,14 +2030,18 @@ void tst_QProcess::setStandardOutputProcess_data()
void tst_QProcess::setStandardOutputProcess()
{
QProcess source;
QProcess intermediate;
QProcess sink;
QFETCH(bool, merged);
QFETCH(bool, waitForBytesWritten);
source.setProcessChannelMode(merged ? QProcess::MergedChannels : QProcess::SeparateChannels);
source.setStandardOutputProcess(&sink);
source.setStandardOutputProcess(&intermediate);
intermediate.setStandardOutputProcess(&sink);
source.start("testProcessEcho2/testProcessEcho2");
intermediate.setProgram("testProcessEcho/testProcessEcho");
QVERIFY(intermediate.startDetached());
sink.start("testProcessEcho2/testProcessEcho2");
QByteArray data("Hello, World");