3 files changed, 16 insertions, 44 deletions
diff --git a/tests/auto/render/geometry/CMakeLists.txt b/tests/auto/render/geometry/CMakeLists.txt
index 2413e29ae..db9d8cd05 100644
--- a/tests/auto/render/geometry/CMakeLists.txt
+++ b/tests/auto/render/geometry/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 # Generated from geometry.pro.
 
 # special case skip regeneration
@@ -6,10 +9,16 @@
 ## tst_geometry Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qt3d_geometry LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qt3d_geometry
     SOURCES
         tst_geometry.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::3DRender
diff --git a/tests/auto/render/geometry/geometry.pro b/tests/auto/render/geometry/geometry.pro
deleted file mode 100644
index 575a41e66..000000000
--- a/tests/auto/render/geometry/geometry.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-
-TARGET = tst_geometry
-
-QT += 3dcore 3dcore-private 3drender 3drender-private testlib
-
-CONFIG += testcase
-
-SOURCES += tst_geometry.cpp
-
-include(../../core/common/common.pri)
-include(../commons/commons.pri)
diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp
index aa856da39..515b0e65f 100644
--- a/tests/auto/render/geometry/tst_geometry.cpp
+++ b/tests/auto/render/geometry/tst_geometry.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module 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) 2015 Klaralvdalens Datakonsult AB (KDAB).
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 // TODO Remove in Qt6
 #include <QtCore/qcompilerdetection.h>
@@ -79,7 +54,7 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(renderGeometry.peerId(), geometry.id());
         QCOMPARE(renderGeometry.isDirty(), true);
-        QCOMPARE(renderGeometry.attributes().count(), 4);
+        QCOMPARE(renderGeometry.attributes().size(), 4);
         QCOMPARE(renderGeometry.boundingPositionAttribute(), attr1.id());
 
         Qt3DCore::QNodeIdVector attribs = Qt3DCore::qIdsForNodes(geometry.attributes());
@@ -159,7 +134,7 @@ private Q_SLOTS:
         renderGeometry.syncFromFrontEnd(&geometry, false);
 
         // THEN
-        QCOMPARE(renderGeometry.attributes().count(), 1);
+        QCOMPARE(renderGeometry.attributes().size(), 1);
         QVERIFY(renderGeometry.isDirty());
         QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::GeometryDirty);
         renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
@@ -172,7 +147,7 @@ private Q_SLOTS:
         renderGeometry.syncFromFrontEnd(&geometry, false);
 
         // THEN
-        QCOMPARE(renderGeometry.attributes().count(), 0);
+        QCOMPARE(renderGeometry.attributes().size(), 0);
         QVERIFY(renderGeometry.isDirty());
         QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::GeometryDirty);
         renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
@@ -204,7 +179,7 @@ private Q_SLOTS:
         renderGeometry.updateExtent(QVector3D(-1.0f, -1.0f, -1.0f), QVector3D(1.0f, 1.0f, 1.0f));
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes().count(), 0);
+        QCOMPARE(arbiter.dirtyNodes().size(), 0);
 
         QCOMPARE(renderGeometry.min(), QVector3D(-1.0f, -1.0f, -1.0f));
         QCOMPARE(renderGeometry.max(), QVector3D(1.0f, 1.0f, 1.0f));