diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-15 11:14:54 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-15 11:14:54 +0100 |
| commit | a9ac384513cc2c39b2005ee5651c34a49e801641 (patch) | |
| tree | 830bf2b3bad36fec9b9fa0fa76f9dfa488f22da4 /share/qbs/modules/cpp/windows-msvc.qbs | |
| parent | 126ce8cd2b2c0c10525e23c9900ec25b0bade601 (diff) | |
| parent | 8815e0007006e996bc145a91970d71b9b4ae86d0 (diff) | |
| download | qbs-a9ac384513cc2c39b2005ee5651c34a49e801641.tar.gz | |
Merge 1.10 into master
Change-Id: Iab942ed25d06038cf8c172eb70dcd8e9a720e1c8
Diffstat (limited to 'share/qbs/modules/cpp/windows-msvc.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index 2e6557177..6c000f7ac 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -45,12 +45,13 @@ CppModule { Probes.BinaryProbe { id: compilerPathProbe - condition: !toolchainInstallPath + condition: !toolchainInstallPath && !_skipAllChecks names: ["cl"] } Probes.MsvcProbe { id: msvcProbe + condition: !_skipAllChecks compilerFilePath: compilerPath enableDefinesByLanguage: enableCompilerDefinesByLanguage preferredArchitecture: qbs.architecture |