Merge remote-tracking branch 'origin/5.0'

Conflicts:
	src/plugins/coreplugin/locator/executefilter.cpp

Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
This commit is contained in:
Eike Ziller
2021-08-11 10:10:51 +02:00
104 changed files with 1405 additions and 552 deletions

View File

@@ -96,11 +96,13 @@ CorePlugin::CorePlugin()
qRegisterMetaType<Utils::CommandLine>();
qRegisterMetaType<Utils::FilePath>();
m_instance = this;
m_reaper = new ProcessReapers;
setupSystemEnvironment();
}
CorePlugin::~CorePlugin()
{
delete m_reaper;
IWizardFactory::destroyFeatureProvider();
Find::destroy();