Merge remote-tracking branch 'origin/4.12'

Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
This commit is contained in:
Eike Ziller
2020-05-04 10:52:34 +02:00
30 changed files with 331 additions and 128 deletions

View File

@@ -386,6 +386,10 @@ public:
// This triggers activity in the EngineManager which
// recognizes the rampdown by the m_perpective == nullptr above.
perspective->destroy();
// disconnect the follow font size connection
TextEditorSettings::instance()->disconnect(this);
delete perspective;
}