From de854aa37f49de6d8f6ee12c0e9d247c5143c2da Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Tue, 23 Apr 2019 09:54:46 +0200
Subject: Teach qmake MSVC's compiler options /std:c++[14|17|latest]

This fixes the "could not parse compiler option" warning when
generating VS project files.

Fixes: QTBUG-75275
Change-Id: Idd98ae5fdb8ebf5a4e311cbb6cd3ed1daba74ca4
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 qmake/generators/win32/msvc_objectmodel.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'qmake/generators/win32/msvc_objectmodel.cpp')

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 7335211f30..f08554d0f5 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -1146,6 +1146,14 @@ bool VCCLCompilerTool::parseOption(const char* option)
             ShowIncludes = _True;
             break;
         }
+        if (strlen(option) > 8 && second == 't' && third == 'd') {
+            const QString version = option + 8;
+            static const QStringList knownVersions = { "14", "17", "latest" };
+            if (knownVersions.contains(version)) {
+                LanguageStandard = "stdcpp" + version;
+                break;
+            }
+        }
         found = false; break;
     case 'u':
         if (!second)
-- 
cgit v1.2.3