2 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/gui/painting/qpageranges/CMakeLists.txt b/tests/auto/gui/painting/qpageranges/CMakeLists.txt
index d49c43b783..99ab477eae 100644
--- a/tests/auto/gui/painting/qpageranges/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpageranges/CMakeLists.txt
@@ -1,12 +1,16 @@
 # Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-# Generated from qpageranges.pro.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qpageranges Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qpageranges LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qpageranges
     SOURCES
         tst_qpageranges.cpp
diff --git a/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp b/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp
index 00975906ed..d2dbf990e3 100644
--- a/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp
+++ b/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <qpageranges.h>
@@ -70,7 +70,7 @@ void tst_QPageRanges::addPage()
     QFETCH(PageRangeList, expected);
 
     QPageRanges result;
-    for (int pageNumber : qAsConst(pageNumbers)) {
+    for (int pageNumber : std::as_const(pageNumbers)) {
         if (QByteArrayView(QTest::currentDataTag()) == "invalid")
             QTest::ignoreMessage(QtWarningMsg, "QPageRanges::addPage: 'pageNumber' must be greater than 0");
         result.addPage(pageNumber);
@@ -112,7 +112,7 @@ void tst_QPageRanges::addRange()
     QFETCH(PageRangeList, expected);
 
     QPageRanges result;
-    for (const auto &range : qAsConst(ranges)) {
+    for (const auto &range : std::as_const(ranges)) {
         const QByteArrayView testdata(QTest::currentDataTag());
         if (testdata.startsWith("invalid"))
             QTest::ignoreMessage(QtWarningMsg, "QPageRanges::addRange: 'from' and 'to' must be greater than 0");