From 8bc7e040121d0d47a39c0bc286625afce7a4f64d Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 7 Feb 2019 12:32:46 +0100 Subject: [PATCH] ProjectExplorer: Fix build directory expansion QDir::cleanPath() must be called on the expanded path, otherwise it messes with the data. For instance, QDir::cleanPath("%{a:b}/..") yields ".". Change-Id: If55b9c7a733097cb36f62fbdae49fe03b542fcdf Reviewed-by: Christian Stenger --- 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 5297ec7c84d..7973ed4c056 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -86,7 +86,7 @@ BuildConfiguration::BuildConfiguration(Target *target, Core::Id id) Utils::FileName BuildConfiguration::buildDirectory() const { - const QString path = macroExpander()->expand(QDir::cleanPath(environment().expandVariables(m_buildDirectory.toString()))); + const QString path = QDir::cleanPath(macroExpander()->expand(environment().expandVariables(m_buildDirectory.toString()))); return Utils::FileName::fromString(QDir::cleanPath(QDir(target()->project()->projectDirectory().toString()).absoluteFilePath(path))); }