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

Utils: Replace FilePath part setters

Browse Source 
... by a combined version. This will make it easier to store the parts
in one QString object.

Change-Id: Ie85a77e3957c78a30e49998fe2e617af35a8ad17
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-08-04 15:00:24 +02:00
parent 7a3f95a144
commit 7cfc3d26bc
18 changed files with 60 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/macroexpander.cpp
View File

@@ -271,11 +271,10 @@ QString MacroExpander::expand(const QString &stringWithVariables) const
FilePath MacroExpander::expand(const FilePath &fileNameWithVariables) const
{
FilePath result = fileNameWithVariables;
result.setPath(expand(result.path()));
result.setHost(expand(result.host().toString()));
result.setScheme(expand(result.scheme().toString()));
return result;
return FilePath::fromParts(
expand(fileNameWithVariables.scheme().toString()),
expand(fileNameWithVariables.host().toString()),
expand(fileNameWithVariables.path()));
}
QByteArray MacroExpander::expand(const QByteArray &stringWithVariables) const