Merge remote-tracking branch 'origin/6.0'

Change-Id: I773141d47e3f2b773da51f2e26ef53b93bb28f90
2021-11-22 13:17:33 +01:00
parent 1d785d6687 470beadce1
commit 4de74a67ee
41 changed files with 177 additions and 129 deletions
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -636,7 +636,7 @@ void ClangdTestTooltips::test()
        helpItem = h;
        loop.quit();
    };
-    connect(client(), &ClangdClient::helpItemGathered, handler);
+    connect(client(), &ClangdClient::helpItemGathered, &loop, handler);

    QTextCursor cursor(doc->document());
    const int pos = Utils::Text::positionInText(doc->document(), line, column);