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

Utils: Simplify and extend MacroExpander::expand(FilePath)

Browse Source 
At least for the host it is imaginable that variables might be useful.

Change-Id: Ia8aeeef49c195db3877256c6726a832ec966c420
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-05-31 16:55:52 +02:00
parent 615b37193b
commit 1fb73905c1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,12 +293,11 @@ QString MacroExpander::expand(const QString &stringWithVariables) const
FilePath MacroExpander::expand(const FilePath &fileNameWithVariables) const FilePath MacroExpander::expand(const FilePath &fileNameWithVariables) const
{ {
if (fileNameWithVariables.needsDevice()) { FilePath result = fileNameWithVariables;
QUrl url = fileNameWithVariables.toUrl(); result.setPath(expand(result.path()));
url.setPath(expand(url.path())); result.setHost(expand(result.host()));
return FilePath::fromUrl(url); result.setScheme(expand(result.scheme()));
} return result;
return FilePath::fromString(expand(fileNameWithVariables.toString()));
} }
QByteArray MacroExpander::expand(const QByteArray &stringWithVariables) const QByteArray MacroExpander::expand(const QByteArray &stringWithVariables) const