feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qbs: Handle empty builddirectories in our buildconfigurationfactory

Browse Source 
Change-Id: Id92b7345391937f27663810ad03018b1e263fb22
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-05-02 11:36:15 +02:00
parent 4d302fa1a8
commit 4f73795ccd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -260,11 +260,8 @@ QList<ProjectExplorer::BuildInfo *> QbsBuildConfigurationFactory::availableBuild
{ {
QList<ProjectExplorer::BuildInfo *> result; QList<ProjectExplorer::BuildInfo *> result;
const Utils::FileName buildDirectory = QbsProject::defaultBuildDirectory(parent->project()->projectFilePath());
ProjectExplorer::BuildInfo *info = createBuildInfo(parent->kit(), ProjectExplorer::BuildInfo *info = createBuildInfo(parent->kit(),
ProjectExplorer::BuildConfiguration::Debug); ProjectExplorer::BuildConfiguration::Debug);
info->buildDirectory = buildDirectory;
result << info; result << info;
return result; return result;
@@ -312,9 +309,13 @@ ProjectExplorer::BuildConfiguration *QbsBuildConfigurationFactory::create(Projec
? QLatin1String(Constants::QBS_VARIANT_RELEASE) ? QLatin1String(Constants::QBS_VARIANT_RELEASE)
: QLatin1String(Constants::QBS_VARIANT_DEBUG)); : QLatin1String(Constants::QBS_VARIANT_DEBUG));
Utils::FileName buildDir = info->buildDirectory;
if (buildDir.isEmpty())
buildDir = QbsProject::defaultBuildDirectory(parent->project()->projectDirectory());
ProjectExplorer::BuildConfiguration *bc ProjectExplorer::BuildConfiguration *bc
= QbsBuildConfiguration::setup(parent, info->displayName, info->displayName, = QbsBuildConfiguration::setup(parent, info->displayName, info->displayName,
configData, info->buildDirectory); configData, buildDir);
return bc; return bc;
} }