From 4f73795ccdeccdefd5b10d29ddc6f49fc2e54de8 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 2 May 2014 11:36:15 +0200 Subject: [PATCH] Qbs: Handle empty builddirectories in our buildconfigurationfactory Change-Id: Id92b7345391937f27663810ad03018b1e263fb22 Reviewed-by: Tobias Hunger --- src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 7ac63839dff..5e243de525a 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -260,11 +260,8 @@ QList QbsBuildConfigurationFactory::availableBuild { QList result; - const Utils::FileName buildDirectory = QbsProject::defaultBuildDirectory(parent->project()->projectFilePath()); - ProjectExplorer::BuildInfo *info = createBuildInfo(parent->kit(), ProjectExplorer::BuildConfiguration::Debug); - info->buildDirectory = buildDirectory; result << info; return result; @@ -312,9 +309,13 @@ ProjectExplorer::BuildConfiguration *QbsBuildConfigurationFactory::create(Projec ? QLatin1String(Constants::QBS_VARIANT_RELEASE) : QLatin1String(Constants::QBS_VARIANT_DEBUG)); + Utils::FileName buildDir = info->buildDirectory; + if (buildDir.isEmpty()) + buildDir = QbsProject::defaultBuildDirectory(parent->project()->projectDirectory()); + ProjectExplorer::BuildConfiguration *bc = QbsBuildConfiguration::setup(parent, info->displayName, info->displayName, - configData, info->buildDirectory); + configData, buildDir); return bc; }