feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Support ProcessChannelMode in ProcessLauncherImpl

Browse Source 
Change-Id: Ifb919f19aac8ad223e6beb93c4c14fa4fdb204e9
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-07-12 13:46:31 +02:00
parent 3335a78d5f
commit 2aa533c7dd
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/launcherpackets.cpp
View File

@@ -58,12 +58,12 @@ StartProcessPacket::StartProcessPacket(quintptr token)
void StartProcessPacket::doSerialize(QDataStream &stream) const void StartProcessPacket::doSerialize(QDataStream &stream) const
{ {
stream << command << arguments << workingDir << env; stream << command << arguments << workingDir << env << mode;
} }
void StartProcessPacket::doDeserialize(QDataStream &stream) void StartProcessPacket::doDeserialize(QDataStream &stream)
{ {
stream >> command >> arguments >> workingDir >> env; stream >> command >> arguments >> workingDir >> env >> mode;
} }

1
src/libs/utils/launcherpackets.h
View File

@@ -99,6 +99,7 @@ public:
QStringList arguments; QStringList arguments;
QString workingDir; QString workingDir;
QStringList env; QStringList env;
QProcess::ProcessChannelMode mode = QProcess::SeparateChannels;
private: private:
void doSerialize(QDataStream &stream) const override; void doSerialize(QDataStream &stream) const override;

10
src/libs/utils/qtcprocess.cpp
View File

@@ -302,7 +302,13 @@ public:
void closeWriteChannel() override { QTC_CHECK(false); } void closeWriteChannel() override { QTC_CHECK(false); }
void setStandardInputFile(const QString &fileName) override { QTC_CHECK(false); } void setStandardInputFile(const QString &fileName) override { QTC_CHECK(false); }
void setProcessChannelMode(QProcess::ProcessChannelMode mode) override { QTC_CHECK(false); } void setProcessChannelMode(QProcess::ProcessChannelMode mode) override {
if (mode != QProcess::SeparateChannels && mode != QProcess::MergedChannels) {
qWarning("setProcessChannelMode: The only supported modes are SeparateChannels and MergedChannels.");
return;
}
m_channelMode = mode;
}
qint64 bytesAvailable() const override { QTC_CHECK(false); return 0; } qint64 bytesAvailable() const override { QTC_CHECK(false); return 0; }
QString program() const override { return m_command; } QString program() const override { return m_command; }
@@ -359,6 +365,7 @@ private:
QString m_errorString; QString m_errorString;
QProcess::ProcessError m_error = QProcess::UnknownError; QProcess::ProcessError m_error = QProcess::UnknownError;
QProcess::ProcessState m_state = QProcess::NotRunning; QProcess::ProcessState m_state = QProcess::NotRunning;
QProcess::ProcessChannelMode m_channelMode = QProcess::SeparateChannels;
int m_exitCode = 0; int m_exitCode = 0;
bool m_canceled = false; bool m_canceled = false;
bool m_socketError = false; bool m_socketError = false;
@@ -388,6 +395,7 @@ void ProcessLauncherImpl::doStart()
p.arguments = m_arguments; p.arguments = m_arguments;
p.env = m_environment.toStringList(); p.env = m_environment.toStringList();
p.workingDir = m_workingDirectory; p.workingDir = m_workingDirectory;
p.mode = m_channelMode;
sendPacket(p); sendPacket(p);
} }

1
src/tools/processlauncher/launchersockethandler.cpp
View File

@@ -222,6 +222,7 @@ void LauncherSocketHandler::handleStartPacket()
m_packetParser.packetData()); m_packetParser.packetData());
process->setEnvironment(packet.env); process->setEnvironment(packet.env);
process->setWorkingDirectory(packet.workingDir); process->setWorkingDirectory(packet.workingDir);
process->setProcessChannelMode(packet.mode);
process->start(packet.command, packet.arguments); process->start(packet.command, packet.arguments);
} }