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

Vcs: Use a StringAspect again for settings().path()

Browse Source 
This holds a path list, i.e. possibly several directories, separated
by ';' or ':'. PathChooser can't handle that. Long term this could
be something more sophisticate, but for now it's more a "string" than
one FilePath.

Change-Id: I6665c131e698db3afd268d6ab9bcf3d76a7c7289
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-07-26 12:07:11 +02:00
parent 79e839b29f
commit b880525e68
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@ FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const
if (tryResolve) {
resolvedBinPath = binaryPath();
if (!resolvedBinPath.isAbsolutePath())
resolvedBinPath = resolvedBinPath.searchInPath({path()}, FilePath::PrependToPath);
resolvedBinPath = resolvedBinPath.searchInPath(searchPathList(), FilePath::PrependToPath);
tryResolve = false;
}
@@ -169,7 +169,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().toUserOutput(), path().toUserOutput());
.arg(binaryPath().toUserOutput(), path());
}
return resolvedBinPath;
}