1 files changed, 5 insertions, 30 deletions
diff --git a/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp b/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp
index b6f7d693b9..67bef8ebfe 100644
--- a/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp
+++ b/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 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) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "paintcommands.h"
 
@@ -96,7 +71,7 @@ tst_LanceBench::tst_LanceBench()
 
 void tst_LanceBench::initTestCase()
 {
-    QString baseDir = QFINDTESTDATA("../../../../auto/other/lancelot/scripts/text.qps");
+    QString baseDir = QFINDTESTDATA("../../../../baseline/painting/scripts/text.qps");
     scriptsDir = baseDir.left(baseDir.lastIndexOf('/')) + '/';
     QDir qpsDir(scriptsDir);
     qpsFiles = qpsDir.entryList(QStringList() << QLatin1String("*.qps"), QDir::Files | QDir::Readable);
@@ -106,7 +81,7 @@ void tst_LanceBench::initTestCase()
     }
 
     std::sort(qpsFiles.begin(), qpsFiles.end());
-    for (const QString& fileName : qAsConst(qpsFiles)) {
+    for (const QString& fileName : std::as_const(qpsFiles)) {
         QFile file(scriptsDir + fileName);
         file.open(QFile::ReadOnly);
         QByteArray cont = file.readAll();
@@ -262,7 +237,7 @@ void tst_LanceBench::testCoreOpenGL()
 void tst_LanceBench::setupTestSuite(const QStringList& blacklist)
 {
     QTest::addColumn<QString>("qpsFile");
-    for (const QString &fileName : qAsConst(qpsFiles)) {
+    for (const QString &fileName : std::as_const(qpsFiles)) {
         if (blacklist.contains(fileName))
             continue;
         QTest::newRow(fileName.toLatin1()) << fileName;