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

Core: Use QtcProcess instead of SynchronousProcess helpers in PatchTool

Browse Source 
Change-Id: I8acb326579bf4bf201fb94d1b3b0db65eed51a55
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-04 07:37:42 +02:00
parent 03624f9a68
commit 19380100e9
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/coreplugin/patchtool.cpp
View File

@@ -26,11 +26,10 @@
#include "patchtool.h"
#include "messagemanager.h"
#include "icore.h"
#include <utils/synchronousprocess.h>
#include <utils/environment.h>
#include <QProcess>
#include <QProcessEnvironment>
#include <utils/environment.h>
#include <utils/qtcprocess.h>
#include <QDir>
#include <QApplication>
@@ -38,6 +37,8 @@ static const char settingsGroupC[] = "General";
static const char patchCommandKeyC[] = "PatchCommand";
static const char patchCommandDefaultC[] = "patch";
using namespace Utils;
namespace Core {
QString PatchTool::patchCommand()
@@ -79,12 +80,12 @@ static bool runPatchHelper(const QByteArray &input, const QString &workingDirect
return false;
}
QProcess patchProcess;
QtcProcess patchProcess;
if (!workingDirectory.isEmpty())
patchProcess.setWorkingDirectory(workingDirectory);
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
Utils::Environment::setupEnglishOutput(&env);
patchProcess.setProcessEnvironment(env);
Environment env = Environment::systemEnvironment();
Environment::setupEnglishOutput(&env);
patchProcess.setEnvironment(env);
QStringList args;
// Add argument 'apply' when git is used as patch command since git 2.5/Windows
// no longer ships patch.exe.
@@ -103,7 +104,8 @@ static bool runPatchHelper(const QByteArray &input, const QString &workingDirect
.arg(QDir::toNativeSeparators(workingDirectory),
QDir::toNativeSeparators(patch),
args.join(QLatin1Char(' '))));
patchProcess.start(patch, args);
patchProcess.setCommand({patch, args});
patchProcess.start();
if (!patchProcess.waitForStarted()) {
MessageManager::writeFlashing(
QApplication::translate("Core::PatchTool", "Unable to launch \"%1\": %2")
@@ -114,8 +116,8 @@ static bool runPatchHelper(const QByteArray &input, const QString &workingDirect
patchProcess.closeWriteChannel();
QByteArray stdOut;
QByteArray stdErr;
if (!Utils::SynchronousProcess::readDataFromProcess(patchProcess, 30, &stdOut, &stdErr, true)) {
Utils::SynchronousProcess::stopProcess(patchProcess);
if (!patchProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) {
patchProcess.stopProcess();
MessageManager::writeFlashing(
QApplication::translate("Core::PatchTool", "A timeout occurred running \"%1\"")
.arg(patch));