summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/boundingsphere
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/render/boundingsphere')
-rw-r--r--tests/auto/render/boundingsphere/CMakeLists.txt6
-rw-r--r--tests/auto/render/boundingsphere/boundingsphere.pro17
-rw-r--r--tests/auto/render/boundingsphere/cube.qml2
-rw-r--r--tests/auto/render/boundingsphere/sphere.qml2
-rw-r--r--tests/auto/render/boundingsphere/tst_boundingsphere.cpp2
5 files changed, 9 insertions, 20 deletions
diff --git a/tests/auto/render/boundingsphere/CMakeLists.txt b/tests/auto/render/boundingsphere/CMakeLists.txt
index d818816d7..1360252f7 100644
--- a/tests/auto/render/boundingsphere/CMakeLists.txt
+++ b/tests/auto/render/boundingsphere/CMakeLists.txt
@@ -7,6 +7,12 @@
## tst_boundingsphere Test:
#####################################################################
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(tst_boundingsphere LANGUAGES CXX)
+ find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
qt_internal_add_test(tst_boundingsphere
SOURCES
../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h
diff --git a/tests/auto/render/boundingsphere/boundingsphere.pro b/tests/auto/render/boundingsphere/boundingsphere.pro
deleted file mode 100644
index cebba17e7..000000000
--- a/tests/auto/render/boundingsphere/boundingsphere.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = app
-
-TARGET = tst_boundingsphere
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras testlib
-
-CONFIG += testcase
-
-SOURCES += tst_boundingsphere.cpp
-
-include(../commons/commons.pri)
-include(../../core/common/common.pri)
-include(../qmlscenereader/qmlscenereader.pri)
-# Extra dependencies to build test scenes needed by the tests
-QT += quick 3dquick 3dquick-private 3dextras 3dquickextras
-
-RESOURCES += \
- boundingsphere.qrc
diff --git a/tests/auto/render/boundingsphere/cube.qml b/tests/auto/render/boundingsphere/cube.qml
index b023ccf0a..24eb6f96f 100644
--- a/tests/auto/render/boundingsphere/cube.qml
+++ b/tests/auto/render/boundingsphere/cube.qml
@@ -1,5 +1,5 @@
// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
import Qt3D.Core 2.0
import Qt3D.Render 2.0
diff --git a/tests/auto/render/boundingsphere/sphere.qml b/tests/auto/render/boundingsphere/sphere.qml
index e7fa9f5cc..2c69dfb5c 100644
--- a/tests/auto/render/boundingsphere/sphere.qml
+++ b/tests/auto/render/boundingsphere/sphere.qml
@@ -1,5 +1,5 @@
// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
import Qt3D.Core 2.0
import Qt3D.Render 2.0
diff --git a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
index 689bffc8f..a3ffb206c 100644
--- a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
+++ b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
-// 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 "qmlscenereader.h"
#include "testarbiter.h"