diff options
Diffstat (limited to 'src/widgets/graphicsview/qgraphicswidget.cpp')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicswidget.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index 8ffb60411c..db1cdd42ab 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -251,7 +251,8 @@ QGraphicsWidget::~QGraphicsWidget() //we check if we have a layout previously if (d->layout) { QGraphicsLayout *temp = d->layout; - foreach (QGraphicsItem * item, childItems()) { + const auto items = childItems(); + for (QGraphicsItem *item : items) { // In case of a custom layout which doesn't remove and delete items, we ensure that // the parent layout item does not point to the deleted layout. This code is here to // avoid regression from 4.4 to 4.5, because according to 4.5 docs it is not really needed. @@ -2056,7 +2057,11 @@ void QGraphicsWidget::insertAction(QAction *before, QAction *action) \sa removeAction(), QMenu, insertAction(), QWidget::insertActions() */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +void QGraphicsWidget::insertActions(QAction *before, const QList<QAction *> &actions) +#else void QGraphicsWidget::insertActions(QAction *before, QList<QAction *> actions) +#endif { for (int i = 0; i < actions.count(); ++i) insertAction(before, actions.at(i)); |