From 467c478dda347079e67c6c6ea1887baed871116c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 13 Dec 2016 15:17:37 +0100 Subject: [PATCH] Abi: Detect MSVC2017RC as MSVC2017 The binaries have a minor linker version >= 10. Amends change 0a9414d46773b896d2ca8bb395694799e483a863. Task-number: QTBUG-57086 Change-Id: Ib9493bc3f87e6100377632b85991ce94f3025f28 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/abi.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index 448f8cfe3f1..993bd2fd7b5 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -164,7 +164,9 @@ static QList parseCoffHeader(const QByteArray &data) flavor = Abi::WindowsMsvc2013Flavor; break; case 14: - flavor = Abi::WindowsMsvc2015Flavor; + flavor = minorLinker >= quint8(10) + ? Abi::WindowsMsvc2017Flavor // MSVC2017 RC + : Abi::WindowsMsvc2015Flavor; break; case 15: flavor = Abi::WindowsMsvc2017Flavor;