1 files changed, 11 insertions, 63 deletions

diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/main.cpp b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/main.cpp
index 8463354af3..fa47ca9fa6 100644
--- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/main.cpp
+++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -566,23 +541,11 @@ void tst_GraphicsViewBenchmark::update_data()
     QTest::addColumn<bool>("subtreeCache");
     QTest::addColumn<int>("rotationAngle");
 
-    QList<ListType> listTypes;
-    listTypes << Simple << Recycling;
-
-    QList<int> listSizes;
-    listSizes << 10 << 50 << 500;
-
-    QList<Theme::Themes> themes;
-    themes << Theme::Blue << Theme::Lime;
-
-    QList<int> rotationAngles;
-    rotationAngles << 0 << 90;
-
     // Generate rows:
-    foreach (ListType listType, listTypes) {
-        foreach (int listSize, listSizes) {
-            foreach (int angle, rotationAngles) {
-                foreach (Theme::Themes theme, themes) {
+    for (ListType listType : {Simple, Recycling}) {
+        for (int listSize : {10, 50, 500}) {
+            for (int angle : {0, 90}) {
+                for (Theme::Themes theme : {Theme::Blue, Theme::Lime}) {
                     for (int toImage = 0; toImage < 2; ++toImage) {
                         for (int cache = 0; cache < 2; ++cache) {
                             QString string = rowString(listSize, listType, theme, toImage, cache, angle);
@@ -638,27 +601,12 @@ void tst_GraphicsViewBenchmark::scroll_data()
     QTest::addColumn<int>("rotationAngle");
     QTest::addColumn<ScrollStep>("scrollStep");
 
-    QList<ListType> listTypes;
-    listTypes << Simple << Recycling;
-
-    QList<int> listSizes;
-    listSizes << 10 << 50 << 500;
-
-    QList<Theme::Themes> themes;
-    themes << Theme::Blue << Theme::Lime;
-
-    QList<int> rotationAngles;
-    rotationAngles << 0 << 90;
-
-    QList<ScrollStep> scrollSteps;
-    scrollSteps << Slow << Normal << Fast;
-
     // Generate rows:
-    foreach (ListType listType, listTypes) {
-        foreach (int listSize, listSizes) {
-            foreach (int angle, rotationAngles) {
-                foreach (ScrollStep step, scrollSteps) {
-                    foreach (Theme::Themes theme, themes) {
+    for (ListType listType : {Simple, Recycling}) {
+        for (int listSize : {10, 50, 500}) {
+            for (int angle : {0, 90}) {
+                for (ScrollStep step : {Slow, Normal, Fast}) {
+                    for (Theme::Themes theme : {Theme::Blue, Theme::Lime}) {
                         for (int cache = 0; cache < 2; ++cache) {
                             QString string = rowString(listSize, listType, theme, cache, angle, step);
                             QTest::newRow(string.toLatin1()) << listSize << listType << theme