Merge remote-tracking branch 'origin/6.0'

Change-Id: I0eae76ecff1a315877e4fdd471f0de3a3a55f180
2021-11-24 11:37:12 +01:00
parent c65ec79481 153dd2fe0b
commit 56009b8b15
62 changed files with 606 additions and 249 deletions
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -1256,6 +1256,8 @@ void ClangdTestHighlighting::test_data()
                                      << QList<int>{C_STRING} << 0;
    QTest::newRow("string literal passed to macro from header file") << 854 << 32 << 854 << 38
                                      << QList<int>{C_STRING} << 0;
+    QTest::newRow("user-defined operator call") << 860 << 7 << 860 << 8
+                                      << QList<int>{C_LOCAL} << 0;
 }

 void ClangdTestHighlighting::test()