Merge branch '1.2'

This commit is contained in:
Sergio Martins
2020-12-19 19:02:46 +00:00
6 changed files with 40 additions and 8 deletions

View File

@@ -116,10 +116,10 @@ void QWidgetAdapter::itemChange(QQuickItem::ItemChange change, const QQuickItem:
}
}
void QWidgetAdapter::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
void QWidgetAdapter::QQUICKITEMgeometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
{
// Send a few events manually, since QQuickItem doesn't do it for us.
QQuickItem::geometryChanged(newGeometry, oldGeometry);
QQuickItem::QQUICKITEMgeometryChanged(newGeometry, oldGeometry);
// Not calling event() directly, otherwise it would skip event filters