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

Merge remote-tracking branch 'origin/4.7' into 4.8

Browse Source 
Change-Id: Iaae859601ae4f529c1fa7ada3a5c569820abb0d6
This commit is contained in:
Eike Ziller
2018-09-26 09:38:33 +02:00
parent 18ffdbb12e 8768e39d3c
commit e28eb85e8a
8 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
View File

@@ -244,13 +244,19 @@ void SshDeviceProcess::handleProcessFinished(int exitStatus)
void SshDeviceProcess::handleStdout()
{
d->stdOut += d->process->readAllStandardOutput();
QByteArray output = d->process->readAllStandardOutput();
if (output.isEmpty())
return;
d->stdOut += output;
emit readyReadStandardOutput();
}
void SshDeviceProcess::handleStderr()
{
d->stdErr += d->process->readAllStandardError();
QByteArray output = d->process->readAllStandardError();
if (output.isEmpty())
return;
d->stdErr += output;
emit readyReadStandardError();
}