Merge remote-tracking branch 'origin/6.0'

Change-Id: Ia7fc255ee8680e6beac5d4d878f446fe40873183
2021-11-08 09:46:57 +01:00
parent 78552e5848 e0c115fb9b
commit 3b9b9bdc0b
130 changed files with 1693 additions and 173 deletions
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -928,6 +928,7 @@ public:
        m_started = false;
        qCDebug(clangdLogTiming).noquote().nospace() << m_task << ": took " << m_elapsedMs
                                                     << " ms in UI thread";
+        m_elapsedMs = 0;
    }
    void startSubtask()
    {