Merge remote-tracking branch 'origin/4.14'

Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: I2136ba89d3aa3c4c2a0e7a4f9d8ba9cec32924ce

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 548594fedc..02ce9a3616 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -356,7 +356,7 @@ void CompilerOptionsBuilder::addHeaderPathOptions()
     for (const HeaderPath &headerPath : filter.systemHeaderPaths)
         addIncludeDirOptionForPath(headerPath);
 
-    if (m_useTweakedHeaderPaths == UseTweakedHeaderPaths::Yes) {
+    if (m_useTweakedHeaderPaths != UseTweakedHeaderPaths::No) {
         QTC_CHECK(!m_clangVersion.isEmpty()
                   && "Clang resource directory is required with UseTweakedHeaderPaths::Yes.");
 
@@ -657,9 +657,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\""}});
     }
 }