Merge remote-tracking branch 'origin/9.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/clangcodemodel/clangdcompletion.cpp

Change-Id: Iaa92bf057d7696d2da10802ff95e80863f3235d8
This commit is contained in:
Eike Ziller
2022-11-14 15:26:20 +01:00
50 changed files with 1629 additions and 1519 deletions

View File

@@ -152,7 +152,11 @@ IAssistProcessor *ClangdCompletionAssistProvider::createProcessor(
if (contextAnalyzer.completionAction()
!= ClangCompletionContextAnalyzer::CompleteIncludePath) {
class NoOpProcessor : public IAssistProcessor {
IAssistProposal *perform(AssistInterface *) override { return nullptr; }
IAssistProposal *perform(AssistInterface *interface) override
{
delete interface;
return nullptr;
}
};
return new NoOpProcessor;
}