From 87d9caa32d850b76a369c0eaca26342d12131543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 10 Mar 2011 23:09:37 +0100 Subject: [PATCH] Generic project: Refresh configuration when tool chain changes Reviewed-by: Roberto Raggi --- src/plugins/genericprojectmanager/genericproject.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index f2995f1da31..36e2c599835 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -330,6 +330,8 @@ void GenericProject::setToolChain(ToolChain *tc) return; m_toolChain = tc; + refresh(Configuration); + emit toolChainChanged(m_toolChain); } @@ -421,13 +423,14 @@ bool GenericProject::fromMap(const QVariantMap &map) } QString id = map.value(QLatin1String(TOOLCHAIN_KEY)).toString(); + const ToolChainManager *toolChainManager = ToolChainManager::instance(); + if (!id.isNull()) { - setToolChain(ToolChainManager::instance()->findToolChain(id)); + setToolChain(toolChainManager->findToolChain(id)); } else { - QList tcs = - ToolChainManager::instance()->findToolChains(Abi::hostAbi()); + QList tcs = toolChainManager->findToolChains(Abi::hostAbi()); if (tcs.isEmpty()) - tcs = ToolChainManager::instance()->toolChains(); + tcs = toolChainManager->toolChains(); if (!tcs.isEmpty()) setToolChain(tcs.at(0)); }