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

ProjectExplorer: Simplify BuildConfiguration a bit

Browse Source 
Change-Id: Ia44049039c32a598b6da212290d339b8f3705835
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tobias Hunger
2018-07-12 12:10:12 +02:00
parent cd5066d86b
commit 9452c36025
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ BuildConfiguration::BuildConfiguration(Target *target, Core::Id id)
updateCacheAndEmitEnvironmentChanged(); updateCacheAndEmitEnvironmentChanged();
connect(target, &Target::kitChanged, connect(target, &Target::kitChanged,
this, &BuildConfiguration::handleKitUpdate); this, &BuildConfiguration::updateCacheAndEmitEnvironmentChanged);
connect(this, &BuildConfiguration::environmentChanged, connect(this, &BuildConfiguration::environmentChanged,
this, &BuildConfiguration::emitBuildDirectoryChanged); this, &BuildConfiguration::emitBuildDirectoryChanged);
} }
@@ -183,11 +183,6 @@ void BuildConfiguration::updateCacheAndEmitEnvironmentChanged()
emit environmentChanged(); // might trigger buildDirectoryChanged signal! emit environmentChanged(); // might trigger buildDirectoryChanged signal!
} }
void BuildConfiguration::handleKitUpdate()
{
updateCacheAndEmitEnvironmentChanged();
}
void BuildConfiguration::emitBuildDirectoryChanged() void BuildConfiguration::emitBuildDirectoryChanged()
{ {
if (buildDirectory() != m_lastEmmitedBuildDirectory) { if (buildDirectory() != m_lastEmmitedBuildDirectory) {

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

@@ -108,7 +108,6 @@ protected:
void updateCacheAndEmitEnvironmentChanged(); void updateCacheAndEmitEnvironmentChanged();
private: private:
void handleKitUpdate();
void emitBuildDirectoryChanged(); void emitBuildDirectoryChanged();
bool m_clearSystemEnvironment = false; bool m_clearSystemEnvironment = false;