1 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 8f561772eb..b70f5ca5bd 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -117,7 +117,6 @@ QStringList CompilerOptionsBuilder::build(ProjectFile::Kind fileKind,
     undefineClangVersionMacrosForMsvc();
     undefineCppLanguageFeatureMacrosForMsvc2015();
     addDefineFunctionMacrosMsvc();
-    addBoostWorkaroundMacros();
 
     addToolchainFlags();
     addPrecompiledHeaderOptions(usePrecompiledHeaders);
@@ -596,14 +595,6 @@ void CompilerOptionsBuilder::addDefineFunctionMacrosMsvc()
     }
 }
 
-void CompilerOptionsBuilder::addBoostWorkaroundMacros()
-{
-    if (m_projectPart.toolchainType != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID
-          && m_projectPart.toolchainType != ProjectExplorer::Constants::CLANG_CL_TOOLCHAIN_TYPEID) {
-        addMacros({{"BOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING", "(39, 1, true, \"T = \")"}});
-    }
-}
-
 QString CompilerOptionsBuilder::includeDirOptionForPath(const QString &path) const
 {
     if (m_useSystemHeader == UseSystemHeader::No
@@ -707,4 +698,10 @@ void CompilerOptionsBuilder::undefineClangVersionMacrosForMsvc()
     }
 }
 
+UseToolchainMacros CompilerOptionsBuilder::useToolChainMacros()
+{
+    return qEnvironmentVariableIntValue("QTC_CLANG_USE_TOOLCHAIN_MACROS") ? UseToolchainMacros::Yes
+                                                                          : UseToolchainMacros::No;
+}
+
 } // namespace CppTools