Commit 03e629e5 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

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's avatarEike Ziller <eike.ziller@qt.io>
parent 19e125ce
......@@ -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)));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment