From 83f5901b0a0e7a07ee8d10a129eaac826b204dcb Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 30 Mar 2010 17:09:13 +0200
Subject: [PATCH] Set the toolchain type on setting a different qt version
Reviewed-By: hunger
---
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index c9a810cea9c..3dc6cf025fb 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -301,6 +301,14 @@ void Qt4BuildConfiguration::setQtVersion(QtVersion *version)
return;
m_qtVersionId = version->uniqueId();
+ if (!version->possibleToolChainTypes().contains(ProjectExplorer::ToolChain::ToolChainType(m_toolChainType))) {
+ QList<ToolChain::ToolChainType> candidates =
+ qt4Target()->filterToolChainTypes(qtVersion()->possibleToolChainTypes());
+ if (candidates.isEmpty())
+ m_toolChainType = -1;
+ else
+ m_toolChainType = candidates.first();
+ }
emit proFileEvaluateNeeded(this);
emit qtVersionChanged();
--
GitLab