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

ProjectExplorer: Add ProjectConfiguration * to activeProjectConfigurationChanged

Browse Source 
Add ProjectConfiguration * to activeProjectConfigurationChanged signal on
Projects and Targets.

Change-Id: I56f71e034eacaaa043b19c7fd5d82e6c5ea58517
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-08-01 14:19:25 +02:00
parent ef2f2804a1
commit 34456aa906
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/project.cpp
View File

@@ -304,7 +304,7 @@ void Project::setActiveTarget(Target *target)
if ((!target && !d->m_targets.isEmpty()) || if ((!target && !d->m_targets.isEmpty()) ||
(target && d->m_targets.contains(target) && d->m_activeTarget != target)) { (target && d->m_targets.contains(target) && d->m_activeTarget != target)) {
d->m_activeTarget = target; d->m_activeTarget = target;
emit activeProjectConfigurationChanged(); emit activeProjectConfigurationChanged(d->m_activeTarget);
emit activeTargetChanged(d->m_activeTarget); emit activeTargetChanged(d->m_activeTarget);
emit environmentChanged(); emit environmentChanged();
emit buildConfigurationEnabledChanged(); emit buildConfigurationEnabledChanged();

2
src/plugins/projectexplorer/project.h
View File

@@ -182,7 +182,7 @@ signals:
// *ANY* active project configuration changed somewhere in the tree. This might not be // *ANY* active project configuration changed somewhere in the tree. This might not be
// the one that would get started right now, since some part of the tree in between might // the one that would get started right now, since some part of the tree in between might
// not be active. // not be active.
void activeProjectConfigurationChanged(); void activeProjectConfigurationChanged(ProjectExplorer::ProjectConfiguration *pc);
void aboutToRemoveTarget(ProjectExplorer::Target *target); void aboutToRemoveTarget(ProjectExplorer::Target *target);
void removedTarget(ProjectExplorer::Target *target); void removedTarget(ProjectExplorer::Target *target);

6
src/plugins/projectexplorer/target.cpp
View File

@@ -301,7 +301,7 @@ void Target::setActiveBuildConfiguration(BuildConfiguration *bc)
(bc && d->m_buildConfigurations.contains(bc) && (bc && d->m_buildConfigurations.contains(bc) &&
bc != d->m_activeBuildConfiguration)) { bc != d->m_activeBuildConfiguration)) {
d->m_activeBuildConfiguration = bc; d->m_activeBuildConfiguration = bc;
emit activeProjectConfigurationChanged(); emit activeProjectConfigurationChanged(d->m_activeBuildConfiguration);
emit activeBuildConfigurationChanged(d->m_activeBuildConfiguration); emit activeBuildConfigurationChanged(d->m_activeBuildConfiguration);
emit environmentChanged(); emit environmentChanged();
emit buildConfigurationEnabledChanged(); emit buildConfigurationEnabledChanged();
@@ -380,7 +380,7 @@ void Target::setActiveDeployConfiguration(DeployConfiguration *dc)
(dc && d->m_deployConfigurations.contains(dc) && (dc && d->m_deployConfigurations.contains(dc) &&
dc != d->m_activeDeployConfiguration)) { dc != d->m_activeDeployConfiguration)) {
d->m_activeDeployConfiguration = dc; d->m_activeDeployConfiguration = dc;
emit activeProjectConfigurationChanged(); emit activeProjectConfigurationChanged(d->m_activeDeployConfiguration);
emit activeDeployConfigurationChanged(d->m_activeDeployConfiguration); emit activeDeployConfigurationChanged(d->m_activeDeployConfiguration);
emit deployConfigurationEnabledChanged(); emit deployConfigurationEnabledChanged();
} }
@@ -481,7 +481,7 @@ void Target::setActiveRunConfiguration(RunConfiguration *rc)
(rc && d->m_runConfigurations.contains(rc) && (rc && d->m_runConfigurations.contains(rc) &&
rc != d->m_activeRunConfiguration)) { rc != d->m_activeRunConfiguration)) {
d->m_activeRunConfiguration = rc; d->m_activeRunConfiguration = rc;
emit activeProjectConfigurationChanged(); emit activeProjectConfigurationChanged(d->m_activeRunConfiguration);
emit activeRunConfigurationChanged(d->m_activeRunConfiguration); emit activeRunConfigurationChanged(d->m_activeRunConfiguration);
emit runConfigurationEnabledChanged(); emit runConfigurationEnabledChanged();
} }

2
src/plugins/projectexplorer/target.h
View File

@@ -123,7 +123,7 @@ signals:
void removedProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc); void removedProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc);
void addedProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc); void addedProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc);
void activeProjectConfigurationChanged(); void activeProjectConfigurationChanged(ProjectExplorer::ProjectConfiguration *pc);
// TODO clean up signal names // TODO clean up signal names
// might be better to also have aboutToRemove signals // might be better to also have aboutToRemove signals