Merge remote-tracking branch 'origin/7.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic02df53b880d0861d9d9ea0df3e0d381ae99f350
This commit is contained in:
Eike Ziller
2022-03-11 09:50:48 +01:00
184 changed files with 3566 additions and 908 deletions

View File

@@ -1085,9 +1085,10 @@ bool Client::hasDiagnostic(const LanguageServerProtocol::DocumentUri &uri,
}
void Client::setDiagnosticsHandlers(const TextMarkCreator &textMarkCreator,
const HideDiagnosticsHandler &hideHandler)
const HideDiagnosticsHandler &hideHandler,
const DiagnosticsFilter &filter)
{
m_diagnosticManager.setDiagnosticsHandlers(textMarkCreator, hideHandler);
m_diagnosticManager.setDiagnosticsHandlers(textMarkCreator, hideHandler, filter);
}
void Client::setSemanticTokensHandler(const SemanticTokensHandler &handler)