From 312c4a14339655ca6c80de0f8444ccf54931f68c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 15 Mar 2019 13:11:57 +0100 Subject: [PATCH] QbsProjectManager: Fix default build directory Commit a43331ba67 broke the build, and commit 4a3546f58a fixed it, but used the wrong function. Fixes: QTCREATORBUG-22142 Change-Id: I8a66bc8a4501f017726149544d73a728ab753e32 Reviewed-by: Eike Ziller --- src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp | 2 +- src/plugins/qbsprojectmanager/qbsprojectimporter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 21e24cffa80..43ac1608f6e 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -71,7 +71,7 @@ static FileName defaultBuildDirectory(const QString &projectFilePath, const Kit const QString projectName = QFileInfo(projectFilePath).completeBaseName(); ProjectMacroExpander expander(projectFilePath, projectName, k, bcName, buildType); QString projectDir = Project::projectDirectory(FileName::fromString(projectFilePath)).toString(); - QString buildPath = expander.expand(ProjectExplorerPlugin::defaultBuildDirectoryTemplate()); + QString buildPath = expander.expand(ProjectExplorerPlugin::buildDirectoryTemplate()); return FileName::fromString(FileUtils::resolvePath(projectDir, buildPath)); } diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp index 7e3f37d0a88..b1d5adb8494 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp @@ -94,7 +94,7 @@ static QString buildDir(const QString &projectFilePath, const Kit *k) BuildConfiguration::Unknown); const QString projectDir = Project::projectDirectory(FileName::fromString(projectFilePath)).toString(); - const QString buildPath = expander.expand(ProjectExplorerPlugin::defaultBuildDirectoryTemplate()); + const QString buildPath = expander.expand(ProjectExplorerPlugin::buildDirectoryTemplate()); return FileUtils::resolvePath(projectDir, buildPath); }