Commit 6863acfe authored by David Schulz's avatar David Schulz Committed by David Schulz

Use general vc environment script instead of platform specific.

Just use the specific scripts to detect whether a toolchain is
installed.
Partial revert of 2be4d264.

Task-number: QTCREATORBUG-16359
Change-Id: Ic8c8fbc30f0c1269aeb51abbd21902097bd6c285
Reviewed-by: Eike Ziller's avatarEike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale's avatarAlessandro Portale <alessandro.portale@qt.io>
parent 023b7854
......@@ -803,13 +803,13 @@ QList<ToolChain *> MsvcToolChainFactory::autoDetect(const QList<ToolChain *> &al
<< MsvcToolChain::arm << MsvcToolChain::x86_arm << MsvcToolChain::amd64_arm
<< MsvcToolChain::ia64 << MsvcToolChain::x86_ia64;
foreach (const MsvcToolChain::Platform &platform, platforms) {
QString vcvarsBat = vcVarsBatFor(path, platform);
if (hostSupportsPlatform(platform) && QFileInfo(vcvarsBat).isFile()) {
const bool toolchainInstalled = QFileInfo(vcVarsBatFor(path, platform)).isFile();
if (hostSupportsPlatform(platform) && toolchainInstalled) {
results.append(findOrCreateToolChain(
alreadyKnown,
generateDisplayName(vsName, MsvcToolChain::VS, platform),
findAbiOfMsvc(MsvcToolChain::VS, platform, vsName),
vcvarsBat, platformName(platform),
vcvarsAllbat, platformName(platform),
ToolChain::AutoDetection));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment