From 17822dad6063fd5c4bdfa6b34b78535b276c6886 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Date: Thu, 5 Nov 2015 11:50:39 +0100
Subject: [PATCH] Adapt to upstream CompilerOptionsBuilder changes.
Change-Id: I4d6340113f044357467ecb3a157e78ad51ef5497
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
---
.../clangstaticanalyzerruncontrol.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index 20ac43d393a..111727746b3 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -131,7 +131,7 @@ static QString createLanguageOptionMsvc(ProjectFile::Kind fileKind)
class ClangStaticAnalyzerOptionsBuilder : public CompilerOptionsBuilder
{
public:
- static QStringList build(const CppTools::ProjectPart::Ptr &projectPart,
+ static QStringList build(const CppTools::ProjectPart &projectPart,
CppTools::ProjectFile::Kind fileKind,
unsigned char wordWidth)
{
@@ -143,7 +143,7 @@ public:
// Therefore, prevent the inclusion of the header that references them. Of course, this
// will break if code actually requires stuff from there, but that should be the less common
// case.
- const Core::Id type = projectPart->toolchainType;
+ const Core::Id type = projectPart.toolchainType;
if (type == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID
|| type == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID)
optionsBuilder.addDefine("#define _X86INTRIN_H_INCLUDED\n");
@@ -162,9 +162,9 @@ public:
}
private:
- ClangStaticAnalyzerOptionsBuilder(const CppTools::ProjectPart::Ptr &projectPart)
+ ClangStaticAnalyzerOptionsBuilder(const CppTools::ProjectPart &projectPart)
: CompilerOptionsBuilder(projectPart)
- , m_isMsvcToolchain(m_projectPart->toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
+ , m_isMsvcToolchain(m_projectPart.toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
{
}
@@ -240,7 +240,9 @@ static AnalyzeUnits unitsToAnalyzeFromProjectParts(const QList<ProjectPart::Ptr>
QTC_CHECK(file.kind != ProjectFile::Unclassified);
if (ProjectFile::isSource(file.kind)) {
const QStringList arguments
- = ClangStaticAnalyzerOptionsBuilder::build(projectPart, file.kind, wordWidth);
+ = ClangStaticAnalyzerOptionsBuilder::build(*projectPart.data(),
+ file.kind,
+ wordWidth);
unitsToAnalyze << AnalyzeUnit(file.path, arguments);
}
}
--
GitLab