From 3dd019461d5c64afbb138c0cf1ca518afa290b26 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 21 Mar 2011 18:02:48 +0100
Subject: [PATCH] Fix MSVC version for 6.x Windows SDKs
&.0 is using MSVC2005, all later versions starting with 6.0a are
using MSVC2008.
---
src/plugins/projectexplorer/msvctoolchain.cpp | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 4ad8d7d631c..bcc1c92039a 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -103,16 +103,18 @@ static Abi findAbiOfMsvc(MsvcToolChain::Type type, MsvcToolChain::Platform platf
QString msvcVersionString = version;
if (type == MsvcToolChain::WindowsSDK) {
- if (version.startsWith("7."))
- msvcVersionString = "10.0";
- else if (version.startsWith("6.1"))
- msvcVersionString = "9.0";
+ if (version.startsWith(QLatin1String("7.")))
+ msvcVersionString = QLatin1String("10.0");
+ else if (version.startsWith(QLatin1String("6.1"))
+ || (version.startsWith(QLatin1String("6.0")) && version != QLatin1String("6.0")))
+ // The 6.0 SDK is shipping MSVC2005, Starting at 6.0a it is MSVC2008.
+ msvcVersionString = QLatin1String("9.0");
else
- msvcVersionString = "8.0";
+ msvcVersionString = QLatin1String("8.0");
}
- if (msvcVersionString.startsWith("10."))
+ if (msvcVersionString.startsWith(QLatin1String("10.")))
flavor = Abi::WindowsMsvc2010Flavor;
- else if (msvcVersionString.startsWith("9."))
+ else if (msvcVersionString.startsWith(QLatin1String("9.")))
flavor = Abi::WindowsMsvc2008Flavor;
else
flavor = Abi::WindowsMsvc2005Flavor;
--
GitLab