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

Merge remote-tracking branch 'origin/5.0' into 6.0

Browse Source 
Change-Id: I1244ca0b6193d00ded38e5d4c12b605f4e96fdae
This commit is contained in:
Eike Ziller
2021-09-30 09:00:11 +02:00
parent 525039daeb 67c0104b8e
commit 6ba849ee6e
20 changed files with 400 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -983,7 +983,7 @@ void GitClient::requestReload(const QString &documentId, const QString &source,
QTC_ASSERT(document, return);
GitBaseDiffEditorController *controller = factory(document);
QTC_ASSERT(controller, return);
controller->setVcsBinary(settings().binaryPath.filePath());
controller->setVcsBinary(settings().gitExecutable());
controller->setVcsTimeoutS(settings().timeout.value());
controller->setProcessEnvironment(processEnvironment());
controller->setWorkingDirectory(workingDirectory);