diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-08-23 16:39:29 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-08-23 16:43:58 +0200 |
| commit | e2736212a7762d8c6d474d64bec1df87799cf33b (patch) | |
| tree | 9d5c88e10d32fd872c3ab6b8d312fc9f350c26d4 /src/quick/accessible/qaccessiblequickitem.cpp | |
| parent | 3eed20c22ee046c42fec81b0d9d6e47a27bdbe03 (diff) | |
| parent | 8eeede619f417904cbd33fd44143f857dfce0996 (diff) | |
Merge branch remote-tracking branch '5.8' into wip/pointerhandler
Change-Id: I1750ed28c5fda878a0a8f2b7bfe4c580c0b7ffe3
Diffstat (limited to 'src/quick/accessible/qaccessiblequickitem.cpp')
| -rw-r--r-- | src/quick/accessible/qaccessiblequickitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp index a56d098717..acea958e20 100644 --- a/src/quick/accessible/qaccessiblequickitem.cpp +++ b/src/quick/accessible/qaccessiblequickitem.cpp @@ -160,9 +160,9 @@ int QAccessibleQuickItem::indexOfChild(const QAccessibleInterface *iface) const static void unignoredChildren(QQuickItem *item, QList<QQuickItem *> *items, bool paintOrder) { - QList<QQuickItem*> childItems = paintOrder ? QQuickItemPrivate::get(item)->paintOrderChildItems() + const QList<QQuickItem*> childItems = paintOrder ? QQuickItemPrivate::get(item)->paintOrderChildItems() : item->childItems(); - Q_FOREACH (QQuickItem *child, childItems) { + for (QQuickItem *child : childItems) { if (QQuickItemPrivate::get(child)->isAccessible) { items->append(child); } else { |