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

Utils: Move writeData handling to QtcProcess::start()

Browse Source 
So that this doesn't only apply to runBlocking()

Change-Id: I6ef7c72e13a5e214c7476ede942662a9893c843c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-07-16 10:59:45 +02:00
parent 41355d7cd7
commit 7aef03134d
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,7 +317,14 @@ void QtcProcess::start()
{ {
d->clearForRun(); d->clearForRun();
QTC_CHECK(d->m_writeData.isEmpty()); // FIXME: Use it. if (!d->m_writeData.isEmpty()) {
connect(d->m_process, &QProcess::started, this, [this] {
const qint64 bytesWritten = write(d->m_writeData);
QTC_CHECK(bytesWritten == d->m_writeData.size());
d->m_process->waitForBytesWritten();
closeWriteChannel(); // FIXME: Is this good?
});
}
if (d->m_commandLine.executable().needsDevice()) { if (d->m_commandLine.executable().needsDevice()) {
QTC_ASSERT(s_deviceHooks.startProcessHook, return); QTC_ASSERT(s_deviceHooks.startProcessHook, return);
@@ -997,11 +1004,9 @@ static bool isGuiThread()
void QtcProcess::runBlocking() void QtcProcess::runBlocking()
{ {
// FIXME: Implement properly // FIXME: Implement properly
if (d->m_commandLine.executable().needsDevice()) { if (d->m_commandLine.executable().needsDevice()) {
// writeData ?
QtcProcess::start(); QtcProcess::start();
waitForFinished(); waitForFinished();
return; return;
}; };
@@ -1011,12 +1016,6 @@ void QtcProcess::runBlocking()
ExecuteOnDestruction logResult([this] { qCDebug(processLog) << *this; }); ExecuteOnDestruction logResult([this] { qCDebug(processLog) << *this; });
if (d->m_processUserEvents) { if (d->m_processUserEvents) {
if (!d->m_writeData.isEmpty()) {
connect(d->m_process, &QProcess::started, this, [this] {
write(d->m_writeData);
closeWriteChannel();
});
}
setOpenMode(d->m_writeData.isEmpty() ? QIODevice::ReadOnly : QIODevice::ReadWrite); setOpenMode(d->m_writeData.isEmpty() ? QIODevice::ReadOnly : QIODevice::ReadWrite);
QtcProcess::start(); QtcProcess::start();