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

Vcs: Add vcsBinary and vcsTimeout methods to VcsBaseClient

Browse Source 
Change-Id: I966a76ee4c1e5c45ac7332613e90cf511afc584c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-03-25 12:30:07 +01:00
parent 65cd5381d9
commit f44161bb9a
14 changed files with 93 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
}
m_process = new MergeToolProcess(this);
m_process->setWorkingDirectory(workingDirectory);
const Utils::FileName binary = m_gitClient->gitExecutable();
const Utils::FileName binary = m_gitClient->vcsBinary();
VcsOutputWindow::appendCommand(workingDirectory, binary, arguments);
m_process->start(binary.toString(), arguments);
if (m_process->waitForStarted()) {