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

Implement setStandardInputFile() in ProcessLauncherImpl

Browse Source 
Change-Id: I4d77c86ecb750573ce5421ca7300eb27f9f76108
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-07-12 15:11:30 +02:00
parent d005e71da0
commit 17f907da9b
6 changed files with 8 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 << openMode << channelMode; stream << command << arguments << workingDir << env << openMode << channelMode << standardInputFile;
} }
void StartProcessPacket::doDeserialize(QDataStream &stream) void StartProcessPacket::doDeserialize(QDataStream &stream)
{ {
stream >> command >> arguments >> workingDir >> env >> openMode >> channelMode; stream >> command >> arguments >> workingDir >> env >> openMode >> channelMode >> standardInputFile;
} }

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

@@ -101,6 +101,7 @@ public:
QStringList env; QStringList env;
QIODevice::OpenMode openMode = QIODevice::ReadWrite; QIODevice::OpenMode openMode = QIODevice::ReadWrite;
QProcess::ProcessChannelMode channelMode = QProcess::SeparateChannels; QProcess::ProcessChannelMode channelMode = QProcess::SeparateChannels;
QString standardInputFile;
private: private:
void doSerialize(QDataStream &stream) const override; void doSerialize(QDataStream &stream) const override;

1
src/libs/utils/launchersocket.cpp
View File

@@ -326,6 +326,7 @@ void LauncherHandle::doStart()
p.workingDir = m_workingDirectory; p.workingDir = m_workingDirectory;
p.openMode = m_openMode; p.openMode = m_openMode;
p.channelMode = m_channelMode; p.channelMode = m_channelMode;
p.standardInputFile = m_standardInputFile;
sendPacket(p); sendPacket(p);
} }

2
src/libs/utils/launchersocket.h
View File

@@ -90,6 +90,7 @@ public:
QProcess::ProcessError error() const { QMutexLocker locker(&m_mutex); return m_error; } QProcess::ProcessError error() const { QMutexLocker locker(&m_mutex); return m_error; }
QString program() const { QMutexLocker locker(&m_mutex); return m_command; } QString program() const { QMutexLocker locker(&m_mutex); return m_command; }
void setStandardInputFile(const QString &fileName) { QMutexLocker locker(&m_mutex); m_standardInputFile = fileName; }
void setProcessChannelMode(QProcess::ProcessChannelMode mode) { void setProcessChannelMode(QProcess::ProcessChannelMode mode) {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
if (mode != QProcess::SeparateChannels && mode != QProcess::MergedChannels) { if (mode != QProcess::SeparateChannels && mode != QProcess::MergedChannels) {
@@ -175,6 +176,7 @@ private:
QString m_workingDirectory; QString m_workingDirectory;
QIODevice::OpenMode m_openMode = QIODevice::ReadWrite; QIODevice::OpenMode m_openMode = QIODevice::ReadWrite;
QProcess::ProcessChannelMode m_channelMode = QProcess::SeparateChannels; QProcess::ProcessChannelMode m_channelMode = QProcess::SeparateChannels;
QString m_standardInputFile;
CallerHandle *m_callerHandle = nullptr; CallerHandle *m_callerHandle = nullptr;

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

@@ -313,7 +313,7 @@ public:
qint64 write(const QByteArray &data) override { QTC_CHECK(false); return -1; } qint64 write(const QByteArray &data) override { QTC_CHECK(false); return -1; }
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 { m_handle->setStandardInputFile(fileName); }
void setProcessChannelMode(QProcess::ProcessChannelMode mode) override { m_handle->setProcessChannelMode(mode); } void setProcessChannelMode(QProcess::ProcessChannelMode mode) override { m_handle->setProcessChannelMode(mode); }
qint64 bytesAvailable() const override { QTC_CHECK(false); return 0; } qint64 bytesAvailable() const override { QTC_CHECK(false); return 0; }

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

@@ -231,6 +231,7 @@ void LauncherSocketHandler::handleStartPacket()
process->setEnvironment(packet.env); process->setEnvironment(packet.env);
process->setWorkingDirectory(packet.workingDir); process->setWorkingDirectory(packet.workingDir);
process->setProcessChannelMode(packet.channelMode); process->setProcessChannelMode(packet.channelMode);
process->setStandardInputFile(packet.standardInputFile);
process->start(packet.command, packet.arguments, packet.openMode); process->start(packet.command, packet.arguments, packet.openMode);
process->closeWriteChannel(); process->closeWriteChannel();
} }