feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Fix MSVC compatibility check

Browse Source 
Amends bd03041428.

Fixes: QTCREATORBUG-23706
Change-Id: I2ebf4c350cd0ff6b95535f614eec2379a704a0d4
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
Christian Kandeler
2020-03-09 17:49:04 +01:00
parent ba4a604d68
commit c8e560b3bd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/abi.cpp
View File

@@ -668,7 +668,9 @@ bool Abi::isCompatibleWith(const Abi &other) const
bool Abi::isFullyCompatibleWith(const Abi &other) const bool Abi::isFullyCompatibleWith(const Abi &other) const
{ {
return *this == other || (wordWidth() == other.wordWidth() return *this == other
|| (wordWidth() == other.wordWidth()
&& architecture() == other.architecture()
&& compatibleMSVCFlavors(osFlavor(), other.osFlavor())); && compatibleMSVCFlavors(osFlavor(), other.osFlavor()));
} }