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

Qbs: Honor default build directory set up in Build & Run->General

Browse Source 
Change-Id: I1e7d6cc97f2e8adb5956866205493d28d79887cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-05-02 11:44:32 +02:00
parent 4f73795ccd
commit 7dfbb74d58
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,18 +277,16 @@ QList<ProjectExplorer::BuildInfo *> QbsBuildConfigurationFactory::availableSetup
{
QList<ProjectExplorer::BuildInfo *> result;
const Utils::FileName buildDirectory = QbsProject::defaultBuildDirectory(projectPath);
ProjectExplorer::BuildInfo *info = createBuildInfo(k, ProjectExplorer::BuildConfiguration::Debug);
//: The name of the debug build configuration created by default for a qbs project.
info->displayName = tr("Debug");
info->buildDirectory = buildDirectory;
info->buildDirectory = QbsProject::defaultBuildDirectory(projectPath, k, info->displayName);
result << info;
info = createBuildInfo(k, ProjectExplorer::BuildConfiguration::Release);
//: The name of the release build configuration created by default for a qbs project.
info->displayName = tr("Release");
info->buildDirectory = buildDirectory;
info->buildDirectory = QbsProject::defaultBuildDirectory(projectPath, k, info->displayName);
result << info;
return result;
@@ -311,7 +309,8 @@ ProjectExplorer::BuildConfiguration *QbsBuildConfigurationFactory::create(Projec
Utils::FileName buildDir = info->buildDirectory;
if (buildDir.isEmpty())
buildDir = QbsProject::defaultBuildDirectory(parent->project()->projectDirectory());
buildDir = QbsProject::defaultBuildDirectory(parent->project()->projectDirectory(),
parent->kit(), info->displayName);
ProjectExplorer::BuildConfiguration *bc
= QbsBuildConfiguration::setup(parent, info->displayName, info->displayName,