diff options
| author | dt <qtc-committer@nokia.com> | 2011-04-13 12:01:54 +0200 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2011-04-13 13:38:58 +0200 |
| commit | 8a276097c6f16d7963013e5ce2f53946a2ad339f (patch) | |
| tree | 34492d11f0ef50612584ba4a25632ca7004073b4 /src/plugins/genericprojectmanager | |
| parent | b9251a6626336bf3d2d94abc04f12c9c977428bd (diff) | |
| download | qt-creator-8a276097c6f16d7963013e5ce2f53946a2ad339f.tar.gz | |
Fix available toolchains for cmake and generic project manager
Reviewed-By: hunger
Diffstat (limited to 'src/plugins/genericprojectmanager')
| -rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 9ba93b0e1d..19713331a9 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -427,7 +427,10 @@ bool GenericProject::fromMap(const QVariantMap &map) if (!id.isNull()) { setToolChain(toolChainManager->findToolChain(id)); } 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()) tcs = toolChainManager->toolChains(); if (!tcs.isEmpty()) |