diff options
| author | Christian Kandeler <[email protected]> | 2024-05-22 15:00:50 +0200 |
|---|---|---|
| committer | Christian Kandeler <[email protected]> | 2024-05-24 07:58:22 +0000 |
| commit | 8577ab8bcb555929471ab989c26772818b59096a (patch) | |
| tree | 7d7a448d87e2d03b36dfff40236e44e8fc5eef9a /src/plugins/clangcodemodel/test | |
| parent | 01568f5d751f8ccfc5d60adb22d0f71214d6ad2b (diff) | |
ClangCodeModel: Bump minimum clangd version
... and throw away old workarounds.
The current clangd version, to be shipped with Qt Creator 14, is 18.1, so
we can safely bump the minimum version to 17.
Change-Id: I74fd5997196d774b6c47dcb522284953ef82ad9c
Reviewed-by: David Schulz <[email protected]>
Diffstat (limited to 'src/plugins/clangcodemodel/test')
| -rw-r--r-- | src/plugins/clangcodemodel/test/clangdtests.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp index f18c1641559..84a155b5353 100644 --- a/src/plugins/clangcodemodel/test/clangdtests.cpp +++ b/src/plugins/clangcodemodel/test/clangdtests.cpp @@ -1107,8 +1107,7 @@ void ClangdTestHighlighting::test_data() QTest::newRow("call to function pointer alias") << 344 << 5 << 344 << 13 << QList<int>{C_TYPE} << 0; QTest::newRow("friend class declaration") << 350 << 18 << 350 << 27 - << (client()->versionNumber().majorVersion() >= 16 - ? QList<int>{C_TYPE, C_DECLARATION}: QList<int>{C_TYPE}) << 0; + << QList<int>{C_TYPE, C_DECLARATION} << 0; QTest::newRow("friend class reference") << 351 << 34 << 351 << 43 << QList<int>{C_TYPE} << 0; QTest::newRow("function parameter of friend class type") << 351 << 45 << 351 << 50 @@ -1374,10 +1373,6 @@ void ClangdTestHighlighting::test_data() << QList<int>{C_PUNCTUATION} << int(CppEditor::SemanticHighlighter::AngleBracketClose); QTest::newRow("macro in struct") << 795 << 9 << 795 << 14 << QList<int>{C_MACRO, C_DECLARATION} << 0; - if (client()->versionNumber() < QVersionNumber(17)) { - QTest::newRow("#ifdef'ed out code") << 800 << 1 << 800 << 17 - << QList<int>{C_DISABLED_CODE} << 0; - } QTest::newRow("static function call (object)") << 819 << 5 << 819 << 6 << QList<int>{C_LOCAL} << 0; QTest::newRow("static function call (argument)") << 819 << 18 << 819 << 19 |