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

Qbs: Move setting up the build directory out of createBuildInfo

Browse Source 
Change-Id: Ief088f880c866e8293c191194da05185f5df937a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-05-02 11:20:39 +02:00
parent 0fb641c90e
commit deeed07c07
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,12 +241,10 @@ bool QbsBuildConfigurationFactory::canHandle(const ProjectExplorer::Target *t) c
} }
ProjectExplorer::BuildInfo *QbsBuildConfigurationFactory::createBuildInfo(const ProjectExplorer::Kit *k, ProjectExplorer::BuildInfo *QbsBuildConfigurationFactory::createBuildInfo(const ProjectExplorer::Kit *k,
const Utils::FileName &buildDirectory,
ProjectExplorer::BuildConfiguration::BuildType type) const ProjectExplorer::BuildConfiguration::BuildType type) const
{ {
QbsBuildInfo *info = new QbsBuildInfo(this); QbsBuildInfo *info = new QbsBuildInfo(this);
info->typeName = tr("Build"); info->typeName = tr("Build");
info->buildDirectory = buildDirectory;
info->kitId = k->id(); info->kitId = k->id();
info->type = type; info->type = type;
info->supportsShadowBuild = true; info->supportsShadowBuild = true;
@@ -264,8 +262,9 @@ QList<ProjectExplorer::BuildInfo *> QbsBuildConfigurationFactory::availableBuild
const Utils::FileName buildDirectory = QbsProject::defaultBuildDirectory(parent->project()->projectFilePath()); const Utils::FileName buildDirectory = QbsProject::defaultBuildDirectory(parent->project()->projectFilePath());
ProjectExplorer::BuildInfo *info = createBuildInfo(parent->kit(), buildDirectory, ProjectExplorer::BuildInfo *info = createBuildInfo(parent->kit(),
ProjectExplorer::BuildConfiguration::Debug); ProjectExplorer::BuildConfiguration::Debug);
info->buildDirectory = buildDirectory;
result << info; result << info;
return result; return result;
@@ -283,14 +282,16 @@ QList<ProjectExplorer::BuildInfo *> QbsBuildConfigurationFactory::availableSetup
const Utils::FileName buildDirectory = QbsProject::defaultBuildDirectory(projectPath); const Utils::FileName buildDirectory = QbsProject::defaultBuildDirectory(projectPath);
ProjectExplorer::BuildInfo *info = createBuildInfo(k, buildDirectory, 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;
result << info; result << info;
info = createBuildInfo(k, buildDirectory, 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;
result << info; result << info;
return result; return result;

1
src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
View File

@@ -128,7 +128,6 @@ public:
private: private:
bool canHandle(const ProjectExplorer::Target *t) const; bool canHandle(const ProjectExplorer::Target *t) const;
ProjectExplorer::BuildInfo *createBuildInfo(const ProjectExplorer::Kit *k, ProjectExplorer::BuildInfo *createBuildInfo(const ProjectExplorer::Kit *k,
const Utils::FileName &buildDirectory,
ProjectExplorer::BuildConfiguration::BuildType type) const; ProjectExplorer::BuildConfiguration::BuildType type) const;
}; };