diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-02-27 13:15:30 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-02-27 14:21:06 +0000 |
| commit | bd03041428baa82e163e3a523cb3439e2086f0be (patch) | |
| tree | 1306f25052034e0f6294a3cb6ac6c0898748f36f /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | 171ad62aed7cd27e958ce47d3caa23c619eebe58 (diff) | |
QtSupport: Prevent misleading message about ABI mismatch
MSVC 2015/17/19 are ABI compatible, but BaseQtVersion::validateKit()
would emit a warning when using e.g. a Qt MSVC 2017 build with an MSVC
2019 toolchain.
Change-Id: I50ba026ae7b55e052b26826076ef962f369a05a1
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index c9cb928a1ac..7c1a3c241d4 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -523,7 +523,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k) qtAbiString.append(qtAbi.toString()); if (!fullMatch) - fullMatch = (targetAbi == qtAbi); + fullMatch = targetAbi.isFullyCompatibleWith(qtAbi); if (!fuzzyMatch) fuzzyMatch = targetAbi.isCompatibleWith(qtAbi); } |