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

Adapt to upstream API change in CompilerOptionsBuilder

Browse Source 
Change-Id: I895e8a32ca8adc1c5f1b4791a3fcc5f18c5078ab
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-06-25 14:17:11 +02:00
parent d49232bbf1
commit 44f0bb287c
1 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
View File

@@ -118,32 +118,20 @@ static QStringList argumentsFromProjectPart(const CppTools::ProjectPart::Ptr &pr
const QString &toolchainType, const QString &toolchainType,
unsigned char wordWidth) unsigned char wordWidth)
{ {
QStringList result; CompilerOptionsBuilder optionsBuilder(projectPart);
optionsBuilder.addLanguageOption(fileKind, toolchainType);
const bool objcExt = projectPart->languageExtensions & ProjectPart::ObjectiveCExtensions; optionsBuilder.addOptionsForLanguage(false, toolchainType);
result += CppTools::CompilerOptionsBuilder::createLanguageOption(fileKind, objcExt, optionsBuilder.addToolchainAndProjectDefines(toolchainType);
toolchainType); optionsBuilder.addHeaderPathOptions(CompilerOptionsBuilder::IsBlackListed(), toolchainType);
result += CppTools::CompilerOptionsBuilder::createOptionsForLanguage(
projectPart->languageVersion,
projectPart->languageExtensions, false,
toolchainType);
result += CppTools::CompilerOptionsBuilder::createDefineOptions(projectPart->toolchainDefines,
false, toolchainType);
result += CppTools::CompilerOptionsBuilder::createDefineOptions(projectPart->projectDefines,
false, toolchainType);
result += CppTools::CompilerOptionsBuilder::createHeaderPathOptions(
projectPart->headerPaths,
CompilerOptionsBuilder::IsBlackListed(),
toolchainType);
if (toolchainType == QLatin1String("msvc")) if (toolchainType == QLatin1String("msvc"))
result += QLatin1String("/EHsc"); // clang-cl does not understand exceptions optionsBuilder.add(QLatin1String("/EHsc")); // clang-cl does not understand exceptions
else else
result += QLatin1String("-fPIC"); // TODO: Remove? optionsBuilder.add(QLatin1String("-fPIC")); // TODO: Remove?
prependWordWidthArgumentIfNotIncluded(&result, wordWidth); QStringList options = optionsBuilder.options();
prependWordWidthArgumentIfNotIncluded(&options, wordWidth);
return result; return options;
} }
static AnalyzeUnits unitsToAnalyzeFromCompilerCallData( static AnalyzeUnits unitsToAnalyzeFromCompilerCallData(