Merge remote branch 'origin/2.2'

Conflicts:
	qtcreator.pri
	src/plugins/projectexplorer/toolchainmanager.cpp

1 files changed, 5 insertions, 0 deletions

diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h
index e11f65cc32..fd3fa0dbf3 100644
--- a/src/plugins/projectexplorer/toolchainmanager.h
+++ b/src/plugins/projectexplorer/toolchainmanager.h
@@ -78,6 +78,8 @@ signals:
     void toolChainAdded(ProjectExplorer::ToolChain *);
     // Tool chain is still valid when this call happens!
     void toolChainRemoved(ProjectExplorer::ToolChain *);
+    // Tool chain was updated.
+    void toolChainUpdated(ProjectExplorer::ToolChain *);
 
 private:
     explicit ToolChainManager(QObject *parent = 0);
@@ -87,12 +89,15 @@ private:
     void restoreToolChains();
     void restoreToolChains(const QString &fileName, bool autoDetected = false);
 
+    void notifyAboutUpdate(ProjectExplorer::ToolChain *);
+
 
     Internal::ToolChainManagerPrivate *const m_d;
 
     static ToolChainManager *m_instance;
 
     friend class ProjectExplorerPlugin;
+    friend class ToolChain;
 };
 
 } // namespace ProjectExplorer