feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	src/libs/utils/processreaper.cpp
	src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
	src/plugins/cmakeprojectmanager/cmakeprocess.cpp

Change-Id: Ie248bcb02a80f3e02ab19d73033ce2ba31e7fd83
This commit is contained in:
Eike Ziller
2021-09-07 08:56:42 +02:00
parent d739ba8a7d 93857c279c
commit 8e51295959
101 changed files with 1050 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -68,6 +68,7 @@
#include <QMenu>
#include <QTextBlock>
#include <QTimer>
#include <QtDebug>
using namespace CppEditor;
using namespace LanguageClient;
@@ -381,7 +382,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());
}