tst_QAccessibility: compile with QT_NO_FOREACH
QObject::children() returns a const QList&, and nothing in the loop body changes the objects children, so straightforward port to ranged-for. Task-number: QTBUG-115839 Change-Id: I78827fd986d6ff2607cc2616ff23580c9d830f1b Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
This commit is contained in:
parent
bfca8c6d24
commit
788d19439b
@ -1,8 +1,6 @@
|
||||
// Copyright (C) 2016 The Qt Company Ltd.
|
||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||
|
||||
#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
#ifdef Q_OS_WIN
|
||||
# include <QtCore/qt_windows.h>
|
||||
@ -3453,7 +3451,7 @@ void tst_QAccessibility::calendarWidgetTest()
|
||||
QCOMPARE(interface->rect(), globalGeometry);
|
||||
|
||||
QWidget *navigationBar = 0;
|
||||
foreach (QObject *child, calendarWidget.children()) {
|
||||
for (QObject *child : calendarWidget.children()) {
|
||||
if (child->objectName() == QLatin1String("qt_calendar_navigationbar")) {
|
||||
navigationBar = static_cast<QWidget *>(child);
|
||||
break;
|
||||
@ -3463,7 +3461,7 @@ void tst_QAccessibility::calendarWidgetTest()
|
||||
QVERIFY(verifyChild(navigationBar, interface, 0, globalGeometry));
|
||||
|
||||
QAbstractItemView *calendarView = 0;
|
||||
foreach (QObject *child, calendarWidget.children()) {
|
||||
for (QObject *child : calendarWidget.children()) {
|
||||
if (child->objectName() == QLatin1String("qt_calendar_calendarview")) {
|
||||
calendarView = static_cast<QAbstractItemView *>(child);
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user