From 5954506d19b0f26129d6dbf7a9dcf925d3b56262 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 10 Apr 2015 16:10:46 +0200 Subject: Vcs: Move vcsSynchronousExec into VcsBaseClientImpl Use it in favor of git's synchronousGit method. Change-Id: I1fc8031cb6d258073b64163aeeeaeac84443fb8c Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/vcsbaseclient.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/vcsbase/vcsbaseclient.cpp') diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index a717fa5f081..6454486980c 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -400,13 +400,13 @@ bool VcsBaseClient::synchronousPush(const QString &workingDir, return resp.result == Utils::SynchronousProcessResponse::Finished; } -Utils::SynchronousProcessResponse VcsBaseClient::vcsSynchronousExec(const QString &workingDirectory, - const QStringList &args, - unsigned flags, - QTextCodec *outputCodec) const +Utils::SynchronousProcessResponse VcsBaseClientImpl::vcsSynchronousExec(const QString &workingDir, + const QStringList &args, + unsigned flags, + QTextCodec *outputCodec) const { - return VcsBasePlugin::runVcs(workingDirectory, vcsBinary(), args, vcsTimeoutS(), flags, - outputCodec); + return VcsBasePlugin::runVcs(workingDir, vcsBinary(), args, vcsTimeoutS(), flags, + outputCodec, processEnvironment()); } void VcsBaseClient::annotate(const QString &workingDir, const QString &file, -- cgit v1.2.3