Commit 4f73795c authored by Tobias Hunger's avatar Tobias Hunger

Qbs: Handle empty builddirectories in our buildconfigurationfactory

Change-Id: Id92b7345391937f27663810ad03018b1e263fb22
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 4d302fa1
......@@ -260,11 +260,8 @@ QList<ProjectExplorer::BuildInfo *> QbsBuildConfigurationFactory::availableBuild
{
QList<ProjectExplorer::BuildInfo *> 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;
}
......
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