From 03e629e5f9839c5eb5addc7f40b92422bf3abe0d Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 3 Nov 2017 15:23:40 +0100 Subject: [PATCH] ProjectExplorer: Handle Macros in build directory Macros in build directory were not consistently expanded, so building failed (at least in qmake projects). Task-number: QTCREATORBUG-18601 Change-Id: I7ab06a1b969866748cf4062d1c820e5830efe281 Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/buildconfiguration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index bd2bbaac51d..372b0724688 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -119,7 +119,7 @@ void BuildConfiguration::ctor() Utils::FileName BuildConfiguration::buildDirectory() const { - QString path = QDir::cleanPath(environment().expandVariables(m_buildDirectory.toString())); + const QString path = macroExpander()->expand(QDir::cleanPath(environment().expandVariables(m_buildDirectory.toString()))); return Utils::FileName::fromString(QDir::cleanPath(QDir(target()->project()->projectDirectory().toString()).absoluteFilePath(path))); }