From 319daa2612dcdd205e271cf2b4b5bf4532fad163 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 17 Apr 2018 11:53:55 +0200 Subject: Clang: Require LLVM/Clang >= 6.0.0 Adapt versions and tests, remove code assuming clang < 6.0. Switch also to our custom repositories instead of dealing with patch files. LLVM/Clang 6 was released on 09 Mar 2018. Task-number: QTCREATORBUG-18535 Task-number: QTCREATORBUG-18552 Change-Id: I0ec2c2f56265e161ae7cbb5b03e7b8a182ba6cc6 Reviewed-by: Ivan Donchevskii --- src/tools/clangbackend/source/sourcelocation.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/tools/clangbackend/source/sourcelocation.cpp') diff --git a/src/tools/clangbackend/source/sourcelocation.cpp b/src/tools/clangbackend/source/sourcelocation.cpp index 2450dcf590..7fbe8c03eb 100644 --- a/src/tools/clangbackend/source/sourcelocation.cpp +++ b/src/tools/clangbackend/source/sourcelocation.cpp @@ -93,8 +93,6 @@ SourceLocation::SourceLocation(CXTranslationUnit cxTranslationUnit, return; filePath_ = ClangString(clang_getFileName(cxFile)); -// CLANG-UPGRADE-CHECK: Remove HAS_GETFILECONTENTS_BACKPORTED check once we require clang >= 7.0 -#if defined(CINDEX_VERSION_HAS_GETFILECONTENTS_BACKPORTED) || CINDEX_VERSION_MINOR >= 47 if (column_ > 1) { const uint lineStart = offset_ + 1 - column_; const char *contents = clang_getFileContents(cxTranslationUnit, cxFile, nullptr); @@ -106,7 +104,6 @@ SourceLocation::SourceLocation(CXTranslationUnit cxTranslationUnit, column_ = static_cast(QString::fromUtf8(&contents[lineStart], static_cast(column_)).size()); } -#endif } SourceLocation::SourceLocation(CXTranslationUnit cxTranslationUnit, -- cgit v1.2.1