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

setReadChannelMode -> setProcessChannelMode

Browse Source 
setReadChannelMode is obsolete since some time

Change-Id: I91567d38d3509c7d1b174da4e6ca160c4b5d8452
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tim Jenssen
2019-02-07 13:04:20 +01:00
parent 9faa60451d
commit f0f142d4c8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidavdmanager.cpp
View File

@@ -294,7 +294,7 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
return false;
}
auto avdProcess = new QProcess();
avdProcess->setReadChannelMode(QProcess::MergedChannels);
avdProcess->setProcessChannelMode(QProcess::MergedChannels);
QObject::connect(avdProcess,
static_cast<void (QProcess::*)(int)>(&QProcess::finished),
avdProcess,

2
src/plugins/git/mergetool.cpp
View File

@@ -60,7 +60,7 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
m_process = new QProcess(this);
m_process->setWorkingDirectory(workingDirectory);
m_process->setProcessEnvironment(env);
m_process->setReadChannelMode(QProcess::MergedChannels);
m_process->setProcessChannelMode(QProcess::MergedChannels);
const Utils::FileName binary = GitPlugin::client()->vcsBinary();
VcsOutputWindow::appendCommand(workingDirectory, binary, arguments);
m_process->start(binary.toString(), arguments);

4
src/plugins/projectexplorer/applicationlauncher.cpp
View File

@@ -127,9 +127,9 @@ ApplicationLauncherPrivate::ApplicationLauncherPrivate(ApplicationLauncher *pare
: q(parent), m_outputCodec(QTextCodec::codecForLocale())
{
if (ProjectExplorerPlugin::projectExplorerSettings().mergeStdErrAndStdOut){
m_guiProcess.setReadChannelMode(QProcess::MergedChannels);
m_guiProcess.setProcessChannelMode(QProcess::MergedChannels);
} else {
m_guiProcess.setReadChannelMode(QProcess::SeparateChannels);
m_guiProcess.setProcessChannelMode(QProcess::SeparateChannels);
connect(&m_guiProcess, &QProcess::readyReadStandardError,
this, &ApplicationLauncherPrivate::readLocalStandardError);
}