diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-09-29 13:46:53 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-10-27 14:21:19 +0000 |
commit | 5ba40cb7fbeb58f2ac1284944f7dda0b3f7bb453 (patch) | |
tree | ae1986a0254b1e32d32d60505c7c7301163484df /src/tools/clangpchmanagerbackend/source/collectincludesaction.h | |
parent | 6de3eb7a1a441e529549c9097431c2fc16fca90b (diff) | |
download | qt-creator-5ba40cb7fbeb58f2ac1284944f7dda0b3f7bb453.tar.gz |
Clang: Require LLVM/Clang >= 5.0.0
...for the code model parts and declare 5.0 as the supported version for
the clang static analyzer.
Adapt versions and tests, remove code assuming clang <= 5.0.
LLVM/Clang 5 was released on 07 Sep 2017.
Task-number: QTCREATORBUG-18931
Task-number: QTCREATORBUG-18657
Task-number: QTCREATORBUG-17187
Task-number: QTCREATORBUG-14881
Change-Id: I53b00258ca06a1d2e57f9379dacc54b310687295
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/tools/clangpchmanagerbackend/source/collectincludesaction.h')
-rw-r--r-- | src/tools/clangpchmanagerbackend/source/collectincludesaction.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/tools/clangpchmanagerbackend/source/collectincludesaction.h b/src/tools/clangpchmanagerbackend/source/collectincludesaction.h index c61dfecb61..9469e16fb0 100644 --- a/src/tools/clangpchmanagerbackend/source/collectincludesaction.h +++ b/src/tools/clangpchmanagerbackend/source/collectincludesaction.h @@ -50,20 +50,21 @@ public: { } - bool BeginSourceFileAction(clang::CompilerInstance &compilerInstance, - llvm::StringRef filename) override + bool BeginSourceFileAction(clang::CompilerInstance &compilerInstance) override { - if (clang::PreprocessOnlyAction::BeginSourceFileAction(compilerInstance, filename)) { + if (clang::PreprocessOnlyAction::BeginSourceFileAction(compilerInstance)) { auto &preprocessor = compilerInstance.getPreprocessor(); auto &headerSearch = preprocessor.getHeaderSearchInfo(); preprocessor.SetSuppressIncludeNotFoundError(true); - auto macroPreprocessorCallbacks = new CollectIncludesPreprocessorCallbacks(headerSearch, - m_includeIds, - m_filePathCache, - m_excludedIncludeUID, - m_alreadyIncludedFileUIDs); + auto macroPreprocessorCallbacks = new CollectIncludesPreprocessorCallbacks( + headerSearch, + m_includeIds, + m_filePathCache, + m_excludedIncludeUID, + m_alreadyIncludedFileUIDs, + compilerInstance.getSourceManager()); preprocessor.addPPCallbacks(std::unique_ptr<clang::PPCallbacks>(macroPreprocessorCallbacks)); |