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

Make it possible to actually select a tool chain.

Browse Source
This commit is contained in:
con
2009-06-10 15:39:16 +02:00
parent dc5fcfcc13
commit 7b04fc45e8
5 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -288,10 +288,12 @@ void Qt4Project::restoreSettingsImpl(PersistentSettingsReader &settingsReader)
addDefaultBuild();
// Ensure that the qt version in each build configuration is valid
// Ensure that the qt version and tool chain in each build configuration is valid
// or if not, is reset to the default
foreach (const QString &bc, buildConfigurations())
foreach (const QString &bc, buildConfigurations()) {
qtVersionId(bc);
toolChainType(bc);
}
m_rootProjectNode = new Qt4ProFileNode(this, m_fileInfo->fileName(), this);
m_rootProjectNode->registerWatcher(m_nodesWatcher);
@@ -377,7 +379,7 @@ void Qt4Project::scheduleUpdateCodeModel(Qt4ProjectManager::Internal::Qt4ProFile
ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfiguration) const
{
return qtVersion(buildConfiguration)->toolChain(qtVersion(buildConfiguration)->defaultToolchainType());
return qtVersion(buildConfiguration)->toolChain(toolChainType(buildConfiguration));
}
QString Qt4Project::makeCommand(const QString &buildConfiguration) const
@@ -817,6 +819,22 @@ void Qt4Project::setQtVersion(const QString &buildConfiguration, int id)
setValue(buildConfiguration, "QtVersionId", id);
}
void Qt4Project::setToolChainType(const QString &buildConfiguration, ProjectExplorer::ToolChain::ToolChainType type)
{
setValue(buildConfiguration, "ToolChain", (int)type);
}
ProjectExplorer::ToolChain::ToolChainType Qt4Project::toolChainType(const QString &buildConfiguration) const
{
ProjectExplorer::ToolChain::ToolChainType type =
(ProjectExplorer::ToolChain::ToolChainType)value(buildConfiguration, "ToolChain").toInt();
const QtVersion *version = qtVersion(buildConfiguration);
if (!version->possibleToolChainTypes().contains(type)) // use default tool chain
type = version->defaultToolchainType();
const_cast<Qt4Project *>(this)->setToolChainType(buildConfiguration, type);
return type;
}
BuildStepConfigWidget *Qt4Project::createConfigWidget()
{
return new Qt4ProjectConfigWidget(this);