diff options
| author | Kwangsub Kim <kwangsub.kim@qt.io> | 2022-10-21 12:38:21 +0200 |
|---|---|---|
| committer | Kwangsub Kim <kwangsub.kim@qt.io> | 2022-10-26 00:11:22 +0000 |
| commit | 02024303b10a370d7329b52d48c294aac300795c (patch) | |
| tree | faf011f7ffdd4249e75030cbce1709a5d3883541 | |
| parent | 4fdbfe164131f16af00a1082cbf45273d074c8a2 (diff) | |
McuSupport: Specify MSVC type for toolchain pick upv9.0.0-beta2
The current criteria allows to select LLVM so that it can cause
an unexpected behavior. Explicit toolchain type check will prevent
the invalid toolchain setup.
Change-Id: Ib0afa4304650dd451c12d7a8d950b26115661862
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | src/plugins/mcusupport/mcupackage.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp index 63a8644229..b0a3699faf 100644 --- a/src/plugins/mcusupport/mcupackage.cpp +++ b/src/plugins/mcusupport/mcupackage.cpp @@ -325,6 +325,7 @@ ToolChain *McuToolChainPackage::msvcToolChain(Id language) return (abi.osFlavor() == Abi::WindowsMsvc2017Flavor || abi.osFlavor() == Abi::WindowsMsvc2019Flavor) && abi.architecture() == Abi::X86Architecture && abi.wordWidth() == 64 + && t->typeId() == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID && t->language() == language; }); return toolChain; |