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

Fix available toolchains for cmake and generic project manager

Browse Source 
Reviewed-By: hunger
This commit is contained in:
dt
2011-04-13 12:01:54 +02:00
parent b9251a6626
commit 8a276097c6
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -402,8 +402,11 @@ void CMakeRunPage::initializePage()
m_generatorComboBox->setVisible(true); m_generatorComboBox->setVisible(true);
m_generatorComboBox->clear(); m_generatorComboBox->clear();
ProjectExplorer::Abi abi = ProjectExplorer::Abi::hostAbi();
abi = ProjectExplorer::Abi(abi.architecture(), abi.os(), ProjectExplorer::Abi::UnknownFlavor,
abi.binaryFormat(), abi.wordWidth() == 32 ? 32 : 0);
QList<ProjectExplorer::ToolChain *> tcs = QList<ProjectExplorer::ToolChain *> tcs =
ProjectExplorer::ToolChainManager::instance()->findToolChains(ProjectExplorer::Abi::hostAbi()); ProjectExplorer::ToolChainManager::instance()->findToolChains(abi);
foreach (ProjectExplorer::ToolChain *tc, tcs) { foreach (ProjectExplorer::ToolChain *tc, tcs) {
ProjectExplorer::Abi targetAbi = tc->targetAbi(); ProjectExplorer::Abi targetAbi = tc->targetAbi();
QVariant tcVariant = qVariantFromValue(static_cast<void *>(tc)); QVariant tcVariant = qVariantFromValue(static_cast<void *>(tc));

5
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -427,7 +427,10 @@ bool GenericProject::fromMap(const QVariantMap &map)
if (!id.isNull()) { if (!id.isNull()) {
setToolChain(toolChainManager->findToolChain(id)); setToolChain(toolChainManager->findToolChain(id));
} else { } else {
QList<ToolChain *> tcs = toolChainManager->findToolChains(Abi::hostAbi()); ProjectExplorer::Abi abi = ProjectExplorer::Abi::hostAbi();
abi = ProjectExplorer::Abi(abi.architecture(), abi.os(), ProjectExplorer::Abi::UnknownFlavor,
abi.binaryFormat(), abi.wordWidth() == 32 ? 32 : 0);
QList<ToolChain *> tcs = toolChainManager->findToolChains(abi);
if (tcs.isEmpty()) if (tcs.isEmpty())
tcs = toolChainManager->toolChains(); tcs = toolChainManager->toolChains();
if (!tcs.isEmpty()) if (!tcs.isEmpty())