diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-11-03 15:23:40 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-11-06 09:24:09 +0000 |
| commit | 03e629e5f9839c5eb5addc7f40b92422bf3abe0d (patch) | |
| tree | 17128b0c61d475b5b630c8d4244a388c109e38fa /src/plugins/projectexplorer/buildconfiguration.cpp | |
| parent | 19e125ce5faa0aed02b46906be5771838e2dfda9 (diff) | |
| download | qt-creator-03e629e5f9839c5eb5addc7f40b92422bf3abe0d.tar.gz | |
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 <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/buildconfiguration.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/buildconfiguration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index bd2bbaac51..372b072468 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))); } |