From 6863acfe9184a2d30c94fa079fed1bc1e30d40db Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Mon, 6 Jun 2016 13:50:05 +0200
Subject: Use general vc environment script instead of platform specific.

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

Task-number: QTCREATORBUG-16359
Change-Id: Ic8c8fbc30f0c1269aeb51abbd21902097bd6c285
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/projectexplorer/msvctoolchain.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 6f8994aefd..30e79b4384 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -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));
                 }
             }
-- 
cgit v1.2.3