summaryrefslogtreecommitdiff
path: root/src/plugins/qbsprojectmanager
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-05-04 16:52:21 +0200
committerhjk <hjk@qt.io>2018-05-08 08:13:00 +0000
commitce20bde99c6f7cd5b7fe7eb0b186727925adb116 (patch)
treeac1b1b1cc045a626cf41e1421a846423fa358b99 /src/plugins/qbsprojectmanager
parent1678e9eb1e4dfcdd518218ca89455f6b667316d1 (diff)
downloadqt-creator-ce20bde99c6f7cd5b7fe7eb0b186727925adb116.tar.gz
ProjectExplorer: Pass id directly to BuildConfigurations
It's what the base class wants, and follows run and deploy precedence. Change-Id: I26eff43337851702417e7e4284fc390b904060f6 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qbsprojectmanager')
-rw-r--r--src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp4
-rw-r--r--src/plugins/qbsprojectmanager/qbsbuildconfiguration.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
index 05c4d8cf84..ce2b764d3b 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
@@ -74,8 +74,8 @@ static FileName defaultBuildDirectory(const QString &projectFilePath, const Kit
// QbsBuildConfiguration:
// ---------------------------------------------------------------------------
-QbsBuildConfiguration::QbsBuildConfiguration(Target *target)
- : BuildConfiguration(target, Constants::QBS_BC_ID)
+QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id)
+ : BuildConfiguration(target, id)
{
connect(project(), &Project::parsingStarted, this, &BuildConfiguration::enabledChanged);
connect(project(), &Project::parsingFinished, this, &BuildConfiguration::enabledChanged);
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
index 3c3fbdf30b..f27895066f 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
@@ -46,7 +46,7 @@ class QbsBuildConfiguration : public ProjectExplorer::BuildConfiguration
Q_OBJECT
friend class ProjectExplorer::IBuildConfigurationFactory;
- explicit QbsBuildConfiguration(ProjectExplorer::Target *target);
+ QbsBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
public:
void initialize(const ProjectExplorer::BuildInfo *info) override;