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

Vcs: Use a FilePathAspect for VcsBaseSettings::path

Browse Source 
Change-Id: Ic92ef43514f7f4004774ebbd9bb49c026dc735ba
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2023-06-29 16:27:46 +02:00
parent 32dc43693f
commit b98a08587e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitsettings.cpp
View File

@@ -161,7 +161,7 @@ FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const
if (tryResolve) {
resolvedBinPath = binaryPath();
if (!resolvedBinPath.isAbsolutePath())
resolvedBinPath = resolvedBinPath.searchInPath({path.filePath()}, FilePath::PrependToPath);
resolvedBinPath = resolvedBinPath.searchInPath({path()}, FilePath::PrependToPath);
tryResolve = false;
}
@@ -170,7 +170,7 @@ FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const
*ok = false;
if (errorMessage)
*errorMessage = Tr::tr("The binary \"%1\" could not be located in the path \"%2\"")
.arg(binaryPath.value(), path.value());
.arg(binaryPath.value(), path().toUserOutput());
}
return resolvedBinPath;
}