forked from qt-creator/qt-creator
Profile introduction
Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
@@ -47,6 +47,7 @@
|
||||
#include <projectexplorer/project.h>
|
||||
#include <projectexplorer/buildconfiguration.h>
|
||||
#include <projectexplorer/deployconfiguration.h>
|
||||
#include <projectexplorer/profilemanager.h>
|
||||
#include <projectexplorer/projectmodels.h>
|
||||
#include <projectexplorer/runconfiguration.h>
|
||||
|
||||
@@ -590,6 +591,10 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi
|
||||
connect(m_sessionManager, SIGNAL(projectDisplayNameChanged(ProjectExplorer::Project*)),
|
||||
this, SLOT(updateActionAndSummary()));
|
||||
|
||||
// for icon changes:
|
||||
connect(ProjectExplorer::ProfileManager::instance(), SIGNAL(profileUpdated(ProjectExplorer::Profile*)),
|
||||
this, SLOT(profileChanged(ProjectExplorer::Profile*)));
|
||||
|
||||
connect(m_listWidgets[TARGET], SIGNAL(changeActiveProjectConfiguration(ProjectExplorer::ProjectConfiguration*)),
|
||||
this, SLOT(setActiveTarget(ProjectExplorer::ProjectConfiguration*)));
|
||||
connect(m_listWidgets[BUILD], SIGNAL(changeActiveProjectConfiguration(ProjectExplorer::ProjectConfiguration*)),
|
||||
@@ -869,6 +874,8 @@ void MiniProjectTargetSelector::activeTargetChanged(ProjectExplorer::Target *tar
|
||||
this, SLOT(updateActionAndSummary()));
|
||||
disconnect(m_target, SIGNAL(toolTipChanged()),
|
||||
this, SLOT(updateActionAndSummary()));
|
||||
disconnect(m_target, SIGNAL(iconChanged()),
|
||||
this, SLOT(updateActionAndSummary()));
|
||||
disconnect(m_target, SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
|
||||
this, SLOT(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)));
|
||||
disconnect(m_target, SIGNAL(activeDeployConfigurationChanged(ProjectExplorer::DeployConfiguration*)),
|
||||
@@ -925,6 +932,8 @@ void MiniProjectTargetSelector::activeTargetChanged(ProjectExplorer::Target *tar
|
||||
this, SLOT(updateActionAndSummary()));
|
||||
connect(m_target, SIGNAL(toolTipChanged()),
|
||||
this, SLOT(updateActionAndSummary()));
|
||||
connect(m_target, SIGNAL(iconChanged()),
|
||||
this, SLOT(updateActionAndSummary()));
|
||||
connect(m_target, SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
|
||||
this, SLOT(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)));
|
||||
connect(m_target, SIGNAL(activeDeployConfigurationChanged(ProjectExplorer::DeployConfiguration*)),
|
||||
@@ -942,6 +951,12 @@ void MiniProjectTargetSelector::activeTargetChanged(ProjectExplorer::Target *tar
|
||||
updateActionAndSummary();
|
||||
}
|
||||
|
||||
void MiniProjectTargetSelector::profileChanged(Profile *profile)
|
||||
{
|
||||
if (m_target && m_target->profile() == profile)
|
||||
updateActionAndSummary();
|
||||
}
|
||||
|
||||
void MiniProjectTargetSelector::activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration *bc)
|
||||
{
|
||||
if (m_buildConfiguration)
|
||||
|
||||
Reference in New Issue
Block a user