2 files changed, 17 insertions, 11 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt
index 0554d62807..c4ffe216f5 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Generated from qgraphicsgridlayout.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qgraphicsgridlayout Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qgraphicsgridlayout LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qgraphicsgridlayout
     SOURCES
         tst_qgraphicsgridlayout.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
         Qt::Widgets
 )
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index 04d1d0da59..c91a0803ee 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 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>
@@ -1658,7 +1658,7 @@ void tst_QGraphicsGridLayout::sizeHint()
     widget->setContentsMargins(0, 0, 0, 0);
 
     int i;
-    for (i = 0; i < itemDescriptions.count(); ++i) {
+    for (i = 0; i < itemDescriptions.size(); ++i) {
         ItemDesc desc = itemDescriptions.at(i);
         RectWidget *item = new RectWidget(widget);
         desc.apply(layout, item);
@@ -2159,7 +2159,7 @@ void tst_QGraphicsGridLayout::defaultStretchFactors()
     widget->setContentsMargins(0, 0, 0, 0);
 
     int i;
-    for (i = 0; i < itemDescriptions.count(); ++i) {
+    for (i = 0; i < itemDescriptions.size(); ++i) {
         ItemDesc desc = itemDescriptions.at(i);
         RectWidget *item = new RectWidget(widget);
         desc.apply(layout, item);
@@ -2174,7 +2174,7 @@ void tst_QGraphicsGridLayout::defaultStretchFactors()
         widget->resize(newSize);
 
     QApplication::sendPostedEvents(0, 0);
-    for (i = 0; i < expectedSizes.count(); ++i) {
+    for (i = 0; i < expectedSizes.size(); ++i) {
         QSizeF itemSize = layout->itemAt(i)->geometry().size();
         QCOMPARE(itemSize, expectedSizes.at(i));
     }
@@ -2318,7 +2318,7 @@ void tst_QGraphicsGridLayout::alignment2()
     widget->setContentsMargins(0, 0, 0, 0);
 
     int i;
-    for (i = 0; i < itemDescriptions.count(); ++i) {
+    for (i = 0; i < itemDescriptions.size(); ++i) {
         ItemDesc desc = itemDescriptions.at(i);
         RectWidget *item = new RectWidget(widget);
         desc.apply(layout, item);
@@ -2333,7 +2333,7 @@ void tst_QGraphicsGridLayout::alignment2()
         widget->resize(newSize);
 
     QApplication::sendPostedEvents(0, 0);
-    for (i = 0; i < expectedGeometries.count(); ++i) {
+    for (i = 0; i < expectedGeometries.size(); ++i) {
         QRectF itemRect = layout->itemAt(i)->geometry();
         QCOMPARE(itemRect, expectedGeometries.at(i));
     }
@@ -2896,7 +2896,7 @@ void tst_QGraphicsGridLayout::geometries()
     widget->setContentsMargins(0, 0, 0, 0);
 
     int i;
-    for (i = 0; i < itemDescriptions.count(); ++i) {
+    for (i = 0; i < itemDescriptions.size(); ++i) {
         ItemDesc desc = itemDescriptions.at(i);
         RectWidget *item = new RectWidget(widget);
         desc.apply(layout, item);
@@ -2911,7 +2911,7 @@ void tst_QGraphicsGridLayout::geometries()
         widget->resize(newSize);
 
     QApplication::processEvents();
-    for (i = 0; i < expectedGeometries.count(); ++i) {
+    for (i = 0; i < expectedGeometries.size(); ++i) {
         QRectF itemRect = layout->itemAt(i)->geometry();
         QCOMPARE(itemRect, expectedGeometries.at(i));
     }
@@ -3156,7 +3156,6 @@ void tst_QGraphicsGridLayout::heightForWidthWithSpanning()
     QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(200, -1)), QSizeF(200, 100));
 }
 
-Q_DECLARE_METATYPE(QSizePolicy::Policy)
 void tst_QGraphicsGridLayout::spanningItem2x2_data()
 {
     QTest::addColumn<QSizePolicy::Policy>("sizePolicy");