From b8989f1a8ade7916dd0a5cadd18ea7e198749d01 Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Mon, 20 Aug 2018 12:52:30 +0200
Subject: [PATCH] ProjectExplorer: Fix MSVC toolchain macros

Some defines about which we asked cl.exe are context
specific and do not make sense for the whole toolchain.

'__cplusplus' shouldn't come from MSVC but should rather
being figured out by code model based on -std=, MSVC
version and ms-compatibility version.

Task-number: QTCREATORBUG-20933
Change-Id: Ia31efc6a451753f6f6efae1abccd7f7a13ff44d9
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 src/plugins/projectexplorer/msvctoolchain.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 220d8509dc4..765dc86d384 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -334,26 +334,17 @@ static QByteArray msvcCompilationFile()
         "__CLR_VER",
         "_CMMN_INTRIN_FUNC",
         "_CONTROL_FLOW_GUARD",
-        "__COUNTER__",
-        "__cplusplus",
         "__cplusplus_cli",
         "__cplusplus_winrt",
         "_CPPLIB_VER",
         "_CPPRTTI",
         "_CPPUNWIND",
-        "__DATE__",
         "_DEBUG",
         "_DLL",
-        "__FILE__",
-        "__func__",
-        "__FUNCDNAME__",
-        "__FUNCSIG__",
-        "__FUNCTION__",
         "_INTEGRAL_MAX_BITS",
         "__INTELLISENSE__",
         "_ISO_VOLATILE",
         "_KERNEL_MODE",
-        "__LINE__",
         "_M_AAMD64",
         "_M_ALPHA",
         "_M_AMD64",
@@ -393,8 +384,6 @@ static QByteArray msvcCompilationFile()
         "__STDC__",
         "__STDC_HOSTED__",
         "__STDCPP_THREADS__",
-        "__TIME__",
-        "__TIMESTAMP__",
         "_VC_NODEFAULTLIB",
         "_WCHAR_T_DEFINED",
         "_WIN32",