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

BuildConfiguration: Make method name clearer

Browse Source 
Make it clear that emitEnvironmentChanged also updates the cache of the
current environment.

Change-Id: I012c5a2b3d7d4037ed609b26e053ce0ce36f6cec
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-10-18 16:21:39 +02:00
parent 015bb14ed9
commit 813212396b
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ BuildConfiguration::BuildConfiguration(Target *target, Core::Id id) :
bsl->setDefaultDisplayName(tr("Clean")); bsl->setDefaultDisplayName(tr("Clean"));
m_stepLists.append(bsl); m_stepLists.append(bsl);
emitEnvironmentChanged(); updateCacheAndEmitEnvironmentChanged();
connect(target, &Target::kitChanged, connect(target, &Target::kitChanged,
this, &BuildConfiguration::handleKitUpdate); this, &BuildConfiguration::handleKitUpdate);
@@ -91,7 +91,7 @@ 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!
emitEnvironmentChanged(); updateCacheAndEmitEnvironmentChanged();
connect(target, &Target::kitChanged, connect(target, &Target::kitChanged,
this, &BuildConfiguration::handleKitUpdate); this, &BuildConfiguration::handleKitUpdate);
@@ -171,7 +171,7 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
m_userEnvironmentChanges = Utils::EnvironmentItem::fromStringList(map.value(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY)).toStringList()); m_userEnvironmentChanges = Utils::EnvironmentItem::fromStringList(map.value(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY)).toStringList());
m_buildDirectory = Utils::FileName::fromString(map.value(QLatin1String(BUILDDIRECTORY_KEY)).toString()); m_buildDirectory = Utils::FileName::fromString(map.value(QLatin1String(BUILDDIRECTORY_KEY)).toString());
emitEnvironmentChanged(); updateCacheAndEmitEnvironmentChanged();
qDeleteAll(m_stepLists); qDeleteAll(m_stepLists);
m_stepLists.clear(); m_stepLists.clear();
@@ -203,7 +203,7 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
return ProjectConfiguration::fromMap(map); return ProjectConfiguration::fromMap(map);
} }
void BuildConfiguration::emitEnvironmentChanged() void BuildConfiguration::updateCacheAndEmitEnvironmentChanged()
{ {
Utils::Environment env = baseEnvironment(); Utils::Environment env = baseEnvironment();
env.modify(userEnvironmentChanges()); env.modify(userEnvironmentChanges());
@@ -215,7 +215,7 @@ void BuildConfiguration::emitEnvironmentChanged()
void BuildConfiguration::handleKitUpdate() void BuildConfiguration::handleKitUpdate()
{ {
emitEnvironmentChanged(); updateCacheAndEmitEnvironmentChanged();
} }
void BuildConfiguration::emitBuildDirectoryChanged() void BuildConfiguration::emitBuildDirectoryChanged()
@@ -264,7 +264,7 @@ void BuildConfiguration::setUseSystemEnvironment(bool b)
if (useSystemEnvironment() == b) if (useSystemEnvironment() == b)
return; return;
m_clearSystemEnvironment = !b; m_clearSystemEnvironment = !b;
emitEnvironmentChanged(); updateCacheAndEmitEnvironmentChanged();
} }
void BuildConfiguration::addToEnvironment(Utils::Environment &env) const void BuildConfiguration::addToEnvironment(Utils::Environment &env) const
@@ -287,7 +287,7 @@ void BuildConfiguration::setUserEnvironmentChanges(const QList<Utils::Environmen
if (m_userEnvironmentChanges == diff) if (m_userEnvironmentChanges == diff)
return; return;
m_userEnvironmentChanges = diff; m_userEnvironmentChanges = diff;
emitEnvironmentChanged(); updateCacheAndEmitEnvironmentChanged();
} }
void BuildConfiguration::cloneSteps(BuildConfiguration *source) void BuildConfiguration::cloneSteps(BuildConfiguration *source)

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

@@ -103,7 +103,7 @@ protected:
BuildConfiguration(Target *target, BuildConfiguration *source); BuildConfiguration(Target *target, BuildConfiguration *source);
void cloneSteps(BuildConfiguration *source); void cloneSteps(BuildConfiguration *source);
void emitEnvironmentChanged(); void updateCacheAndEmitEnvironmentChanged();
private: private:
void handleKitUpdate(); void handleKitUpdate();

2
src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp
View File

@@ -129,7 +129,7 @@ void AndroidQmakeBuildConfiguration::manifestSaved()
if (m_androidNdkPlatform == androidNdkPlatform) if (m_androidNdkPlatform == androidNdkPlatform)
return; return;
emitEnvironmentChanged(); updateCacheAndEmitEnvironmentChanged();
QMakeStep *qs = qmakeStep(); QMakeStep *qs = qmakeStep();
if (!qs) if (!qs)

2
src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h
View File

@@ -57,7 +57,7 @@ public:
void addToEnvironment(Utils::Environment &env) const override; void addToEnvironment(Utils::Environment &env) const override;
void manifestSaved(); void manifestSaved();
using BuildConfiguration::emitEnvironmentChanged; using BuildConfiguration::updateCacheAndEmitEnvironmentChanged;
private: private:
mutable QString m_androidNdkPlatform; mutable QString m_androidNdkPlatform;
}; };