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

12
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -52,6 +52,7 @@
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectmacroexpander.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/taskhub.h> #include <projectexplorer/taskhub.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
@@ -247,11 +248,14 @@ bool QbsProject::hasParseResult() const
return qbsProject().isValid(); return qbsProject().isValid();
} }
Utils::FileName QbsProject::defaultBuildDirectory(const QString &path) Utils::FileName QbsProject::defaultBuildDirectory(const QString &projectFilePath, const Kit *k,
const QString &bcName)
{ {
QFileInfo fi(path); const QString projectName = QFileInfo(projectFilePath).completeBaseName();
const QString buildDir = QDir(fi.canonicalPath()).absoluteFilePath(QString::fromLatin1("../%1-build").arg(fi.baseName())); ProjectExplorer::ProjectMacroExpander expander(projectFilePath, projectName, k, bcName);
return FileName::fromString(QDir::cleanPath(buildDir)); QString projectDir = projectDirectory(projectFilePath);
QString buildPath = Utils::expandMacros(Core::DocumentManager::buildDirectory(), &expander);
return Utils::FileName::fromString(Utils::FileUtils::resolvePath(projectDir, buildPath));
} }
qbs::Project QbsProject::qbsProject() const qbs::Project QbsProject::qbsProject() const

4
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -92,7 +92,9 @@ public:
bool hasParseResult() const; bool hasParseResult() const;
void parseCurrentBuildConfiguration(bool force); void parseCurrentBuildConfiguration(bool force);
static Utils::FileName defaultBuildDirectory(const QString &path); static Utils::FileName defaultBuildDirectory(const QString &projectFilePath,
const ProjectExplorer::Kit *k,
const QString &bcName);
qbs::Project qbsProject() const; qbs::Project qbsProject() const;
const qbs::ProjectData qbsProjectData() const; const qbs::ProjectData qbsProjectData() const;