From 450611ddccb4ad83eb9eb42c475a4476307b1e92 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Thu, 16 May 2024 12:55:26 +0200 Subject: [PATCH] Utils: Fix FilePathAspect::expandedValue It should use the macro expander if there is one. Change-Id: I8fb7760f23305f4b243e784d38d44d9bef4c0065 Reviewed-by: Alessandro Portale --- src/libs/utils/aspects.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index b72fc2060e3..c35085ce4d1 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -1416,7 +1416,10 @@ FilePath FilePathAspect::operator()() const FilePath FilePathAspect::expandedValue() const { - return FilePath::fromUserInput(TypedAspect::value()); + const auto value = TypedAspect::value(); + if (!value.isEmpty() && d->m_expanderProvider) + return FilePath::fromUserInput(d->m_expanderProvider()->expand(value)); + return FilePath::fromUserInput(value); } QString FilePathAspect::value() const