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

BuildConfiguration: Simplfy code dealing with kit changes

Browse Source 
Change-Id: Ia3014640b2e900998b8ebbda94975d15ea76ca70
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-10-17 15:43:18 +02:00
parent ec272ea0e7
commit 7baa0d2ffb
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -92,8 +92,8 @@ BuildConfiguration::BuildConfiguration(Target *target, const Core::Id id) :
bsl->setDefaultDisplayName(tr("Clean")); bsl->setDefaultDisplayName(tr("Clean"));
m_stepLists.append(bsl); m_stepLists.append(bsl);
connect(KitManager::instance(), SIGNAL(kitUpdated(ProjectExplorer::Kit*)), connect(target, SIGNAL(kitChanged()),
this, SLOT(handleKitUpdate(ProjectExplorer::Kit*))); this, SLOT(handleKitUpdate()));
} }
BuildConfiguration::BuildConfiguration(Target *target, BuildConfiguration *source) : BuildConfiguration::BuildConfiguration(Target *target, BuildConfiguration *source) :
@@ -107,8 +107,8 @@ BuildConfiguration::BuildConfiguration(Target *target, BuildConfiguration *sourc
// otherwise BuildStepFactories might reject to set up a BuildStep for us // otherwise BuildStepFactories might reject to set up a BuildStep for us
// since we are not yet the derived class! // since we are not yet the derived class!
connect(KitManager::instance(), SIGNAL(kitUpdated(ProjectExplorer::Kit*)), connect(target, SIGNAL(kitChanged()),
this, SLOT(handleKitUpdate(ProjectExplorer::Kit*))); this, SLOT(handleKitUpdate()));
} }
BuildConfiguration::~BuildConfiguration() BuildConfiguration::~BuildConfiguration()
@@ -187,10 +187,8 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
return ProjectConfiguration::fromMap(map); return ProjectConfiguration::fromMap(map);
} }
void BuildConfiguration::handleKitUpdate(ProjectExplorer::Kit *k) void BuildConfiguration::handleKitUpdate()
{ {
if (k != target()->kit())
return;
emit environmentChanged(); emit environmentChanged();
} }

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

@@ -111,7 +111,7 @@ protected:
virtual bool fromMap(const QVariantMap &map); virtual bool fromMap(const QVariantMap &map);
private slots: private slots:
void handleKitUpdate(ProjectExplorer::Kit *k); void handleKitUpdate();
private: private:
bool m_clearSystemEnvironment; bool m_clearSystemEnvironment;