Merge "Merge remote-tracking branch 'origin/5.0'"

This commit is contained in:
The Qt Project
2021-09-07 10:06:01 +00:00
101 changed files with 1050 additions and 663 deletions

View File

@@ -71,6 +71,7 @@
#include <QMenu>
#include <QTextBlock>
#include <QTimer>
#include <QtDebug>
using namespace CppEditor;
using namespace LanguageClient;
@@ -385,7 +386,7 @@ ClangdClient *ClangModelManagerSupport::clientForProject(
&& c->state() != Client::ShutdownRequested
&& c->state() != Client::Shutdown;
});
QTC_CHECK(clients.size() <= 1);
QTC_ASSERT(clients.size() <= 1, qDebug() << project << clients.size());
return clients.empty() ? nullptr : qobject_cast<ClangdClient *>(clients.first());
}