diff options
Diffstat (limited to 'tests/auto/render/qray3d')
-rw-r--r-- | tests/auto/render/qray3d/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/auto/render/qray3d/qray3d.pro | 8 | ||||
-rw-r--r-- | tests/auto/render/qray3d/tst_qray3d.cpp | 6 |
3 files changed, 7 insertions, 13 deletions
diff --git a/tests/auto/render/qray3d/CMakeLists.txt b/tests/auto/render/qray3d/CMakeLists.txt index ed2cc6970..21863a119 100644 --- a/tests/auto/render/qray3d/CMakeLists.txt +++ b/tests/auto/render/qray3d/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qray3d Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qray3d LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qray3d SOURCES tst_qray3d.cpp diff --git a/tests/auto/render/qray3d/qray3d.pro b/tests/auto/render/qray3d/qray3d.pro deleted file mode 100644 index 6714b066e..000000000 --- a/tests/auto/render/qray3d/qray3d.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qray3d -CONFIG += testcase -TEMPLATE = app - -SOURCES += \ - tst_qray3d.cpp - -QT += testlib core-private 3dcore 3dcore-private 3drender 3drender-private diff --git a/tests/auto/render/qray3d/tst_qray3d.cpp b/tests/auto/render/qray3d/tst_qray3d.cpp index 874d4c95a..29f0c644b 100644 --- a/tests/auto/render/qray3d/tst_qray3d.cpp +++ b/tests/auto/render/qray3d/tst_qray3d.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2015 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 <QtTest/QtTest> #include <Qt3DRender/private/qray3d_p.h> @@ -492,11 +492,7 @@ void tst_QRay3D::properties() void tst_QRay3D::metaTypes() { int id = qMetaTypeId<Qt3DRender::RayCasting::QRay3D>(); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QVERIFY(QMetaType::fromName("Qt3DRender::RayCasting::QRay3D").id() == id); -#else - QVERIFY(QMetaType::type("Qt3DRender::RayCasting::QRay3D") == id); -#endif QCOMPARE(QByteArray(QMetaType(id).name()), QByteArray("Qt3DRender::RayCasting::QRay3D")); QVERIFY(QMetaType::isRegistered(id)); } |