diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index c9a810cea9c27ea5008c9a86d74a2657baddc056..3dc6cf025fb2b93cb6a2e0431084c1226719502d 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();