diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-03-09 17:49:04 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-03-16 15:23:03 +0000 |
| commit | c8e560b3bd41b771283dc41635a049f9d7e5bffd (patch) | |
| tree | 49f4c5eb8388895924e44e0c322f69727ae77f24 | |
| parent | ba4a604d687dc45f3cc97f2a32e59516a9343871 (diff) | |
ProjectExplorer: Fix MSVC compatibility check
Amends bd03041428.
Fixes: QTCREATORBUG-23706
Change-Id: I2ebf4c350cd0ff6b95535f614eec2379a704a0d4
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/plugins/projectexplorer/abi.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index 0cb6ca7fb8..fec9f69fd9 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 |