From 1fb73905c15a5dea64b10ec92c8dada029317cb6 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 31 May 2021 16:55:52 +0200 Subject: [PATCH] Utils: Simplify and extend MacroExpander::expand(FilePath) At least for the host it is imaginable that variables might be useful. Change-Id: Ia8aeeef49c195db3877256c6726a832ec966c420 Reviewed-by: David Schulz --- src/libs/utils/macroexpander.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp index ddf74bff316..50861f5a973 100644 --- a/src/libs/utils/macroexpander.cpp +++ b/src/libs/utils/macroexpander.cpp @@ -293,12 +293,11 @@ QString MacroExpander::expand(const QString &stringWithVariables) const FilePath MacroExpander::expand(const FilePath &fileNameWithVariables) const { - if (fileNameWithVariables.needsDevice()) { - QUrl url = fileNameWithVariables.toUrl(); - url.setPath(expand(url.path())); - return FilePath::fromUrl(url); - } - return FilePath::fromString(expand(fileNameWithVariables.toString())); + FilePath result = fileNameWithVariables; + result.setPath(expand(result.path())); + result.setHost(expand(result.host())); + result.setScheme(expand(result.scheme())); + return result; } QByteArray MacroExpander::expand(const QByteArray &stringWithVariables) const