diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index af7aef4c7c20dc6bfb985da044d06f78cd96d425..bd2bbaac51dc8bea9538c9f0d0103dbc7f3539ae 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -69,7 +69,7 @@ BuildConfiguration::BuildConfiguration(Target *target, Core::Id id) :
     bsl->setDefaultDisplayName(tr("Clean"));
     m_stepLists.append(bsl);
 
-    emitEnvironmentChanged();
+    updateCacheAndEmitEnvironmentChanged();
 
     connect(target, &Target::kitChanged,
             this, &BuildConfiguration::handleKitUpdate);
@@ -91,7 +91,7 @@ BuildConfiguration::BuildConfiguration(Target *target, BuildConfiguration *sourc
     // otherwise BuildStepFactories might reject to set up a BuildStep for us
     // since we are not yet the derived class!
 
-    emitEnvironmentChanged();
+    updateCacheAndEmitEnvironmentChanged();
 
     connect(target, &Target::kitChanged,
             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_buildDirectory = Utils::FileName::fromString(map.value(QLatin1String(BUILDDIRECTORY_KEY)).toString());
 
-    emitEnvironmentChanged();
+    updateCacheAndEmitEnvironmentChanged();
 
     qDeleteAll(m_stepLists);
     m_stepLists.clear();
@@ -203,7 +203,7 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
     return ProjectConfiguration::fromMap(map);
 }
 
-void BuildConfiguration::emitEnvironmentChanged()
+void BuildConfiguration::updateCacheAndEmitEnvironmentChanged()
 {
     Utils::Environment env = baseEnvironment();
     env.modify(userEnvironmentChanges());
@@ -215,7 +215,7 @@ void BuildConfiguration::emitEnvironmentChanged()
 
 void BuildConfiguration::handleKitUpdate()
 {
-    emitEnvironmentChanged();
+    updateCacheAndEmitEnvironmentChanged();
 }
 
 void BuildConfiguration::emitBuildDirectoryChanged()
@@ -264,7 +264,7 @@ void BuildConfiguration::setUseSystemEnvironment(bool b)
     if (useSystemEnvironment() == b)
         return;
     m_clearSystemEnvironment = !b;
-    emitEnvironmentChanged();
+    updateCacheAndEmitEnvironmentChanged();
 }
 
 void BuildConfiguration::addToEnvironment(Utils::Environment &env) const
@@ -287,7 +287,7 @@ void BuildConfiguration::setUserEnvironmentChanges(const QList<Utils::Environmen
     if (m_userEnvironmentChanges == diff)
         return;
     m_userEnvironmentChanges = diff;
-    emitEnvironmentChanged();
+    updateCacheAndEmitEnvironmentChanged();
 }
 
 void BuildConfiguration::cloneSteps(BuildConfiguration *source)
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index c0ad651f4d55baf7a51c17d4c1549629efa2d6b1..109cc4481ef0d8be4137112602e12139d97cc7fb 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -103,7 +103,7 @@ protected:
     BuildConfiguration(Target *target, BuildConfiguration *source);
 
     void cloneSteps(BuildConfiguration *source);
-    void emitEnvironmentChanged();
+    void updateCacheAndEmitEnvironmentChanged();
 
 private:
     void handleKitUpdate();
diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp
index 805624c95f6bbb92db8e8be89fe8d1e6559c0d5f..1de61ae19f18fd7fbc18a98187d39114fb1fb07f 100644
--- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp
+++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp
@@ -129,7 +129,7 @@ void AndroidQmakeBuildConfiguration::manifestSaved()
     if (m_androidNdkPlatform == androidNdkPlatform)
         return;
 
-    emitEnvironmentChanged();
+    updateCacheAndEmitEnvironmentChanged();
 
     QMakeStep *qs = qmakeStep();
     if (!qs)
diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h
index 25783a05cb8021f34c4109912b14b0094f420d9e..55e68bf719600fb3210421d68ffc9badb3a55c75 100644
--- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h
+++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h
@@ -57,7 +57,7 @@ public:
     void addToEnvironment(Utils::Environment &env) const override;
     void manifestSaved();
 
-    using BuildConfiguration::emitEnvironmentChanged;
+    using BuildConfiguration::updateCacheAndEmitEnvironmentChanged;
 private:
     mutable QString m_androidNdkPlatform;
 };