forked from qt-creator/qt-creator
qml2puppet: restore the puppet output feature
Change-Id: I9cbd8cd5256c9471e2a20369064a22f1997a4c02 Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -35,7 +35,7 @@ QProcessUniquePointer puppetProcess(const QString &puppetPath,
|
||||
processFinishCallback);
|
||||
|
||||
if (forwardOutput == puppetMode || forwardOutput == "all") {
|
||||
puppetProcess->setProcessChannelMode(QProcess::ForwardedChannels);
|
||||
puppetProcess->setProcessChannelMode(QProcess::MergedChannels);
|
||||
QObject::connect(puppetProcess.get(), &QProcess::readyRead, processOutputCallback);
|
||||
}
|
||||
puppetProcess->setWorkingDirectory(workingDirectory);
|
||||
|
||||
Reference in New Issue
Block a user