Merge remote-tracking branch 'origin/4.14'

Change-Id: I7d55c01489dfcdd26fcf3ced9f26539a09073e8c
This commit is contained in:
Orgad Shaneh
2021-02-06 22:35:18 +02:00
7 changed files with 31 additions and 20 deletions

View File

@@ -1023,6 +1023,8 @@ void MainWindow::updateContextObject(const QList<IContext *> &context)
void MainWindow::aboutToShutdown()
{
disconnect(qApp, &QApplication::focusChanged, this, &MainWindow::updateFocusWidget);
for (auto contextPair : m_contextWidgets)
disconnect(contextPair.second, &QObject::destroyed, this, nullptr);
m_activeContext.clear();
hide();
}