diff options
author | David Schulz <david.schulz@qt.io> | 2016-06-06 13:50:05 +0200 |
---|---|---|
committer | David Schulz <david.schulz@theqtcompany.com> | 2016-06-06 13:26:59 +0000 |
commit | 6863acfe9184a2d30c94fa079fed1bc1e30d40db (patch) | |
tree | 44c7c62a536e2aa9f0bf19f84644cdb11967665c | |
parent | 023b78545f32caa634589eb25a6d5d5e64ce125c (diff) |
Use general vc environment script instead of platform specific.v4.0.1
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>
-rw-r--r-- | src/plugins/projectexplorer/msvctoolchain.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 6f8994aefdd..30e79b43841 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)); } } |