Use QtcProcess in MergeTool

Change-Id: I9d08c455404a75a29874883dbdc4855a183a58e3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2021-11-02 18:03:46 +01:00
parent 4d4abc8578
commit 50586c7bb8
4 changed files with 75 additions and 75 deletions

View File

@@ -1971,9 +1971,9 @@ void GitPlugin::emitFilesChanged(const QStringList &l)
emit dd->filesChanged(l);
}
void GitPlugin::emitRepositoryChanged(const QString &r)
void GitPlugin::emitRepositoryChanged(const FilePath &r)
{
emit dd->repositoryChanged(FilePath::fromString(r));
emit dd->repositoryChanged(r);
}
void GitPlugin::startRebaseFromCommit(const FilePath &workingDirectory, const QString &commit)