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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Change-Id: I074571dac56b26a8a1449c29aef53b9052d8e304
This commit is contained in:
hjk
2021-07-22 14:53:39 +02:00
parent 1275a12582 a0da3ce69f
commit 09286d062f
31 changed files with 2335 additions and 1767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -554,7 +554,13 @@ void QtcProcess::start()
{
d->clearForRun();
QTC_CHECK(d->m_writeData.isEmpty()); // FIXME: Use it.
if (!d->m_writeData.isEmpty()) {
connect(d->m_process, &ProcessInterface::started, this, [this] {
const qint64 bytesWritten = write(d->m_writeData);
QTC_CHECK(bytesWritten == d->m_writeData.size());
closeWriteChannel(); // FIXME: Is this good?
});
}
if (d->m_commandLine.executable().needsDevice()) {
QTC_ASSERT(s_deviceHooks.startProcessHook, return);
@@ -1219,6 +1225,7 @@ void QtcProcess::setExitCodeInterpreter(const ExitCodeInterpreter &interpreter)
void QtcProcess::setWriteData(const QByteArray &writeData)
{
d->m_writeData = writeData;
setKeepWriteChannelOpen();
}
#ifdef QT_GUI_LIB
@@ -1231,11 +1238,9 @@ static bool isGuiThread()
void QtcProcess::runBlocking()
{
// FIXME: Implement properly
if (d->m_commandLine.executable().needsDevice()) {
// writeData ?
QtcProcess::start();
waitForFinished();
return;
};