diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-02 00:00:35 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-03-02 00:00:35 +0000 |
| commit | afe2a796894863f6d43196f07ca2cd64e1a3d078 (patch) | |
| tree | 9e83744cc213fd84ba8f5e2e7b9007b08e40325c /tests/auto/network/socket/qlocalsocket | |
| parent | aa1bc47942e2062dc7fad3e139bb4ceecc74f947 (diff) | |
| parent | 6cf3428a43c5744096db0c849aa975c4cb06bd31 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/network/socket/qlocalsocket')
| -rw-r--r-- | tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 0d538865a3..9a821deefe 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -969,12 +969,14 @@ void tst_QLocalSocket::processConnection() QProcess producer; ProcessOutputDumper producerOutputDumper(&producer); QList<QProcess*> consumers; + producer.setProcessChannelMode(QProcess::MergedChannels); producer.start(socketProcess, serverArguments); QVERIFY2(producer.waitForStarted(-1), qPrintable(producer.errorString())); for (int i = 0; i < processes; ++i) { QStringList arguments = QStringList() << "--client"; QProcess *p = new QProcess; consumers.append(p); + p->setProcessChannelMode(QProcess::MergedChannels); p->start(socketProcess, arguments); } |