From f0f142d4c819d6f25e15616e99e5a57e4d6d8e8e Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 7 Feb 2019 13:04:20 +0100 Subject: [PATCH] setReadChannelMode -> setProcessChannelMode setReadChannelMode is obsolete since some time Change-Id: I91567d38d3509c7d1b174da4e6ca160c4b5d8452 Reviewed-by: Eike Ziller --- src/plugins/android/androidavdmanager.cpp | 2 +- src/plugins/git/mergetool.cpp | 2 +- src/plugins/projectexplorer/applicationlauncher.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index 1d9f639588f..128cd8a2817 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -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(&QProcess::finished), avdProcess, diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index f0f03e4ffc2..bc42b240472 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.cpp @@ -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); diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index 61a2fcb3350..3aef28f0903 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -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); }