From 530c248051efcbd90c7ddd9d7f96fa8129e6437f Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 14 Apr 2017 16:25:21 +0300 Subject: [PATCH] Core: Fix compiler display name for MSVC2017 Change-Id: I0a0a6e2899373241dac0cdec5154ea7f22efd0c2 Reviewed-by: David Schulz --- src/plugins/coreplugin/icore.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 2790075638f..a9c9c59cad0 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -448,12 +448,10 @@ static QString compilerString() #elif defined(Q_CC_MSVC) if (_MSC_VER > 1999) return QLatin1String("MSVC "); - if (_MSC_VER >= 1900) // 1900: MSVC 2015 + if (_MSC_VER >= 1910) + return QLatin1String("MSVC 2017"); + if (_MSC_VER >= 1900) return QLatin1String("MSVC 2015"); - if (_MSC_VER >= 1800) // 1800: MSVC 2013 (yearly release cycle) - return QLatin1String("MSVC ") + QString::number(2008 + ((_MSC_VER / 100) - 13)); - if (_MSC_VER >= 1500) // 1500: MSVC 2008, 1600: MSVC 2010, ... (2-year release cycle) - return QLatin1String("MSVC ") + QString::number(2008 + 2 * ((_MSC_VER / 100) - 15)); #endif return QLatin1String(""); }