diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2011-03-18 09:54:35 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-03-21 15:46:42 +0100 |
| commit | b2df065b56a1246f3a5fc5bd5f761608b67c9762 (patch) | |
| tree | ce84e08a234cf98efc67c3a27e8eebe41bf016fd /src/plugins/cmakeprojectmanager | |
| parent | 6b8eb847c49251ddecdf1480df7379b8029fd0a3 (diff) | |
| download | qt-creator-b2df065b56a1246f3a5fc5bd5f761608b67c9762.tar.gz | |
Use distinct ABIs for MSVC versions
Use a distinct ABI OS flavor for each of the supported MSVC versions.
Task-number: QTCREATORBUG-4129
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index 1b3f716468..50e0c96b62 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -409,7 +409,9 @@ void CMakeRunPage::initializePage() ProjectExplorer::Abi targetAbi = tc->targetAbi(); QVariant tcVariant = qVariantFromValue(static_cast<void *>(tc)); if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) { - if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvcFlavor) + if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2005Flavor + || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor + || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor) m_generatorComboBox->addItem(tr("NMake Generator (%1)").arg(tc->displayName()), tcVariant); else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) m_generatorComboBox->addItem(tr("MinGW Generator (%1)").arg(tc->displayName()), tcVariant); @@ -450,10 +452,10 @@ void CMakeRunPage::runCMake() QString generator = QLatin1String("-GCodeBlocks - Unix Makefiles"); if (tc->targetAbi().os() == ProjectExplorer::Abi::WindowsOS) { - if (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMsvcFlavor) - generator = QLatin1String("-GCodeBlocks - NMake Makefiles"); - else + if (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) generator = QLatin1String("-GCodeBlocks - MinGW Makefiles"); + else + generator = QLatin1String("-GCodeBlocks - NMake Makefiles"); } |