From beb999f38ab7a7cb723c2a351fb96157815c1f72 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 12 Apr 2011 10:53:42 +0200 Subject: [PATCH] ToolChain: Update projectsmode on tool chain changes Update the projects mode on tool chain changes. Task-number: QTCREATORBUG-4431 --- src/plugins/projectexplorer/toolchainmanager.cpp | 6 ++++++ src/plugins/projectexplorer/toolchainmanager.h | 2 ++ src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp | 3 +++ 3 files changed, 11 insertions(+) diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index 7393e33c1d7..a076bbd241a 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -96,6 +96,12 @@ ToolChainManager::ToolChainManager(QObject *parent) : m_instance = this; connect(Core::ICore::instance(), SIGNAL(saveSettingsRequested()), this, SLOT(saveToolChains())); + connect(this, SIGNAL(toolChainAdded(ProjectExplorer::ToolChain*)), + this, SIGNAL(toolChainsChanged())); + connect(this, SIGNAL(toolChainRemoved(ProjectExplorer::ToolChain*)), + this, SIGNAL(toolChainsChanged())); + connect(this, SIGNAL(toolChainUpdated(ProjectExplorer::ToolChain*)), + this, SIGNAL(toolChainsChanged())); } void ToolChainManager::restoreToolChains() diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h index bd6c36f0873..b4263771f29 100644 --- a/src/plugins/projectexplorer/toolchainmanager.h +++ b/src/plugins/projectexplorer/toolchainmanager.h @@ -82,6 +82,8 @@ signals: void toolChainRemoved(ProjectExplorer::ToolChain *); // Tool chain was updated. void toolChainUpdated(ProjectExplorer::ToolChain *); + // Something changed: + void toolChainsChanged(); private: explicit ToolChainManager(QObject *parent = 0); diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp index d3ac12a6893..ffb9a8ae057 100644 --- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp @@ -114,6 +114,9 @@ Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4BaseTarget *target) connect(target->qt4Project(), SIGNAL(buildDirectoryInitialized()), this, SLOT(updateImportLabel())); + + connect(ProjectExplorer::ToolChainManager::instance(), SIGNAL(toolChainsChanged()), + this, SLOT(updateToolChainCombo())); } Qt4ProjectConfigWidget::~Qt4ProjectConfigWidget()