feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/clangutils.cpp
	src/plugins/cpptools/clangcompileroptionsbuilder.cpp
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: I0728f08171103259407bbbb35f93b70c2f2e18d0
This commit is contained in:
Eike Ziller
2017-11-21 13:28:55 +01:00
parent cbc9b61f19 194bde265c
commit 89f9f22035
26 changed files with 201 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -58,6 +58,7 @@ QStringList CompilerOptionsBuilder::build(CppTools::ProjectFile::Kind fileKind,
addToolchainAndProjectMacros();
undefineClangVersionMacrosForMsvc();
undefineCppLanguageFeatureMacrosForMsvc2015();
addDefineFunctionMacrosMsvc();
addPredefinedHeaderPathsOptions();
addPrecompiledHeaderOptions(pchUsage);
@@ -389,6 +390,12 @@ void CompilerOptionsBuilder::undefineCppLanguageFeatureMacrosForMsvc2015()
}
}
void CompilerOptionsBuilder::addDefineFunctionMacrosMsvc()
{
if (m_projectPart.toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
addMacros({{"__FUNCSIG__", "\"\""}, {"__FUNCTION__", "\"\""}, {"__FUNCDNAME__", "\"\""}});
}
QString CompilerOptionsBuilder::includeDirOption() const
{
return QLatin1String("-I");

3
src/plugins/cpptools/compileroptionsbuilder.h
View File

@@ -64,11 +64,12 @@ public:
void addWordWidth();
void addHeaderPathOptions();
void addPrecompiledHeaderOptions(PchUsage pchUsage);
void addToolchainAndProjectMacros();
virtual void addToolchainAndProjectMacros();
void addMacros(const ProjectExplorer::Macros &macros);
void addMsvcCompatibilityVersion();
void undefineCppLanguageFeatureMacrosForMsvc2015();
void addDefineFunctionMacrosMsvc();
void addProjectConfigFileInclude();
void undefineClangVersionMacrosForMsvc();