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 
Conflicts:
	src/libs/utils/qtcprocess.cpp

Change-Id: I1f7419d927e8534dfdcd10db998f97a6efd4d3e4
This commit is contained in:
Eike Ziller
2021-08-18 09:48:39 +02:00
parent 20a4afaaa4 773d0fdcc5
commit 6d44c28f0a
41 changed files with 322 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1256,7 +1256,6 @@ void QtcProcess::setStdOutCallback(const std::function<void (const QString &)> &
{
d->m_stdOut.outputCallback = callback;
d->m_stdOut.emitSingleLines = false;
d->m_stdOut.keepRawData = false;
}
void QtcProcess::setStdOutLineCallback(const std::function<void (const QString &)> &callback)
@@ -1270,7 +1269,6 @@ void QtcProcess::setStdErrCallback(const std::function<void (const QString &)> &
{
d->m_stdErr.outputCallback = callback;
d->m_stdErr.emitSingleLines = false;
d->m_stdErr.keepRawData = false;
}
void QtcProcess::setStdErrLineCallback(const std::function<void (const QString &)> &callback)