From 212cb05cc9899b55016a770234cd5140b4643401 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 6 Jul 2011 11:11:58 +0000 Subject: [PATCH] MSVC: Detect 64bit architectures on 32bit hosts as well Task-number: QTCREATORBUG-5115 Change-Id: Ia284c308073f2ba826e964ea7d8ff03ce90e7959 Reviewed-on: http://codereview.qt.nokia.com/1234 Reviewed-by: Qt Sanity Bot Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/msvctoolchain.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index a1a8683cef..beb512dfbe 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -610,7 +610,6 @@ QList MsvcToolChainFactory::autoDetect() tmp.append(new MsvcToolChain(generateDisplayName(name, MsvcToolChain::WindowsSDK, MsvcToolChain::s32), findAbiOfMsvc(MsvcToolChain::WindowsSDK, MsvcToolChain::s32, version), sdkVcVarsBat, QLatin1String("/x86"), true)); -#ifdef Q_OS_WIN64 // Add all platforms tmp.append(new MsvcToolChain(generateDisplayName(name, MsvcToolChain::WindowsSDK, MsvcToolChain::s64), findAbiOfMsvc(MsvcToolChain::WindowsSDK, MsvcToolChain::s64, version), @@ -618,7 +617,6 @@ QList MsvcToolChainFactory::autoDetect() tmp.append(new MsvcToolChain(generateDisplayName(name, MsvcToolChain::WindowsSDK, MsvcToolChain::ia64), findAbiOfMsvc(MsvcToolChain::WindowsSDK, MsvcToolChain::ia64, version), sdkVcVarsBat, QLatin1String("/ia64"), true)); -#endif // Make sure the default is front. if (folder == defaultSdkPath) results = tmp + results; -- 2.11.0