From c8e560b3bd41b771283dc41635a049f9d7e5bffd Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 9 Mar 2020 17:49:04 +0100 Subject: [PATCH] ProjectExplorer: Fix MSVC compatibility check Amends bd03041428. Fixes: QTCREATORBUG-23706 Change-Id: I2ebf4c350cd0ff6b95535f614eec2379a704a0d4 Reviewed-by: Kai Koehne --- src/plugins/projectexplorer/abi.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index 0cb6ca7fb80..fec9f69fd9d 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -668,8 +668,10 @@ bool Abi::isCompatibleWith(const Abi &other) const bool Abi::isFullyCompatibleWith(const Abi &other) const { - return *this == other || (wordWidth() == other.wordWidth() - && compatibleMSVCFlavors(osFlavor(), other.osFlavor())); + return *this == other + || (wordWidth() == other.wordWidth() + && architecture() == other.architecture() + && compatibleMSVCFlavors(osFlavor(), other.osFlavor())); } bool Abi::isValid() const