diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-11-12 13:39:53 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-11-12 13:39:58 +0100 |
commit | 0603e3fd938c8fd4a99ac14ec55539e17fea5b86 (patch) | |
tree | 5cd51457a822fce81f0197289a7ab2cd5bb7864c | |
parent | e756dfc327469ee43782cf50bb4161f6c72a9647 (diff) | |
parent | 17822dad6063fd5c4bdfa6b34b78535b276c6886 (diff) | |
download | qt-creator-0603e3fd938c8fd4a99ac14ec55539e17fea5b86.tar.gz |
Merge remote-tracking branch 'origin/3.6'
Change-Id: Ide51ab3b3ad9430ae52802f3184266ccf1284909
-rw-r--r-- | plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index 20ac43d393..111727746b 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); } } |