forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -334,26 +334,17 @@ static QByteArray msvcCompilationFile()
|
|||||||
"__CLR_VER",
|
"__CLR_VER",
|
||||||
"_CMMN_INTRIN_FUNC",
|
"_CMMN_INTRIN_FUNC",
|
||||||
"_CONTROL_FLOW_GUARD",
|
"_CONTROL_FLOW_GUARD",
|
||||||
"__COUNTER__",
|
|
||||||
"__cplusplus",
|
|
||||||
"__cplusplus_cli",
|
"__cplusplus_cli",
|
||||||
"__cplusplus_winrt",
|
"__cplusplus_winrt",
|
||||||
"_CPPLIB_VER",
|
"_CPPLIB_VER",
|
||||||
"_CPPRTTI",
|
"_CPPRTTI",
|
||||||
"_CPPUNWIND",
|
"_CPPUNWIND",
|
||||||
"__DATE__",
|
|
||||||
"_DEBUG",
|
"_DEBUG",
|
||||||
"_DLL",
|
"_DLL",
|
||||||
"__FILE__",
|
|
||||||
"__func__",
|
|
||||||
"__FUNCDNAME__",
|
|
||||||
"__FUNCSIG__",
|
|
||||||
"__FUNCTION__",
|
|
||||||
"_INTEGRAL_MAX_BITS",
|
"_INTEGRAL_MAX_BITS",
|
||||||
"__INTELLISENSE__",
|
"__INTELLISENSE__",
|
||||||
"_ISO_VOLATILE",
|
"_ISO_VOLATILE",
|
||||||
"_KERNEL_MODE",
|
"_KERNEL_MODE",
|
||||||
"__LINE__",
|
|
||||||
"_M_AAMD64",
|
"_M_AAMD64",
|
||||||
"_M_ALPHA",
|
"_M_ALPHA",
|
||||||
"_M_AMD64",
|
"_M_AMD64",
|
||||||
@@ -393,8 +384,6 @@ static QByteArray msvcCompilationFile()
|
|||||||
"__STDC__",
|
"__STDC__",
|
||||||
"__STDC_HOSTED__",
|
"__STDC_HOSTED__",
|
||||||
"__STDCPP_THREADS__",
|
"__STDCPP_THREADS__",
|
||||||
"__TIME__",
|
|
||||||
"__TIMESTAMP__",
|
|
||||||
"_VC_NODEFAULTLIB",
|
"_VC_NODEFAULTLIB",
|
||||||
"_WCHAR_T_DEFINED",
|
"_WCHAR_T_DEFINED",
|
||||||
"_WIN32",
|
"_WIN32",
|
||||||
|
Reference in New Issue
Block a user