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 <ivan.donchevskii@qt.io>

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/unit/unittest/creator_dependency.pri b/tests/unit/unittest/creator_dependency.pri
index ae82403f00..27cd586853 100644
--- a/tests/unit/unittest/creator_dependency.pri
+++ b/tests/unit/unittest/creator_dependency.pri
@@ -19,7 +19,7 @@ include($$PWD/../../../src/shared/clang/clang_defines.pri)
 include($$PWD/../../../src/tools/clangbackend/source/clangbackendclangipc-source.pri)
 include($$PWD/../../../src/plugins/clangcodemodel/clangcodemodelunittestfiles.pri)
 } else {
-DEFINES += CLANG_VERSION=\\\"5.0.0\\\"
+DEFINES += CLANG_VERSION=\\\"6.0.0\\\"
 DEFINES += "\"CLANG_RESOURCE_DIR=\\\"/usr/include\\\"\""
 }
 
diff --git a/tests/unit/unittest/skippedsourceranges-test.cpp b/tests/unit/unittest/skippedsourceranges-test.cpp
index 554ec90bb4..2082c98316 100644
--- a/tests/unit/unittest/skippedsourceranges-test.cpp
+++ b/tests/unit/unittest/skippedsourceranges-test.cpp
@@ -148,7 +148,7 @@ TEST_F(SkippedSourceRanges, DISABLED_ON_WINDOWS(RangeOne))
 {
     auto ranges = skippedSourceRanges.sourceRanges();
 
-    ASSERT_THAT(ranges[0].start(), IsSourceLocation(filePath, 1, 2, 1));
+    ASSERT_THAT(ranges[0].start(), IsSourceLocation(filePath, 1, 1, 0));
     ASSERT_THAT(ranges[0].end(), IsSourceLocation(filePath, 5, 1, 18));
 }
 
@@ -156,7 +156,7 @@ TEST_F(SkippedSourceRanges, DISABLED_ON_WINDOWS(RangeTwo))
 {
     auto ranges = skippedSourceRanges.sourceRanges();
 
-    ASSERT_THAT(ranges[1].start(), IsSourceLocation(filePath, 7, 2, 27));
+    ASSERT_THAT(ranges[1].start(), IsSourceLocation(filePath, 7, 1, 26));
     ASSERT_THAT(ranges[1].end(), IsSourceLocation(filePath, 12, 1, 57));
 }