Merge remote-tracking branch 'origin/4.14'

Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
This commit is contained in:
Eike Ziller
2020-11-19 15:38:13 +01:00
271 changed files with 2816 additions and 1016 deletions

View File

@@ -832,7 +832,8 @@ void GraphicsScene::addWarningItem(WarningItem *item)
if (!m_allWarnings.contains(item)) {
m_allWarnings << item;
if (!m_autoLayoutRunning && !m_initializing)
QMetaObject::invokeMethod(this, "warningVisibilityChanged", Qt::QueuedConnection, Q_ARG(int, 0));
QMetaObject::invokeMethod(this, [this] { warningVisibilityChanged(0); },
Qt::QueuedConnection);
}
}
@@ -841,7 +842,8 @@ void GraphicsScene::removeWarningItem(WarningItem *item)
m_allWarnings.removeAll(item);
if (!m_autoLayoutRunning && !m_initializing)
QMetaObject::invokeMethod(this, "warningVisibilityChanged", Qt::QueuedConnection, Q_ARG(int, 0));
QMetaObject::invokeMethod(this, [this] { warningVisibilityChanged(0); },
Qt::QueuedConnection);
}
void GraphicsScene::warningVisibilityChanged(int type, WarningItem *item)