From 6c02588f39f7c7b5b26e8da6551ba24a10fa3e6b Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Fri, 8 Dec 2017 11:19:27 +0100
Subject: [PATCH] MSVC: Add support for language version flags in MSVC2017

Change-Id: I0aafd3917bbc53e77a965c3c5a761c7acaf047ff
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/projectexplorer/abstractmsvctoolchain.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
index 84eceaa4059..12c5a153169 100644
--- a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
+++ b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
@@ -138,8 +138,13 @@ ToolChain::CompilerFlags AbstractMsvcToolChain::compilerFlags(const QStringList
     case Abi::WindowsMsvc2012Flavor: flags |= StandardCxx11;
         break;
     case Abi::WindowsMsvc2013Flavor:
-    case Abi::WindowsMsvc2015Flavor:
-    case Abi::WindowsMsvc2017Flavor: flags |= StandardCxx14;
+    case Abi::WindowsMsvc2015Flavor: flags |= StandardCxx14;
+        break;
+    case Abi::WindowsMsvc2017Flavor:
+        if (cxxflags.contains("/std:c++17") || cxxflags.contains("/std:c++latest"))
+            flags |= StandardCxx17;
+        else
+            flags |= StandardCxx14;
         break;
     default:
         break;