diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-11-26 11:13:55 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-11-27 13:46:45 +0000 |
| commit | 370804c2ab307cc9dfbcd5566e7625e0996f1f9e (patch) | |
| tree | 455841e2134a5c2fb09b1ccb4e69ee1839a9d052 /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | 68e1247d99787ed97df34f72159f02c2879670b9 (diff) | |
| download | qt-creator-370804c2ab307cc9dfbcd5566e7625e0996f1f9e.tar.gz | |
CppTools: Work around problems with our definition of __FUNCSIG__
This basically extends the existing hack to cover one more case. It may
very well break again in some other context, in which case we will
remove the custom definitions entirely, as the reason they exist in the
first place does not seem terribly relevant.
Fixes: QTCREATORBUG-24580
Change-Id: I757ac23682c81c647a5d968fa549baac5716010c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 612b0439b3..4f95112550 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -641,9 +641,9 @@ void CompilerOptionsBuilder::undefineCppLanguageFeatureMacrosForMsvc2015() void CompilerOptionsBuilder::addDefineFunctionMacrosMsvc() { if (m_projectPart.toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID) { - addMacros({{"__FUNCSIG__", "\"\""}, - {"__FUNCTION__", "\"\""}, - {"__FUNCDNAME__", "\"\""}}); + addMacros({{"__FUNCSIG__", "\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\""}, + {"__FUNCTION__", "\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\""}, + {"__FUNCDNAME__", "\"?someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580@@YAXXZ\""}}); } } |