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

Abi: Make MSVC2015 match MSVC2017

Browse Source 
Task-number: QTCREATORBUG-17740
Change-Id: I846f2a6a3c9819975c5ded2a447f8a38a098aa6b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-04-26 11:18:01 +02:00
parent 872598747f
commit e71fc39885
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -606,24 +606,36 @@ bool Abi::operator == (const Abi &other) const
bool Abi::isCompatibleWith(const Abi &other) const bool Abi::isCompatibleWith(const Abi &other) const
{ {
bool isCompat = (architecture() == other.architecture() || other.architecture() == Abi::UnknownArchitecture) // Generic match: If stuff is identical or the other side is unknown, then this is a match.
&& (os() == other.os() || other.os() == Abi::UnknownOS) bool isCompat = (architecture() == other.architecture() || other.architecture() == UnknownArchitecture)
&& (osFlavor() == other.osFlavor() || other.osFlavor() == Abi::UnknownFlavor) && (os() == other.os() || other.os() == UnknownOS)
&& (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UnknownFormat) && (osFlavor() == other.osFlavor() || other.osFlavor() == UnknownFlavor)
&& (binaryFormat() == other.binaryFormat() || other.binaryFormat() == UnknownFormat)
&& ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0); && ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0);
// *-linux-generic-* is compatible with *-linux-* (both ways): This is for the benefit of // *-linux-generic-* is compatible with *-linux-* (both ways): This is for the benefit of
// people building Qt themselves using e.g. a meego toolchain. // people building Qt themselves using e.g. a meego toolchain.
// //
// We leave it to the specific targets to catch filter out the tool chains that do not // We leave it to the specific targets to filter out the tool chains that do not
// work for them. // work for them.
if (!isCompat && (architecture() == other.architecture() || other.architecture() == Abi::UnknownArchitecture) if (!isCompat && (architecture() == other.architecture() || other.architecture() == UnknownArchitecture)
&& ((os() == other.os()) && (os() == LinuxOS)) && ((os() == other.os()) && (os() == LinuxOS))
&& (osFlavor() == GenericLinuxFlavor || other.osFlavor() == GenericLinuxFlavor) && (osFlavor() == GenericLinuxFlavor || other.osFlavor() == GenericLinuxFlavor)
&& (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UnknownFormat) && (binaryFormat() == other.binaryFormat() || other.binaryFormat() == UnknownFormat)
&& ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0)) && ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0)) {
isCompat = true; isCompat = true;
if (osFlavor() == AndroidLinuxFlavor || other.osFlavor() == AndroidLinuxFlavor) }
isCompat = (osFlavor() == other.osFlavor() && architecture() == other.architecture());
// Make Android matching more strict than the generic Linux matches so far:
if (isCompat && (osFlavor() == AndroidLinuxFlavor || other.osFlavor() == AndroidLinuxFlavor))
isCompat = (architecture() == other.architecture()) && (osFlavor() == other.osFlavor());
// MSVC2017 is compatible with MSVC2015
if (!isCompat
&& ((osFlavor() == WindowsMsvc2015Flavor && other.osFlavor() == WindowsMsvc2017Flavor)
|| (osFlavor() == WindowsMsvc2017Flavor && other.osFlavor() == WindowsMsvc2015Flavor))) {
isCompat = true;
}
return isCompat; return isCompat;
} }