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

Core: Use FilePaths in IVersionControl::additionalToolsPath()

Browse Source 
Change-Id: I3c7d03b8695152f0830e809ce7a0709f48d8178b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-11-10 16:28:53 +01:00
parent aac740f127
commit 0781379345
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/gitplugin.cpp
View File

@@ -283,7 +283,7 @@ public:
RepoUrl getRepoUrl(const QString &location) const override;
QStringList additionalToolsPath() const final;
Utils::FilePaths additionalToolsPath() const final;
bool isCommitEditorOpen() const;
void startCommit(CommitType commitType = SimpleCommit);
@@ -1934,10 +1934,10 @@ GitPluginPrivate::RepoUrl GitPluginPrivate::getRepoUrl(const QString &location)
return GitRemote(location);
}
QStringList GitPluginPrivate::additionalToolsPath() const
FilePaths GitPluginPrivate::additionalToolsPath() const
{
QStringList res = m_gitClient.settings().searchPathList();
const QString binaryPath = m_gitClient.gitBinDirectory().toString();
FilePaths res = m_gitClient.settings().searchPathList();
const FilePath binaryPath = m_gitClient.gitBinDirectory();
if (!binaryPath.isEmpty() && !res.contains(binaryPath))
res << binaryPath;
return res;