diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 6a3164f5ba5..601de6f5261 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -268,7 +268,6 @@ void Qt4Project::qtVersionsChanged()
                 m_rootProjectNode->update();
         }
     }
-    updateToolChain(activeBuildConfiguration());
 }
 
 void Qt4Project::updateFileList()
@@ -386,14 +385,6 @@ void Qt4Project::scheduleUpdateCodeModel(Qt4ProjectManager::Internal::Qt4ProFile
 }
 
 ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfiguration) const
-{
-    if (!m_toolChain) {
-        updateToolChain(buildConfiguration);
-    }
-    return m_toolChain;
-}
-
-void Qt4Project::updateToolChain(const QString &buildConfiguration) const
 {
     ProjectExplorer::ToolChain *tempToolChain;
     tempToolChain = qtVersion(buildConfiguration)->createToolChain(toolChainType(buildConfiguration));
@@ -404,6 +395,8 @@ void Qt4Project::updateToolChain(const QString &buildConfiguration) const
     } else {
         delete tempToolChain;
     }
+
+    return m_toolChain;
 }
 
 QString Qt4Project::makeCommand(const QString &buildConfiguration) const
@@ -891,7 +884,6 @@ void Qt4Project::setQtVersion(const QString &buildConfiguration, int id)
 void Qt4Project::setToolChainType(const QString &buildConfiguration, ProjectExplorer::ToolChain::ToolChainType type)
 {
     setValue(buildConfiguration, "ToolChain", (int)type);
-    updateToolChain(buildConfiguration);
     updateActiveRunConfiguration();
 }
 
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 5232d3e6c79..c9f4ae0f303 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -238,7 +238,6 @@ private:
 
     static QString qmakeVarName(ProjectExplorer::FileType type);
     void updateActiveRunConfiguration();
-    void updateToolChain(const QString &buildConfiguration) const;
 
     Qt4Manager *m_manager;
     Internal::Qt4ProFileNode *m_rootProjectNode;