feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make Q4ProjecConfigWidget more robust

Browse Source 
Task-Nr: QTCREATORBUG-1108
Task-Nr: TOOLS-339
This commit is contained in:
dt
2010-04-14 13:37:08 +02:00
parent def1b610da
commit 61e5ce374c
4 changed files with 72 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -307,11 +307,12 @@ 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;
m_toolChainType = ToolChain::INVALID;
else
m_toolChainType = candidates.first();
}
@@ -323,9 +324,10 @@ void Qt4BuildConfiguration::setQtVersion(QtVersion *version)
void Qt4BuildConfiguration::setToolChainType(ProjectExplorer::ToolChain::ToolChainType type)
{
if (!qt4Target()->filterToolChainTypes(qtVersion()->possibleToolChainTypes()).contains(type) ||
m_toolChainType == type)
if (!qt4Target()->filterToolChainTypes(qtVersion()->possibleToolChainTypes()).contains(type)
|| m_toolChainType == type)
return;
m_toolChainType = type;
emit proFileEvaluateNeeded(this);