diff options
Diffstat (limited to 'tests/auto/render')
471 files changed, 2397 insertions, 8220 deletions
diff --git a/tests/auto/render/CMakeLists.txt b/tests/auto/render/CMakeLists.txt index 3a1075139..9285364f2 100644 --- a/tests/auto/render/CMakeLists.txt +++ b/tests/auto/render/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from render.pro. if(QT_FEATURE_private_tests) @@ -105,8 +108,6 @@ if(QT_FEATURE_private_tests) add_subdirectory(uniform) add_subdirectory(vsyncframeadvanceservice) add_subdirectory(waitfence) -endif() -if(QT_FEATURE_private_tests AND NOT QT_FEATURE_qt3d_simd_avx2) add_subdirectory(qray3d) add_subdirectory(raycasting) add_subdirectory(triangleboundingvolume) @@ -140,9 +141,7 @@ if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_input AND QT_FEATURE_qt3d_opengl add_subdirectory(qscene2d) add_subdirectory(scene2d) endif() -if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_opengl_renderer AND QT_FEATURE_qt3d_simd_avx2) - add_subdirectory(alignedresourcesmanagers-avx) -endif() -if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_opengl_renderer AND QT_FEATURE_qt3d_simd_sse2 AND NOT QT_FEATURE_qt3d_simd_avx2) +if(QT_FEATURE_private_tests AND NOT (CMAKE_OSX_ARCHITECTURES MATCHES ";") AND + (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64)) add_subdirectory(alignedresourcesmanagers-sse) endif() diff --git a/tests/auto/render/alignedresourcesmanagers-avx/CMakeLists.txt b/tests/auto/render/alignedresourcesmanagers-avx/CMakeLists.txt deleted file mode 100644 index 015bd6334..000000000 --- a/tests/auto/render/alignedresourcesmanagers-avx/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Generated from alignedresourcesmanagers-avx.pro. - -##################################################################### -## tst_alignedresourcesmanagers-avx Test: -##################################################################### - -qt_internal_add_test(tst_alignedresourcesmanagers-avx - SOURCES - tst_alignedresourcesmanagers-avx.cpp - PUBLIC_LIBRARIES - Qt::3DCore - Qt::3DCorePrivate - Qt::3DRender - Qt::3DRenderPrivate - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:alignedresourcesmanagers-avx.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/auto/render/alignedresourcesmanagers-avx/alignedresourcesmanagers-avx.pro b/tests/auto/render/alignedresourcesmanagers-avx/alignedresourcesmanagers-avx.pro deleted file mode 100644 index 28ec7337d..000000000 --- a/tests/auto/render/alignedresourcesmanagers-avx/alignedresourcesmanagers-avx.pro +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = tst_alignedresourcesmanagers-avx -CONFIG += testcase simd -TEMPLATE = app - -SOURCES += tst_alignedresourcesmanagers-avx.cpp - -QT += testlib 3dcore 3dcore-private 3drender 3drender-private - -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2 diff --git a/tests/auto/render/alignedresourcesmanagers-avx/tst_alignedresourcesmanagers-avx.cpp b/tests/auto/render/alignedresourcesmanagers-avx/tst_alignedresourcesmanagers-avx.cpp deleted file mode 100644 index f8197a5b5..000000000 --- a/tests/auto/render/alignedresourcesmanagers-avx/tst_alignedresourcesmanagers-avx.cpp +++ /dev/null @@ -1,123 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Paul Lemire <paul.lemire350@gmail.com> -** 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$ -** -****************************************************************************/ - -#include <QtTest/QtTest> -#include <Qt3DCore/qnodeid.h> -#include <Qt3DCore/private/matrix4x4_avx2_p.h> -#include <Qt3DCore/private/qresourcemanager_p.h> -#include <Qt3DRender/private/cameralens_p.h> - -using namespace Qt3DCore; - -using HMatrix = Qt3DCore::QHandle<Matrix4x4_AVX2>; -using HCameraLens = Qt3DCore::QHandle<Qt3DRender::Render::CameraLens>; - -class MatrixManager : public Qt3DCore::QResourceManager< - Matrix4x4_AVX2, - Qt3DCore::QNodeId, - Qt3DCore::NonLockingPolicy> -{ -public: - MatrixManager() {} -}; - -class CameraLensManager : public Qt3DCore::QResourceManager< - Qt3DRender::Render::CameraLens, - Qt3DCore::QNodeId, - Qt3DCore::NonLockingPolicy> -{ -public: - CameraLensManager() {} -}; - - -class tst_AlignedResourcesManagersAVX: public QObject -{ - Q_OBJECT - -private Q_SLOTS: - - void checkAllocationAndAlignmentMatrix4x4() - { - // GIVEN - MatrixManager manager; - - // WHEN - for (uint i = 0; i < std::numeric_limits<ushort>::max(); ++i) - manager.getOrCreateResource(Qt3DCore::QNodeId::createId()); - - // THEN - // Shouldn't crash - - const std::vector<HMatrix> &activeHandles = manager.activeHandles(); - for (const HMatrix handle : activeHandles) { - // WHEN - Matrix4x4_AVX2 *mat = manager.data(handle); - // THEN - QCOMPARE(int((uintptr_t)mat % 32), 0); - } - - // WHEN - for (uint i = 2; i < std::numeric_limits<ushort>::max(); ++i) { - Matrix4x4_AVX2 *mat1 = manager.data(activeHandles.at(i - 2)); - Matrix4x4_AVX2 *mat2 = manager.data(activeHandles.at(i - 1)); - Matrix4x4_AVX2 *mat3 = manager.data(activeHandles.at(i)); - - // WHEN - *mat3 = (*mat2 * *mat1); - - // THEN - // Shouldn't crash - } - } - - void checkAllocationAndAlignmentCameraLens() - { - // GIVEN - CameraLensManager manager; - - // WHEN - for (uint i = 0; i < std::numeric_limits<ushort>::max(); ++i) - manager.getOrCreateResource(Qt3DCore::QNodeId::createId()); - - // THEN - // Shouldn't crash - - const std::vector<HCameraLens> &activeHandles = manager.activeHandles(); - for (const HCameraLens handle : activeHandles) { - // WHEN - Qt3DRender::Render::CameraLens *lens = manager.data(handle); - // THEN - QCOMPARE(int((uintptr_t)lens % 32), 0); - } - } -}; - -QTEST_MAIN(tst_AlignedResourcesManagersAVX) - -#include "tst_alignedresourcesmanagers-avx.moc" diff --git a/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt b/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt index 992614ac9..95c8371a6 100644 --- a/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt +++ b/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from alignedresourcesmanagers-sse.pro. ##################################################################### ## tst_alignedresourcesmanagers-avx Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_alignedresourcesmanagers-avx LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_alignedresourcesmanagers-avx SOURCES tst_alignedresourcesmanagers-sse.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/alignedresourcesmanagers-sse/alignedresourcesmanagers-sse.pro b/tests/auto/render/alignedresourcesmanagers-sse/alignedresourcesmanagers-sse.pro deleted file mode 100644 index d9a490266..000000000 --- a/tests/auto/render/alignedresourcesmanagers-sse/alignedresourcesmanagers-sse.pro +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = tst_alignedresourcesmanagers-avx -CONFIG += testcase simd -TEMPLATE = app - -SOURCES += tst_alignedresourcesmanagers-sse.cpp - -QT += testlib 3dcore 3dcore-private 3drender 3drender-private - -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2 diff --git a/tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp b/tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp index af5fc1f93..8653b37f6 100644 --- a/tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp +++ b/tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2017 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qnodeid.h> @@ -60,6 +35,7 @@ class tst_AlignedResourcesManagersSSE: public QObject { Q_OBJECT +#ifdef __SSE2__ private Q_SLOTS: void checkAllocationAndAlignmentMatrix4x4() @@ -113,9 +89,14 @@ private Q_SLOTS: // WHEN Qt3DRender::Render::CameraLens *lens = manager.data(handle); // THEN +# ifdef __AVX2__ + QCOMPARE(int((uintptr_t)lens % 32), 0); +# else QCOMPARE(int((uintptr_t)lens % 16), 0); +# endif } } +#endif // __SSE2__ }; QTEST_MAIN(tst_AlignedResourcesManagersSSE) diff --git a/tests/auto/render/armature/CMakeLists.txt b/tests/auto/render/armature/CMakeLists.txt index 9c08e4600..91533b003 100644 --- a/tests/auto/render/armature/CMakeLists.txt +++ b/tests/auto/render/armature/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from armature.pro. ##################################################################### ## tst_armature Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_armature LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_armature SOURCES tst_armature.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/armature/armature.pro b/tests/auto/render/armature/armature.pro deleted file mode 100644 index fc8d69eaa..000000000 --- a/tests/auto/render/armature/armature.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_armature - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_armature.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/armature/tst_armature.cpp b/tests/auto/render/armature/tst_armature.cpp index 055013850..baa0d1ef9 100644 --- a/tests/auto/render/armature/tst_armature.cpp +++ b/tests/auto/render/armature/tst_armature.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/private/armature_p.h> diff --git a/tests/auto/render/aspect/CMakeLists.txt b/tests/auto/render/aspect/CMakeLists.txt index 6416904b7..8fde33fdd 100644 --- a/tests/auto/render/aspect/CMakeLists.txt +++ b/tests/auto/render/aspect/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from aspect.pro. ##################################################################### ## tst_aspect Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_aspect LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_aspect SOURCES tst_aspect.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/aspect/aspect.pro b/tests/auto/render/aspect/aspect.pro deleted file mode 100644 index 1e8a9c042..000000000 --- a/tests/auto/render/aspect/aspect.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_aspect - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_aspect.cpp - -CONFIG += useCommonTestAspect -include(../commons/commons.pri) diff --git a/tests/auto/render/aspect/tst_aspect.cpp b/tests/auto/render/aspect/tst_aspect.cpp index ae8d7f099..fcb22ed47 100644 --- a/tests/auto/render/aspect/tst_aspect.cpp +++ b/tests/auto/render/aspect/tst_aspect.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QMutex> @@ -113,7 +88,7 @@ private Q_SLOTS: 1 + // UpdateLayerEntity 1 + // PickBoundingVolume 1 + // RayCasting - 0 // No skeleton, no scene loading, no geometry, no buffers + 0U // No skeleton, no scene loading, no geometry, no buffers ); // WHEN @@ -127,7 +102,7 @@ private Q_SLOTS: 1 + // UpdateLevelOfDetail 1 + // PickBoundingVolume 1 + // RayCasting - 0 // No skeleton, no scene loading, no geometry, no buffers + 0U // No skeleton, no scene loading, no geometry, no buffers ); // WHEN @@ -147,7 +122,7 @@ private Q_SLOTS: 1 + // UpdateLevelOfDetail 1 + // PickBoundingVolume 1 + // RayCasting - 0 // No skeleton, no scene loading, no geometry, no buffers + 0U // No skeleton, no scene loading, no geometry, no buffers ); // WHEN @@ -165,7 +140,7 @@ private Q_SLOTS: 1 + // UpdateLevelOfDetail 1 + // PickBoundingVolume 1 + // RayCasting - 0 // No skeleton, no scene loading, no geometry, no buffers + 0U // No skeleton, no scene loading, no geometry, no buffers ); // WHEN @@ -182,7 +157,7 @@ private Q_SLOTS: 1 + // UpdateLevelOfDetail 1 + // PickBoundingVolume 1 + // RayCasting - 0 // No skeleton, no scene loading, no geometry, no buffers + 0U // No skeleton, no scene loading, no geometry, no buffers ); } }; diff --git a/tests/auto/render/attribute/CMakeLists.txt b/tests/auto/render/attribute/CMakeLists.txt index b378cabc7..089b19f15 100644 --- a/tests/auto/render/attribute/CMakeLists.txt +++ b/tests/auto/render/attribute/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from attribute.pro. ##################################################################### ## tst_attribute Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_attribute LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_attribute SOURCES tst_attribute.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/attribute/attribute.pro b/tests/auto/render/attribute/attribute.pro deleted file mode 100644 index f92871bbc..000000000 --- a/tests/auto/render/attribute/attribute.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_attribute - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_attribute.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/attribute/tst_attribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp index 0b47f808d..4cc76ee65 100644 --- a/tests/auto/render/attribute/tst_attribute.cpp +++ b/tests/auto/render/attribute/tst_attribute.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 #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/blitframebuffer/CMakeLists.txt b/tests/auto/render/blitframebuffer/CMakeLists.txt index ee06267ab..60a262865 100644 --- a/tests/auto/render/blitframebuffer/CMakeLists.txt +++ b/tests/auto/render/blitframebuffer/CMakeLists.txt @@ -1,9 +1,18 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from blitframebuffer.pro. ##################################################################### ## tst_blitframebuffer Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_blitframebuffer LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_blitframebuffer SOURCES ../commons/testrenderer.cpp ../commons/testrenderer.h @@ -11,7 +20,7 @@ qt_internal_add_test(tst_blitframebuffer INCLUDE_DIRECTORIES ../../core/common ../commons - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/blitframebuffer/blitframebuffer.pro b/tests/auto/render/blitframebuffer/blitframebuffer.pro deleted file mode 100644 index 39531ae9a..000000000 --- a/tests/auto/render/blitframebuffer/blitframebuffer.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_blitframebuffer - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_blitframebuffer.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/blitframebuffer/tst_blitframebuffer.cpp b/tests/auto/render/blitframebuffer/tst_blitframebuffer.cpp index ccac64eea..7e02f9ba3 100644 --- a/tests/auto/render/blitframebuffer/tst_blitframebuffer.cpp +++ b/tests/auto/render/blitframebuffer/tst_blitframebuffer.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/boundingsphere/CMakeLists.txt b/tests/auto/render/boundingsphere/CMakeLists.txt index ae6e831a6..1360252f7 100644 --- a/tests/auto/render/boundingsphere/CMakeLists.txt +++ b/tests/auto/render/boundingsphere/CMakeLists.txt @@ -1,16 +1,25 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from boundingsphere.pro. ##################################################################### ## 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 tst_boundingsphere.cpp INCLUDE_DIRECTORIES ../qmlscenereader - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DExtras 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 11d6d4db1..24eb6f96f 100644 --- a/tests/auto/render/boundingsphere/cube.qml +++ b/tests/auto/render/boundingsphere/cube.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// 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 1f0e2245a..2c69dfb5c 100644 --- a/tests/auto/render/boundingsphere/sphere.qml +++ b/tests/auto/render/boundingsphere/sphere.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// 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 db1fe3e99..a3ffb206c 100644 --- a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp +++ b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qmlscenereader.h" #include "testarbiter.h" diff --git a/tests/auto/render/boundingvolumedebug/CMakeLists.txt b/tests/auto/render/boundingvolumedebug/CMakeLists.txt index 36ae56012..d2e85c939 100644 --- a/tests/auto/render/boundingvolumedebug/CMakeLists.txt +++ b/tests/auto/render/boundingvolumedebug/CMakeLists.txt @@ -1,16 +1,25 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from boundingvolumedebug.pro. ##################################################################### ## boundingvolumedebug Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(boundingvolumedebug LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(boundingvolumedebug SOURCES ../commons/testrenderer.cpp ../commons/testrenderer.h tst_boundingvolumedebug.cpp INCLUDE_DIRECTORIES ../commons - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/boundingvolumedebug/boundingvolumedebug.pro b/tests/auto/render/boundingvolumedebug/boundingvolumedebug.pro deleted file mode 100644 index e200ef232..000000000 --- a/tests/auto/render/boundingvolumedebug/boundingvolumedebug.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = boundingvolumedebug - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_boundingvolumedebug.cpp - -include(../commons/commons.pri) diff --git a/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp b/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp index 3b67420f3..ec7bcdb68 100644 --- a/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp +++ b/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Paul Lemire paul.lemire350@gmail.com -** 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 Paul Lemire paul.lemire350@gmail.com +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/private/boundingvolumedebug_p.h> diff --git a/tests/auto/render/buffer/CMakeLists.txt b/tests/auto/render/buffer/CMakeLists.txt index d670aa542..3a0bf427c 100644 --- a/tests/auto/render/buffer/CMakeLists.txt +++ b/tests/auto/render/buffer/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from buffer.pro. ##################################################################### ## tst_buffer Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_buffer LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_buffer SOURCES tst_buffer.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/buffer/buffer.pro b/tests/auto/render/buffer/buffer.pro deleted file mode 100644 index 509c29c8c..000000000 --- a/tests/auto/render/buffer/buffer.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_buffer - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_buffer.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp index ba9e657da..559da642e 100644 --- a/tests/auto/render/buffer/tst_buffer.cpp +++ b/tests/auto/render/buffer/tst_buffer.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 #include <QtTest/QTest> #include <qbackendnodetester.h> @@ -62,7 +37,7 @@ private Q_SLOTS: QCOMPARE(renderBuffer.isDirty(), true); QCOMPARE(renderBuffer.usage(), buffer.usage()); QCOMPARE(renderBuffer.data(), buffer.data()); - QCOMPARE(renderBuffer.pendingBufferUpdates().size(), 1); + QCOMPARE(renderBuffer.pendingBufferUpdates().size(), 1U); QCOMPARE(renderBuffer.pendingBufferUpdates().front().offset, -1); } @@ -145,7 +120,7 @@ private Q_SLOTS: simulateInitializationSync(&frontendBuffer, &backendBuffer); // THEN - QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1); + QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1U); Qt3DCore::QBufferUpdate fullUpdate = backendBuffer.pendingBufferUpdates().front(); QCOMPARE(fullUpdate.offset, -1); QVERIFY(fullUpdate.data.isEmpty()); @@ -159,7 +134,7 @@ private Q_SLOTS: // THEN QCOMPARE(frontendBuffer.data(), QByteArray("100456789\0")); - QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1); + QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1U); fullUpdate = backendBuffer.pendingBufferUpdates().front(); QCOMPARE(fullUpdate.offset, 1); QCOMPARE(fullUpdate.data, QByteArray("00\0")); @@ -214,7 +189,7 @@ private Q_SLOTS: // THEN QCOMPARE(backendBuffer.data(), QByteArrayLiteral("LS9SL")); QVERIFY(backendBuffer.isDirty()); - QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1); + QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1U); QCOMPARE(backendBuffer.pendingBufferUpdates().front().offset, -1); backendBuffer.pendingBufferUpdates().clear(); @@ -314,7 +289,7 @@ private Q_SLOTS: renderBuffer.syncFromFrontEnd(&buffer, false); // THEN - QCOMPARE(renderBuffer.pendingBufferUpdates().size(), 2); + QCOMPARE(renderBuffer.pendingBufferUpdates().size(), 2U); QCOMPARE(renderBuffer.pendingBufferUpdates().front().offset, 0); QCOMPARE(renderBuffer.pendingBufferUpdates().front().data, QByteArray("012")); QCOMPARE(renderBuffer.pendingBufferUpdates().back().offset, 3); diff --git a/tests/auto/render/commons/commons.cmake b/tests/auto/render/commons/commons.cmake index 9565c91c7..dd009016c 100644 --- a/tests/auto/render/commons/commons.cmake +++ b/tests/auto/render/commons/commons.cmake @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + include(${PROJECT_SOURCE_DIR}/tests/auto/core/common/common.cmake) function(qt3d_setup_common_render_test target) diff --git a/tests/auto/render/commons/commons.pri b/tests/auto/render/commons/commons.pri deleted file mode 100644 index a91985fc4..000000000 --- a/tests/auto/render/commons/commons.pri +++ /dev/null @@ -1,15 +0,0 @@ -SOURCES += \ - $$PWD/testrenderer.cpp - -HEADERS += \ - $$PWD/testrenderer.h - -useCommonTestAspect { - SOURCES += $$PWD/testaspect.cpp - HEADERS += $$PWD/testaspect.h -} - -INCLUDEPATH += $$PWD -CONFIG += c++17 - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private diff --git a/tests/auto/render/commons/testaspect.cpp b/tests/auto/render/commons/testaspect.cpp index 0a37a54bf..aa2fa8017 100644 --- a/tests/auto/render/commons/testaspect.cpp +++ b/tests/auto/render/commons/testaspect.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "testaspect.h" #include <Qt3DCore/private/qnodevisitor_p.h> diff --git a/tests/auto/render/commons/testaspect.h b/tests/auto/render/commons/testaspect.h index c295e6607..44220194a 100644 --- a/tests/auto/render/commons/testaspect.h +++ b/tests/auto/render/commons/testaspect.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TESTRENDERASPECT_H #define TESTRENDERASPECT_H diff --git a/tests/auto/render/commons/testrenderer.cpp b/tests/auto/render/commons/testrenderer.cpp index c61563ddb..4751170cc 100644 --- a/tests/auto/render/commons/testrenderer.cpp +++ b/tests/auto/render/commons/testrenderer.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "testrenderer.h" diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h index 48cdb27d9..a5b42313d 100644 --- a/tests/auto/render/commons/testrenderer.h +++ b/tests/auto/render/commons/testrenderer.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TESTRENDERER_H #define TESTRENDERER_H diff --git a/tests/auto/render/computecommand/CMakeLists.txt b/tests/auto/render/computecommand/CMakeLists.txt index d9cecc64e..58aea8b44 100644 --- a/tests/auto/render/computecommand/CMakeLists.txt +++ b/tests/auto/render/computecommand/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from computecommand.pro. ##################################################################### ## tst_computecommand Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_computecommand LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_computecommand SOURCES tst_computecommand.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/computecommand/computecommand.pro b/tests/auto/render/computecommand/computecommand.pro deleted file mode 100644 index ba3a0807d..000000000 --- a/tests/auto/render/computecommand/computecommand.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_computecommand - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_computecommand.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/computecommand/tst_computecommand.cpp b/tests/auto/render/computecommand/tst_computecommand.cpp index facb6c08b..f2c7984b8 100644 --- a/tests/auto/render/computecommand/tst_computecommand.cpp +++ b/tests/auto/render/computecommand/tst_computecommand.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/coordinatereader/CMakeLists.txt b/tests/auto/render/coordinatereader/CMakeLists.txt index 7a0d75de8..a0f037676 100644 --- a/tests/auto/render/coordinatereader/CMakeLists.txt +++ b/tests/auto/render/coordinatereader/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from coordinatereader.pro. ##################################################################### ## coordinatereader Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_coordinatereader LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_coordinatereader SOURCES tst_coordinatereader.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/coordinatereader/coordinatereader.pro b/tests/auto/render/coordinatereader/coordinatereader.pro deleted file mode 100644 index 036898c2b..000000000 --- a/tests/auto/render/coordinatereader/coordinatereader.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = coordinatereader - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_coordinatereader.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/coordinatereader/tst_coordinatereader.cpp b/tests/auto/render/coordinatereader/tst_coordinatereader.cpp index 9ff37f878..b34c92955 100644 --- a/tests/auto/render/coordinatereader/tst_coordinatereader.cpp +++ b/tests/auto/render/coordinatereader/tst_coordinatereader.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** 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) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/ddstextures/CMakeLists.txt b/tests/auto/render/ddstextures/CMakeLists.txt index 9e8c7fecd..7f6510aa5 100644 --- a/tests/auto/render/ddstextures/CMakeLists.txt +++ b/tests/auto/render/ddstextures/CMakeLists.txt @@ -1,9 +1,18 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from ddstextures.pro. ##################################################################### ## tst_ddstextures Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_ddstextures LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} @@ -13,7 +22,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_ddstextures SOURCES tst_ddstextures.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/ddstextures/ddstextures.pro b/tests/auto/render/ddstextures/ddstextures.pro deleted file mode 100644 index 62456561f..000000000 --- a/tests/auto/render/ddstextures/ddstextures.pro +++ /dev/null @@ -1,39 +0,0 @@ -TEMPLATE = app - -TARGET = tst_ddstextures - -CONFIG += testcase - -SOURCES += tst_ddstextures.cpp - -OTHER_FILES = \ - data/16x16x1-1-bc1.dds \ - data/16x16x1-1-bc1-dx10.dds \ - data/16x16x1-1-bc1-nomips.dds \ - data/16x16x1-1-bc1-nomips-dx10.dds \ - data/16x16x1-1-bc3.dds \ - data/16x16x1-1-bc3-dx10.dds \ - data/16x16x1-1-bc3-nomips.dds \ - data/16x16x1-1-bc3-nomips-dx10.dds \ - data/16x16x1-1-lumi.dds \ - data/16x16x1-1-lumi-nomips.dds \ - data/16x16x1-1-rgb.dds \ - data/16x16x1-1-rgb-nomips.dds \ - data/16x16x1-6-bc1.dds \ - data/16x16x1-6-bc1-dx10.dds \ - data/16x16x1-6-bc1-nomips.dds \ - data/16x16x1-6-bc1-nomips-dx10.dds \ - data/16x16x1-6-bc3.dds \ - data/16x16x1-6-bc3-dx10.dds \ - data/16x16x1-6-bc3-nomips.dds \ - data/16x16x1-6-bc3-nomips-dx10.dds \ - data/16x16x1-6-lumi.dds \ - data/16x16x1-6-lumi-nomips.dds \ - data/16x16x1-6-rgb.dds \ - data/16x16x1-6-rgb-nomips.dds \ - data/16x16-etc1.pkm \ - data/16x16-etc2.pkm - -TESTDATA = data/* - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib diff --git a/tests/auto/render/ddstextures/tst_ddstextures.cpp b/tests/auto/render/ddstextures/tst_ddstextures.cpp index ecdb5d234..884eb6e7b 100644 --- a/tests/auto/render/ddstextures/tst_ddstextures.cpp +++ b/tests/auto/render/ddstextures/tst_ddstextures.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> diff --git a/tests/auto/render/effect/CMakeLists.txt b/tests/auto/render/effect/CMakeLists.txt index 3f8a1338d..7c4f4ad6c 100644 --- a/tests/auto/render/effect/CMakeLists.txt +++ b/tests/auto/render/effect/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from effect.pro. ##################################################################### ## tst_effect Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_effect LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_effect SOURCES tst_effect.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/effect/effect.pro b/tests/auto/render/effect/effect.pro deleted file mode 100644 index 15fef9ccb..000000000 --- a/tests/auto/render/effect/effect.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_effect - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_effect.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/effect/tst_effect.cpp b/tests/auto/render/effect/tst_effect.cpp index 2b145669e..5a8e17ffa 100644 --- a/tests/auto/render/effect/tst_effect.cpp +++ b/tests/auto/render/effect/tst_effect.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/entity/CMakeLists.txt b/tests/auto/render/entity/CMakeLists.txt index 502190e06..0a7a24d6e 100644 --- a/tests/auto/render/entity/CMakeLists.txt +++ b/tests/auto/render/entity/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from entity.pro. ##################################################################### ## tst_entity Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_entity LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_entity SOURCES tst_entity.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/entity/entity.pro b/tests/auto/render/entity/entity.pro deleted file mode 100644 index 193bd745c..000000000 --- a/tests/auto/render/entity/entity.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_entity - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_entity.cpp - -include(../commons/commons.pri) diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp index 74ccfc2fe..81424b4d2 100644 --- a/tests/auto/render/entity/tst_entity.cpp +++ b/tests/auto/render/entity/tst_entity.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 #include <QtTest/QTest> #include <Qt3DRender/private/entity_p.h> @@ -237,8 +212,8 @@ private slots: QVERIFY(backendB->parent() == backendA); QVERIFY(backendC->parent() == backendB); - QCOMPARE(backendA->childrenHandles().count(), 1); - QCOMPARE(backendB->childrenHandles().count(), 1); + QCOMPARE(backendA->childrenHandles().size(), 1); + QCOMPARE(backendB->childrenHandles().size(), 1); QVERIFY(backendC->childrenHandles().isEmpty()); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::AllDirty); @@ -269,7 +244,7 @@ private slots: QVERIFY(backendB->parent() == nullptr); QVERIFY(backendC->parent() == backendA); - QCOMPARE(backendA->childrenHandles().count(), 1); + QCOMPARE(backendA->childrenHandles().size(), 1); QVERIFY(!backendA->childrenHandles().contains(backendB->handle())); QVERIFY(backendB->childrenHandles().isEmpty()); QVERIFY(backendC->childrenHandles().isEmpty()); @@ -306,7 +281,7 @@ private slots: QVERIFY(backendB->parent() == backendA); QVERIFY(backendC->parent() == backendA); - QCOMPARE(backendA->childrenHandles().count(), 2); + QCOMPARE(backendA->childrenHandles().size(), 2); QVERIFY(backendB->childrenHandles().isEmpty()); QVERIFY(backendC->childrenHandles().isEmpty()); @@ -322,7 +297,7 @@ private slots: QVERIFY(backendB->parent() == backendA); QVERIFY(backendC->parent() == nullptr); - QCOMPARE(backendA->childrenHandles().count(), 1); + QCOMPARE(backendA->childrenHandles().size(), 1); QVERIFY(!backendA->childrenHandles().contains(backendC->handle())); QVERIFY(backendB->childrenHandles().isEmpty()); QVERIFY(backendC->childrenHandles().isEmpty()); @@ -583,8 +558,8 @@ private slots: const auto r2 = v2.apply(backendA); // THEN - QCOMPARE(r1.count(), 3); - QCOMPARE(r2.count(), 0); + QCOMPARE(r1.size(), 3); + QCOMPARE(r2.size(), 0); } private: diff --git a/tests/auto/render/filterentitybycomponent/CMakeLists.txt b/tests/auto/render/filterentitybycomponent/CMakeLists.txt index efcbb164f..dc60bbb99 100644 --- a/tests/auto/render/filterentitybycomponent/CMakeLists.txt +++ b/tests/auto/render/filterentitybycomponent/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from filterentitybycomponent.pro. ##################################################################### ## tst_filterentitybycomponent Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_filterentitybycomponent LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_filterentitybycomponent SOURCES tst_filterentitybycomponent.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/filterentitybycomponent/filterentitybycomponent.pro b/tests/auto/render/filterentitybycomponent/filterentitybycomponent.pro deleted file mode 100644 index b03bca9d1..000000000 --- a/tests/auto/render/filterentitybycomponent/filterentitybycomponent.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_filterentitybycomponent - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_filterentitybycomponent.cpp - -CONFIG += useCommonTestAspect - -include(../commons/commons.pri) diff --git a/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp b/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp index 7cfcd3e23..3b3902620 100644 --- a/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp +++ b/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire -** 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) 2016 Paul Lemire +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qentity.h> @@ -87,7 +62,7 @@ private Q_SLOTS: filterJob.run(); // THEN - QCOMPARE(filterJob.filteredEntities().size(), 2); + QCOMPARE(filterJob.filteredEntities().size(), 2U); QCOMPARE(filterJob.filteredEntities().front()->peerId(), childEntity1->id()); QCOMPARE(filterJob.filteredEntities().back()->peerId(), childEntity2->id()); } @@ -99,7 +74,7 @@ private Q_SLOTS: filterJob.run(); // THEN - QCOMPARE(filterJob.filteredEntities().size(), 1); + QCOMPARE(filterJob.filteredEntities().size(), 1U); QCOMPARE(filterJob.filteredEntities().front()->peerId(), childEntity1->id()); } @@ -110,7 +85,7 @@ private Q_SLOTS: filterJob.run(); // THEN - QCOMPARE(filterJob.filteredEntities().size(), 0); + QCOMPARE(filterJob.filteredEntities().size(), 0U); } { @@ -120,7 +95,7 @@ private Q_SLOTS: filterJob.run(); // THEN - QCOMPARE(filterJob.filteredEntities().size(), 1); + QCOMPARE(filterJob.filteredEntities().size(), 1U); QCOMPARE(filterJob.filteredEntities().front()->peerId(), childEntity3->id()); } } diff --git a/tests/auto/render/filterkey/CMakeLists.txt b/tests/auto/render/filterkey/CMakeLists.txt index bae093c27..d29c92a38 100644 --- a/tests/auto/render/filterkey/CMakeLists.txt +++ b/tests/auto/render/filterkey/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from filterkey.pro. ##################################################################### ## tst_filterkey Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_filterkey LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_filterkey SOURCES tst_filterkey.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/filterkey/filterkey.pro b/tests/auto/render/filterkey/filterkey.pro deleted file mode 100644 index b5ad86a49..000000000 --- a/tests/auto/render/filterkey/filterkey.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_filterkey - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_filterkey.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/filterkey/tst_filterkey.cpp b/tests/auto/render/filterkey/tst_filterkey.cpp index 6a08bc539..db4666203 100644 --- a/tests/auto/render/filterkey/tst_filterkey.cpp +++ b/tests/auto/render/filterkey/tst_filterkey.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/framegraphnode/CMakeLists.txt b/tests/auto/render/framegraphnode/CMakeLists.txt index 6e067051b..32a68652f 100644 --- a/tests/auto/render/framegraphnode/CMakeLists.txt +++ b/tests/auto/render/framegraphnode/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from framegraphnode.pro. ##################################################################### ## tst_framegraphnode Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_framegraphnode LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_framegraphnode SOURCES tst_framegraphnode.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/framegraphnode/framegraphnode.pro b/tests/auto/render/framegraphnode/framegraphnode.pro deleted file mode 100644 index f47fc1866..000000000 --- a/tests/auto/render/framegraphnode/framegraphnode.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_framegraphnode -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_framegraphnode.cpp - -include(../commons/commons.pri) -include(../../core/common/common.pri) diff --git a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp index 4aa7615be..269a7aee4 100644 --- a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp +++ b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Paul Lemire paul.lemire350@gmail.com -** 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 Paul Lemire paul.lemire350@gmail.com +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <Qt3DRender/private/framegraphnode_p.h> #include <QtTest/QTest> @@ -139,9 +114,9 @@ private Q_SLOTS: // THEN QCOMPARE(child->parentId(), parentId); QCOMPARE(child->parent(), parent1); - QCOMPARE(parent1->childrenIds().count(), 1); + QCOMPARE(parent1->childrenIds().size(), 1); QCOMPARE(parent1->childrenIds().first(), childId); - QCOMPARE(parent1->children().count(), parent1->childrenIds().count()); + QCOMPARE(parent1->children().size(), parent1->childrenIds().size()); QCOMPARE(parent1->children().first(), child); // WHEN @@ -150,8 +125,8 @@ private Q_SLOTS: // THEN QVERIFY(child->parentId().isNull()); QVERIFY(child->parent() == nullptr); - QCOMPARE(parent1->childrenIds().count(), 0); - QCOMPARE(parent1->children().count(), parent1->childrenIds().count()); + QCOMPARE(parent1->childrenIds().size(), 0); + QCOMPARE(parent1->children().size(), parent1->childrenIds().size()); } void checkSetParent() diff --git a/tests/auto/render/framegraphvisitor/CMakeLists.txt b/tests/auto/render/framegraphvisitor/CMakeLists.txt index 26d7ad2e4..55e6a1268 100644 --- a/tests/auto/render/framegraphvisitor/CMakeLists.txt +++ b/tests/auto/render/framegraphvisitor/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from framegraphvisitor.pro. ##################################################################### ## tst_framegraphvisitor Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_framegraphvisitor LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_framegraphvisitor SOURCES tst_framegraphvisitor.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/framegraphvisitor/framegraphvisitor.pro b/tests/auto/render/framegraphvisitor/framegraphvisitor.pro deleted file mode 100644 index 2c9a0028e..000000000 --- a/tests/auto/render/framegraphvisitor/framegraphvisitor.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_framegraphvisitor - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_framegraphvisitor.cpp - -CONFIG += useCommonTestAspect - -include(../commons/commons.pri) diff --git a/tests/auto/render/framegraphvisitor/tst_framegraphvisitor.cpp b/tests/auto/render/framegraphvisitor/tst_framegraphvisitor.cpp index 417260a61..3e046646e 100644 --- a/tests/auto/render/framegraphvisitor/tst_framegraphvisitor.cpp +++ b/tests/auto/render/framegraphvisitor/tst_framegraphvisitor.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -148,7 +112,7 @@ private Q_SLOTS: const std::vector<Qt3DRender::Render::FrameGraphNode *> fgNodes = visitor.traverse(backendFGRoot); // THEN - QCOMPARE(fgNodeIdsPerBranch.size(), fgNodes.size()); + QCOMPARE(size_t(fgNodeIdsPerBranch.size()), fgNodes.size()); for (int i = 0; i < fgNodeIdsPerBranch.size(); ++i) { const BranchIdsAndTypes brandIdsAndTypes = fgNodeIdsPerBranch.at(i); diff --git a/tests/auto/render/genericlambdajob/CMakeLists.txt b/tests/auto/render/genericlambdajob/CMakeLists.txt index 6d7e00902..705254770 100644 --- a/tests/auto/render/genericlambdajob/CMakeLists.txt +++ b/tests/auto/render/genericlambdajob/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from genericlambdajob.pro. ##################################################################### ## tst_genericlambdajob Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_genericlambdajob LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_genericlambdajob SOURCES tst_genericlambdajob.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/genericlambdajob/genericlambdajob.pro b/tests/auto/render/genericlambdajob/genericlambdajob.pro deleted file mode 100644 index d4b628688..000000000 --- a/tests/auto/render/genericlambdajob/genericlambdajob.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_genericlambdajob - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_genericlambdajob.cpp - -include(../commons/commons.pri) diff --git a/tests/auto/render/genericlambdajob/tst_genericlambdajob.cpp b/tests/auto/render/genericlambdajob/tst_genericlambdajob.cpp index ccdd43a02..249068de7 100644 --- a/tests/auto/render/genericlambdajob/tst_genericlambdajob.cpp +++ b/tests/auto/render/genericlambdajob/tst_genericlambdajob.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire -** 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) 2016 Paul Lemire +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/private/genericlambdajob_p.h> 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)); diff --git a/tests/auto/render/geometryloaders/CMakeLists.txt b/tests/auto/render/geometryloaders/CMakeLists.txt index 251c1ae03..29414d64e 100644 --- a/tests/auto/render/geometryloaders/CMakeLists.txt +++ b/tests/auto/render/geometryloaders/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from geometryloaders.pro. ##################################################################### ## tst_geometryloaders Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_geometryloaders LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_geometryloaders SOURCES tst_geometryloaders.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DExtras diff --git a/tests/auto/render/geometryloaders/geometryloaders.pro b/tests/auto/render/geometryloaders/geometryloaders.pro deleted file mode 100644 index fcf362055..000000000 --- a/tests/auto/render/geometryloaders/geometryloaders.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_geometryloaders - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib 3dextras - -CONFIG += testcase - -SOURCES += tst_geometryloaders.cpp - -RESOURCES += \ - geometryloaders.qrc - diff --git a/tests/auto/render/geometryloaders/tst_geometryloaders.cpp b/tests/auto/render/geometryloaders/tst_geometryloaders.cpp index 7fc914cda..1bc80b290 100644 --- a/tests/auto/render/geometryloaders/tst_geometryloaders.cpp +++ b/tests/auto/render/geometryloaders/tst_geometryloaders.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd and/or its subsidiary(-ies). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 The Qt Company Ltd and/or its subsidiary(-ies). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/qtest.h> @@ -102,7 +66,7 @@ void tst_geometryloaders::testOBJLoader() if (!geometry) return; - QCOMPARE(geometry->attributes().count(), 3); + QCOMPARE(geometry->attributes().size(), 3); for (QAttribute *attr : geometry->attributes()) { switch (attr->attributeType()) { case QAttribute::IndexAttribute: @@ -144,7 +108,7 @@ void tst_geometryloaders::testPLYLoader() if (!geometry) return; - QCOMPARE(geometry->attributes().count(), 3); + QCOMPARE(geometry->attributes().size(), 3); for (QAttribute *attr : geometry->attributes()) { switch (attr->attributeType()) { case QAttribute::IndexAttribute: @@ -186,7 +150,7 @@ void tst_geometryloaders::testSTLLoader() if (!geometry) return; - QCOMPARE(geometry->attributes().count(), 3); + QCOMPARE(geometry->attributes().size(), 3); for (QAttribute *attr : geometry->attributes()) { QCOMPARE(attr->count(), 36u); } @@ -218,7 +182,7 @@ void tst_geometryloaders::testGLTFLoader() if (!geometry) return; - QCOMPARE(geometry->attributes().count(), 3); + QCOMPARE(geometry->attributes().size(), 3); for (QAttribute *attr : geometry->attributes()) { switch (attr->attributeType()) { case QAttribute::IndexAttribute: diff --git a/tests/auto/render/geometryrenderer/CMakeLists.txt b/tests/auto/render/geometryrenderer/CMakeLists.txt index 3dae45693..71bfb59b8 100644 --- a/tests/auto/render/geometryrenderer/CMakeLists.txt +++ b/tests/auto/render/geometryrenderer/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from geometryrenderer.pro. ##################################################################### ## tst_geometryrenderer Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_geometryrenderer LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_geometryrenderer SOURCES tst_geometryrenderer.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/geometryrenderer/geometryrenderer.pro b/tests/auto/render/geometryrenderer/geometryrenderer.pro deleted file mode 100644 index c75501f4e..000000000 --- a/tests/auto/render/geometryrenderer/geometryrenderer.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_geometryrenderer - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_geometryrenderer.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) - diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp index 04f1c2ce1..1e16ac41c 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.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 #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/gltexture/CMakeLists.txt b/tests/auto/render/gltexture/CMakeLists.txt index 967cd08f2..16f1dbee3 100644 --- a/tests/auto/render/gltexture/CMakeLists.txt +++ b/tests/auto/render/gltexture/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from gltexture.pro. ##################################################################### ## tst_gltexture Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_gltexture LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_gltexture SOURCES tst_gltexture.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/gltexture/gltexture.pro b/tests/auto/render/gltexture/gltexture.pro deleted file mode 100644 index b21cea813..000000000 --- a/tests/auto/render/gltexture/gltexture.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_gltexture - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_gltexture.cpp - -RESOURCES += \ - resources.qrc diff --git a/tests/auto/render/gltexture/tst_gltexture.cpp b/tests/auto/render/gltexture/tst_gltexture.cpp index 781e4a38d..f8434d18b 100644 --- a/tests/auto/render/gltexture/tst_gltexture.cpp +++ b/tests/auto/render/gltexture/tst_gltexture.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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) 2019 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> diff --git a/tests/auto/render/gltfplugins/CMakeLists.txt b/tests/auto/render/gltfplugins/CMakeLists.txt index cfd6aa9f8..79e5b354a 100644 --- a/tests/auto/render/gltfplugins/CMakeLists.txt +++ b/tests/auto/render/gltfplugins/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from gltfplugins.pro. ##################################################################### ## tst_gltfplugins Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_gltfplugins LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_gltfplugins SOURCES tst_gltfplugins.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DExtras diff --git a/tests/auto/render/gltfplugins/gltfplugins.pro b/tests/auto/render/gltfplugins/gltfplugins.pro deleted file mode 100644 index cd90e57ee..000000000 --- a/tests/auto/render/gltfplugins/gltfplugins.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_gltfplugins - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib 3dextras - -CONFIG += testcase - -SOURCES += tst_gltfplugins.cpp - -RESOURCES += \ - images.qrc diff --git a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp index e57829b74..0ed38311f 100644 --- a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp +++ b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/qtest.h> #include <QtCore/qtemporarydir.h> @@ -789,11 +753,7 @@ void tst_gltfPlugins::compareComponents(Qt3DCore::QComponent *c1, Qt3DCore::QCom auto property = c1->metaObject()->property(i); auto v1 = c1->property(property.name()); auto v2 = c2->property(property.name()); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const auto v1TypeId = v1.metaType().id(); -#else - const auto v1TypeId = v1.type(); -#endif if (v1TypeId == QMetaType::Bool) { QCOMPARE(v1.toBool(), v2.toBool()); } else if (v1TypeId == QMetaType::QColor) { @@ -802,11 +762,7 @@ void tst_gltfPlugins::compareComponents(Qt3DCore::QComponent *c1, Qt3DCore::QCom QCOMPARE(v1.value<QVector3D>(), v2.value<QVector3D>()); } else if (v1TypeId == QMetaType::QMatrix4x4) { QCOMPARE(v1.value<QMatrix4x4>(), v2.value<QMatrix4x4>()); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) } else if (QMetaType::canConvert(v1.metaType(), QMetaType(QMetaType::Float))) { -#else - } else if (v1.canConvert(QMetaType::Float)) { -#endif QVERIFY(qFuzzyCompare(v1.toFloat(), v2.toFloat())); } } @@ -888,11 +844,7 @@ void tst_gltfPlugins::compareParameters(const QList<Qt3DRender::QParameter *> &p for (auto p2 : params2) { if (p1->name() == p2->name()) { pMatch = true; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (p1->value().metaType().id() == QMetaType::QColor) { -#else - if (p1->value().type() == QMetaType::QColor) { -#endif // Colors are imported as QVector4Ds QColor color = p1->value().value<QColor>(); QVector4D vec = p2->value().value<QVector4D>(); diff --git a/tests/auto/render/joint/CMakeLists.txt b/tests/auto/render/joint/CMakeLists.txt index 793f6beba..0d75de761 100644 --- a/tests/auto/render/joint/CMakeLists.txt +++ b/tests/auto/render/joint/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from joint.pro. ##################################################################### ## tst_joint Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_joint LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_joint SOURCES tst_joint.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/joint/joint.pro b/tests/auto/render/joint/joint.pro deleted file mode 100644 index 9428ab5fd..000000000 --- a/tests/auto/render/joint/joint.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_joint - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_joint.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/joint/tst_joint.cpp b/tests/auto/render/joint/tst_joint.cpp index 7b227f0a2..1fb068443 100644 --- a/tests/auto/render/joint/tst_joint.cpp +++ b/tests/auto/render/joint/tst_joint.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/private/joint_p.h> diff --git a/tests/auto/render/ktxtextures/CMakeLists.txt b/tests/auto/render/ktxtextures/CMakeLists.txt index 583b15d1a..0b86b625b 100644 --- a/tests/auto/render/ktxtextures/CMakeLists.txt +++ b/tests/auto/render/ktxtextures/CMakeLists.txt @@ -1,9 +1,18 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from ktxtextures.pro. ##################################################################### ## tst_ktxtextures Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_ktxtextures LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} @@ -13,7 +22,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_ktxtextures SOURCES tst_ktxtextures.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/ktxtextures/ktxtextures.pro b/tests/auto/render/ktxtextures/ktxtextures.pro deleted file mode 100644 index beca06dc2..000000000 --- a/tests/auto/render/ktxtextures/ktxtextures.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_ktxtextures - -CONFIG += testcase - -SOURCES += tst_ktxtextures.cpp - -TESTDATA = data/* - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib diff --git a/tests/auto/render/ktxtextures/tst_ktxtextures.cpp b/tests/auto/render/ktxtextures/tst_ktxtextures.cpp index f57bc86b6..fc47651a4 100644 --- a/tests/auto/render/ktxtextures/tst_ktxtextures.cpp +++ b/tests/auto/render/ktxtextures/tst_ktxtextures.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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) 2019 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> diff --git a/tests/auto/render/layerfiltering/CMakeLists.txt b/tests/auto/render/layerfiltering/CMakeLists.txt index e953784d4..3f2b62d95 100644 --- a/tests/auto/render/layerfiltering/CMakeLists.txt +++ b/tests/auto/render/layerfiltering/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from layerfiltering.pro. ##################################################################### ## tst_layerfiltering Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_layerfiltering LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_layerfiltering SOURCES tst_layerfiltering.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/layerfiltering/layerfiltering.pro b/tests/auto/render/layerfiltering/layerfiltering.pro deleted file mode 100644 index e45adf039..000000000 --- a/tests/auto/render/layerfiltering/layerfiltering.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_layerfiltering - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_layerfiltering.cpp - -CONFIG += useCommonTestAspect - -include(../commons/commons.pri) diff --git a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp index 24f6e5cbb..f3907d9a2 100644 --- a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp +++ b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire -** 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) 2016 Paul Lemire +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qentity.h> @@ -53,8 +28,8 @@ private Q_SLOTS: // THEN QVERIFY(updateEntityLayerJob.manager() == nullptr); QCOMPARE(filterJob.hasLayerFilter(), false); - QCOMPARE(filterJob.filteredEntities().size(), 0); - QCOMPARE(filterJob.layerFilters().size(), 0); + QCOMPARE(filterJob.filteredEntities().size(), 0U); + QCOMPARE(filterJob.layerFilters().size(), 0U); QCOMPARE(frontendLayer.recursive(), false); } diff --git a/tests/auto/render/levelofdetail/CMakeLists.txt b/tests/auto/render/levelofdetail/CMakeLists.txt index df4417d40..1117f99de 100644 --- a/tests/auto/render/levelofdetail/CMakeLists.txt +++ b/tests/auto/render/levelofdetail/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from levelofdetail.pro. ##################################################################### ## tst_levelofdetail Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_levelofdetail LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_levelofdetail SOURCES tst_levelofdetail.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/levelofdetail/levelofdetail.pro b/tests/auto/render/levelofdetail/levelofdetail.pro deleted file mode 100644 index 496efc35c..000000000 --- a/tests/auto/render/levelofdetail/levelofdetail.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_levelofdetail - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_levelofdetail.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/levelofdetail/tst_levelofdetail.cpp b/tests/auto/render/levelofdetail/tst_levelofdetail.cpp index 2189ef1a0..c2bf83460 100644 --- a/tests/auto/render/levelofdetail/tst_levelofdetail.cpp +++ b/tests/auto/render/levelofdetail/tst_levelofdetail.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/loadscenejob/CMakeLists.txt b/tests/auto/render/loadscenejob/CMakeLists.txt index 892c3a914..8858bbbff 100644 --- a/tests/auto/render/loadscenejob/CMakeLists.txt +++ b/tests/auto/render/loadscenejob/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from loadscenejob.pro. ##################################################################### ## tst_loadscenejob Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_loadscenejob LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_loadscenejob SOURCES tst_loadscenejob.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/loadscenejob/loadscenejob.pro b/tests/auto/render/loadscenejob/loadscenejob.pro deleted file mode 100644 index 3901c3545..000000000 --- a/tests/auto/render/loadscenejob/loadscenejob.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_loadscenejob - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_loadscenejob.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/loadscenejob/tst_loadscenejob.cpp b/tests/auto/render/loadscenejob/tst_loadscenejob.cpp index 39582121d..cb0235749 100644 --- a/tests/auto/render/loadscenejob/tst_loadscenejob.cpp +++ b/tests/auto/render/loadscenejob/tst_loadscenejob.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/private/scene_p.h> diff --git a/tests/auto/render/material/CMakeLists.txt b/tests/auto/render/material/CMakeLists.txt index 189bd0694..ed64cf7f8 100644 --- a/tests/auto/render/material/CMakeLists.txt +++ b/tests/auto/render/material/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from material.pro. # special case skip regeneration @@ -6,10 +9,16 @@ ## tst_material Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qt3d_material LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qt3d_material SOURCES tst_material.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/material/material.pro b/tests/auto/render/material/material.pro deleted file mode 100644 index 9efe88ace..000000000 --- a/tests/auto/render/material/material.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_material - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_material.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) - diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp index 4e66f7e30..d406acf59 100644 --- a/tests/auto/render/material/tst_material.cpp +++ b/tests/auto/render/material/tst_material.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 #include <QtTest/QTest> #include <qbackendnodetester.h> @@ -120,7 +95,7 @@ void tst_RenderMaterial::shouldHavePropertiesMirroringFromItsPeer() // THEN QVERIFY(backend.isEnabled() == frontendMaterial->isEnabled()); QCOMPARE(backend.effect(), frontendMaterial->effect() ? frontendMaterial->effect()->id() : QNodeId()); - QCOMPARE(backend.parameters().count(), frontendMaterial->parameters().count()); + QCOMPARE(backend.parameters().size(), frontendMaterial->parameters().size()); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::MaterialDirty); int c = 0; @@ -147,7 +122,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange() backend.syncFromFrontEnd(&material, false); // THEN - QCOMPARE(backend.parameters().count(), 1); + QCOMPARE(backend.parameters().size(), 1); QCOMPARE(backend.parameters().first(), parameter->id()); QVERIFY(renderer.dirtyBits() != 0); diff --git a/tests/auto/render/memorybarrier/CMakeLists.txt b/tests/auto/render/memorybarrier/CMakeLists.txt index bfd6ae219..d1ee544a8 100644 --- a/tests/auto/render/memorybarrier/CMakeLists.txt +++ b/tests/auto/render/memorybarrier/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from memorybarrier.pro. ##################################################################### ## tst_memorybarrier Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_memorybarrier LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_memorybarrier SOURCES tst_memorybarrier.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/memorybarrier/memorybarrier.pro b/tests/auto/render/memorybarrier/memorybarrier.pro deleted file mode 100644 index 9340a0858..000000000 --- a/tests/auto/render/memorybarrier/memorybarrier.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_memorybarrier - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_memorybarrier.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/memorybarrier/tst_memorybarrier.cpp b/tests/auto/render/memorybarrier/tst_memorybarrier.cpp index 0b1c581e4..cc24e8da6 100644 --- a/tests/auto/render/memorybarrier/tst_memorybarrier.cpp +++ b/tests/auto/render/memorybarrier/tst_memorybarrier.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/meshfunctors/CMakeLists.txt b/tests/auto/render/meshfunctors/CMakeLists.txt index 53bf58e0b..80d662309 100644 --- a/tests/auto/render/meshfunctors/CMakeLists.txt +++ b/tests/auto/render/meshfunctors/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from meshfunctors.pro. ##################################################################### ## tst_renderviews Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_meshfunctors LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_meshfunctors SOURCES tst_meshfunctors.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/meshfunctors/meshfunctors.pro b/tests/auto/render/meshfunctors/meshfunctors.pro deleted file mode 100644 index 84d16a210..000000000 --- a/tests/auto/render/meshfunctors/meshfunctors.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app - -TARGET = tst_meshfunctors - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_meshfunctors.cpp diff --git a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp index bf8d9f2af..3aa43040f 100644 --- a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp +++ b/tests/auto/render/meshfunctors/tst_meshfunctors.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 #include <QtTest/QTest> #include <Qt3DCore/qcomponent.h> diff --git a/tests/auto/render/objectpicker/CMakeLists.txt b/tests/auto/render/objectpicker/CMakeLists.txt index 80be6540d..4bdafcede 100644 --- a/tests/auto/render/objectpicker/CMakeLists.txt +++ b/tests/auto/render/objectpicker/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from objectpicker.pro. ##################################################################### ## objectpicker Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_objectpicker LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_objectpicker SOURCES tst_objectpicker.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/objectpicker/objectpicker.pro b/tests/auto/render/objectpicker/objectpicker.pro deleted file mode 100644 index e32ff09be..000000000 --- a/tests/auto/render/objectpicker/objectpicker.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = objectpicker - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_objectpicker.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp index 0e09e266b..70938faf1 100644 --- a/tests/auto/render/objectpicker/tst_objectpicker.cpp +++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Paul Lemire paul.lemire350@gmail.com -** 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 Paul Lemire paul.lemire350@gmail.com +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/opengl/CMakeLists.txt b/tests/auto/render/opengl/CMakeLists.txt index 21133f63f..778319a1d 100644 --- a/tests/auto/render/opengl/CMakeLists.txt +++ b/tests/auto/render/opengl/CMakeLists.txt @@ -1,10 +1,15 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from opengl.pro. if (NOT QT_BUILD_STANDALONE_TESTS) add_subdirectory(filtercompatibletechniquejob) +if (NOT ANDROID) add_subdirectory(graphicshelpergl3_3) add_subdirectory(graphicshelpergl3_2) add_subdirectory(graphicshelpergl2) +endif() add_subdirectory(glshadermanager) add_subdirectory(textures) add_subdirectory(renderer) @@ -18,7 +23,7 @@ if (NOT QT_BUILD_STANDALONE_TESTS) if(TARGET Qt::Quick) add_subdirectory(materialparametergathererjob) endif() - if(NOT MACOS) + if(NOT MACOS AND NOT ANDROID) add_subdirectory(graphicshelpergl4) endif() endif() diff --git a/tests/auto/render/opengl/computecommand/CMakeLists.txt b/tests/auto/render/opengl/computecommand/CMakeLists.txt index 0bb3494d8..f98c44bd8 100644 --- a/tests/auto/render/opengl/computecommand/CMakeLists.txt +++ b/tests/auto/render/opengl/computecommand/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from computecommand.pro. ##################################################################### diff --git a/tests/auto/render/opengl/computecommand/computecommand.pro b/tests/auto/render/opengl/computecommand/computecommand.pro deleted file mode 100644 index 38515059a..000000000 --- a/tests/auto/render/opengl/computecommand/computecommand.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_computecommand - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_computecommand.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/computecommand/tst_computecommand.cpp b/tests/auto/render/opengl/computecommand/tst_computecommand.cpp index 0b1ff3881..b9ccece1a 100644 --- a/tests/auto/render/opengl/computecommand/tst_computecommand.cpp +++ b/tests/auto/render/opengl/computecommand/tst_computecommand.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt b/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt index 80db6f729..b8e666df4 100644 --- a/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt +++ b/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from filtercompatibletechniquejob.pro. ##################################################################### diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/filtercompatibletechniquejob.pro b/tests/auto/render/opengl/filtercompatibletechniquejob/filtercompatibletechniquejob.pro deleted file mode 100644 index 5d533839c..000000000 --- a/tests/auto/render/opengl/filtercompatibletechniquejob/filtercompatibletechniquejob.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_filtercompatibletechniquejob - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_filtercompatibletechniquejob.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp index 3a4d5f021..bac5512c3 100644 --- a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp +++ b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -248,7 +223,7 @@ private Q_SLOTS: // THEN -> empty if job ran properly const std::vector<Qt3DCore::QNodeId> dirtyTechniquesId = testAspect.nodeManagers()->techniqueManager()->takeDirtyTechniques(); - QCOMPARE(dirtyTechniquesId.size(), 0); + QCOMPARE(dirtyTechniquesId.size(), 0U); // Check at least one technique is valid bool foundValid = false; diff --git a/tests/auto/render/opengl/glshadermanager/CMakeLists.txt b/tests/auto/render/opengl/glshadermanager/CMakeLists.txt index f3c4b4d6c..631c1931d 100644 --- a/tests/auto/render/opengl/glshadermanager/CMakeLists.txt +++ b/tests/auto/render/opengl/glshadermanager/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from glshadermanager.pro. ##################################################################### diff --git a/tests/auto/render/opengl/glshadermanager/glshadermanager.pro b/tests/auto/render/opengl/glshadermanager/glshadermanager.pro deleted file mode 100644 index dc96ab3bb..000000000 --- a/tests/auto/render/opengl/glshadermanager/glshadermanager.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_glshadermanager - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_glshadermanager.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp b/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp index 6b37db64c..44a273f1b 100644 --- a/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp +++ b/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <glresourcemanagers_p.h> @@ -69,7 +44,7 @@ void tst_GLShaderManager::adopt() // THEN QVERIFY(glShader1 != nullptr); std::vector<Qt3DCore::QNodeId> shaderNodeIds = cache.shaderIdsForProgram(glShader1); - QCOMPARE(shaderNodeIds.size(), 1); + QCOMPARE(shaderNodeIds.size(), 1U); QCOMPARE(shaderNodeIds.front(), backendShaderNode1.peerId()); // WHEN @@ -79,7 +54,7 @@ void tst_GLShaderManager::adopt() QCOMPARE(glShader1, glShader2); shaderNodeIds = cache.shaderIdsForProgram(glShader2); - QCOMPARE(shaderNodeIds.size(), 2); + QCOMPARE(shaderNodeIds.size(), 2U); QCOMPARE(shaderNodeIds.front(), backendShaderNode1.peerId()); QCOMPARE(shaderNodeIds.back(), backendShaderNode2.peerId()); } @@ -109,7 +84,7 @@ void tst_GLShaderManager::lookupResource() QVERIFY(glShader1 != nullptr); QCOMPARE(glShader1, glShader2); const std::vector<Qt3DCore::QNodeId> shaderNodeIds = cache.shaderIdsForProgram(glShader1); - QCOMPARE(shaderNodeIds.size(), 2); + QCOMPARE(shaderNodeIds.size(), 2U); QVERIFY(std::find(shaderNodeIds.begin(), shaderNodeIds.end(), frontendShader1.id()) != shaderNodeIds.end()); @@ -142,7 +117,7 @@ void tst_GLShaderManager::abandon() // THEN std::vector<Qt3DCore::QNodeId> shaderNodeIds = cache.shaderIdsForProgram(glShader); QVERIFY(cache.takeAbandonned().empty()); - QCOMPARE(shaderNodeIds.size(), 1); + QCOMPARE(shaderNodeIds.size(), 1U); QCOMPARE(shaderNodeIds.front(), backendShaderNode2.peerId()); // WHEN @@ -150,9 +125,9 @@ void tst_GLShaderManager::abandon() // THEN shaderNodeIds = cache.shaderIdsForProgram(glShader); - QCOMPARE(shaderNodeIds.size(), 0); + QCOMPARE(shaderNodeIds.size(), 0U); const std::vector<Qt3DRender::Render::OpenGL::GLShader *> releasedShaders = cache.takeAbandonned(); - QCOMPARE(releasedShaders.size(), 1); + QCOMPARE(releasedShaders.size(), 1U); QCOMPARE(releasedShaders.front(), glShader); } diff --git a/tests/auto/render/opengl/gltexturemanager/CMakeLists.txt b/tests/auto/render/opengl/gltexturemanager/CMakeLists.txt index 2a0d251a9..98274ee62 100644 --- a/tests/auto/render/opengl/gltexturemanager/CMakeLists.txt +++ b/tests/auto/render/opengl/gltexturemanager/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from gltexturemanager.pro. ##################################################################### diff --git a/tests/auto/render/opengl/gltexturemanager/gltexturemanager.pro b/tests/auto/render/opengl/gltexturemanager/gltexturemanager.pro deleted file mode 100644 index 7784d8da7..000000000 --- a/tests/auto/render/opengl/gltexturemanager/gltexturemanager.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_gltexturemanager - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_gltexturemanager.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/gltexturemanager/tst_gltexturemanager.cpp b/tests/auto/render/opengl/gltexturemanager/tst_gltexturemanager.cpp index 676720369..27be8be3c 100644 --- a/tests/auto/render/opengl/gltexturemanager/tst_gltexturemanager.cpp +++ b/tests/auto/render/opengl/gltexturemanager/tst_gltexturemanager.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/QTextureImageDataGenerator> @@ -96,7 +71,7 @@ private Q_SLOTS: t->setImages({img}); // THEN - QCOMPARE(t->images().size(), 1); + QCOMPARE(t->images().size(), 1U); QCOMPARE(t->dirtyFlags(), Qt3DRender::Render::OpenGL::GLTexture::TextureImageData); // WHEN diff --git a/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt index d7b0fdd49..e0678a353 100644 --- a/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt +++ b/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from graphicshelpergl2.pro. ##################################################################### diff --git a/tests/auto/render/opengl/graphicshelpergl2/graphicshelpergl2.pro b/tests/auto/render/opengl/graphicshelpergl2/graphicshelpergl2.pro deleted file mode 100644 index e9ce754e6..000000000 --- a/tests/auto/render/opengl/graphicshelpergl2/graphicshelpergl2.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app - -TARGET = tst_graphicshelpergl2 - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_graphicshelpergl2.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp b/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp index a7690924a..5299e3a46 100644 --- a/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp +++ b/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qrendertargetoutput.h> @@ -32,9 +7,7 @@ #include <graphicshelpergl2_p.h> #include <Qt3DRender/private/attachmentpack_p.h> #include <QOpenGLContext> -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include <QOpenGLVersionFunctionsFactory> -#endif #include <QOpenGLBuffer> #include <QOpenGLFunctions_2_0> #include <QOpenGLExtraFunctions> @@ -156,11 +129,7 @@ private Q_SLOTS: return; } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if ((m_func = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_2_0>()) != nullptr) { -#else - if ((m_func = m_glContext.versionFunctions<QOpenGLFunctions_2_0>())) { -#endif m_extraFunctions = m_glContext.extraFunctions(); m_glHelper.initializeHelper(&m_glContext, m_func); m_initializationSuccessful = true; @@ -730,7 +699,7 @@ private Q_SLOTS: std::vector<ShaderAttribute> activeAttributes = m_glHelper.programAttributesAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeAttributes.size(), 2); + QCOMPARE(activeAttributes.size(), 2U); std::sort(activeAttributes.begin(), activeAttributes.end(), [] (const ShaderAttribute &a, const ShaderAttribute &b) { return a.m_name < b.m_name; }); const ShaderAttribute attribute1 = activeAttributes.at(0); @@ -761,7 +730,7 @@ private Q_SLOTS: std::vector<ShaderUniform> activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeUniforms.size(), 4); + QCOMPARE(activeUniforms.size(), 4U); std::sort(activeUniforms.begin(), activeUniforms.end(), [] (const ShaderUniform &a, const ShaderUniform &b) { return a.m_name < b.m_name; }); const ShaderUniform uniform1 = activeUniforms.at(0); diff --git a/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt index 6898d85d0..a8a6e326b 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt +++ b/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from graphicshelpergl3_2.pro. ##################################################################### diff --git a/tests/auto/render/opengl/graphicshelpergl3_2/graphicshelpergl3_2.pro b/tests/auto/render/opengl/graphicshelpergl3_2/graphicshelpergl3_2.pro deleted file mode 100644 index a613f1279..000000000 --- a/tests/auto/render/opengl/graphicshelpergl3_2/graphicshelpergl3_2.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app - -TARGET = tst_graphicshelpergl3_2 - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_graphicshelpergl3_2.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp b/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp index 54662e4e0..2b6d531b6 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp +++ b/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qrendertargetoutput.h> @@ -32,9 +7,7 @@ #include <graphicshelpergl3_2_p.h> #include <Qt3DRender/private/attachmentpack_p.h> #include <QOpenGLBuffer> -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include <QOpenGLVersionFunctionsFactory> -#endif #include <QOpenGLFunctions_3_2_Core> #include <QOpenGLShaderProgram> #include <QOpenGLVertexArrayObject> @@ -210,11 +183,7 @@ private Q_SLOTS: return; } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if ((m_func = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_3_2_Core>()) != nullptr) { -#else - if ((m_func = m_glContext.versionFunctions<QOpenGLFunctions_3_2_Core>())) { -#endif m_glHelper.initializeHelper(&m_glContext, m_func); m_initializationSuccessful = true; } @@ -978,7 +947,7 @@ private Q_SLOTS: const std::vector<ShaderUniformBlock> activeUniformBlocks = m_glHelper.programUniformBlocks(shaderProgram.programId()); // THEN - QCOMPARE(activeUniformBlocks.size(), 1); + QCOMPARE(activeUniformBlocks.size(), 1U); const ShaderUniformBlock uniformBlock = activeUniformBlocks.front(); QCOMPARE(uniformBlock.m_activeUniformsCount, 1); @@ -1006,7 +975,7 @@ private Q_SLOTS: std::vector<ShaderAttribute> activeAttributes = m_glHelper.programAttributesAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeAttributes.size(), 2); + QCOMPARE(activeAttributes.size(), 2U); std::sort(activeAttributes.begin(), activeAttributes.end(), [] (const ShaderAttribute &a, const ShaderAttribute &b) { return a.m_name < b.m_name; }); const ShaderAttribute attribute1 = activeAttributes.at(0); @@ -1037,7 +1006,7 @@ private Q_SLOTS: std::vector<ShaderUniform> activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeUniforms.size(), 4); + QCOMPARE(activeUniforms.size(), 4U); std::sort(activeUniforms.begin(), activeUniforms.end(), [] (const ShaderUniform &a, const ShaderUniform &b) { return a.m_name < b.m_name; }); const ShaderUniform uniform1 = activeUniforms.at(0); diff --git a/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt index 3a750b092..143580d81 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt +++ b/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from graphicshelpergl3_3.pro. ##################################################################### diff --git a/tests/auto/render/opengl/graphicshelpergl3_3/graphicshelpergl3_3.pro b/tests/auto/render/opengl/graphicshelpergl3_3/graphicshelpergl3_3.pro deleted file mode 100644 index ae8e06eba..000000000 --- a/tests/auto/render/opengl/graphicshelpergl3_3/graphicshelpergl3_3.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app - -TARGET = tst_graphicshelpergl3_3 - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib opengl - -CONFIG += testcase - -SOURCES += \ - tst_graphicshelpergl3_3.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp b/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp index 6cd62a170..859c18158 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp +++ b/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qrendertargetoutput.h> @@ -32,9 +7,7 @@ #include <Qt3DRender/private/attachmentpack_p.h> #include <graphicshelpergl3_3_p.h> #include <QOpenGLBuffer> -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include <QOpenGLVersionFunctionsFactory> -#endif #include <QOpenGLFunctions_3_3_Core> #include <QOpenGLShaderProgram> #include <QOpenGLVertexArrayObject> @@ -210,11 +183,7 @@ private Q_SLOTS: return; } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if ((m_func = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_3_3_Core>()) != nullptr) { -#else - if ((m_func = m_glContext.versionFunctions<QOpenGLFunctions_3_3_Core>())) { -#endif m_glHelper.initializeHelper(&m_glContext, m_func); m_initializationSuccessful = true; } @@ -1076,7 +1045,7 @@ private Q_SLOTS: const std::vector<ShaderUniformBlock> activeUniformBlocks = m_glHelper.programUniformBlocks(shaderProgram.programId()); // THEN - QCOMPARE(activeUniformBlocks.size(), 1); + QCOMPARE(activeUniformBlocks.size(), 1U); const ShaderUniformBlock uniformBlock = activeUniformBlocks.front(); QCOMPARE(uniformBlock.m_activeUniformsCount, 1); @@ -1104,7 +1073,7 @@ private Q_SLOTS: std::vector<ShaderAttribute> activeAttributes = m_glHelper.programAttributesAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeAttributes.size(), 2); + QCOMPARE(activeAttributes.size(), 2U); std::sort(activeAttributes.begin(), activeAttributes.end(), [] (const ShaderAttribute &a, const ShaderAttribute &b) { return a.m_name < b.m_name; }); const ShaderAttribute attribute1 = activeAttributes.at(0); @@ -1135,7 +1104,7 @@ private Q_SLOTS: std::vector<ShaderUniform> activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeUniforms.size(), 4); + QCOMPARE(activeUniforms.size(), 4U); std::sort(activeUniforms.begin(), activeUniforms.end(), [] (const ShaderUniform &a, const ShaderUniform &b) { return a.m_name < b.m_name; }); const ShaderUniform uniform1 = activeUniforms.at(0); diff --git a/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt index 494b686e8..9f05f5604 100644 --- a/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt +++ b/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from graphicshelpergl4.pro. ##################################################################### diff --git a/tests/auto/render/opengl/graphicshelpergl4/graphicshelpergl4.pro b/tests/auto/render/opengl/graphicshelpergl4/graphicshelpergl4.pro deleted file mode 100644 index 5ea881208..000000000 --- a/tests/auto/render/opengl/graphicshelpergl4/graphicshelpergl4.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app - -TARGET = tst_graphicshelpergl4 - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_graphicshelpergl4.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp index 2b1aa2b8f..d706f7e8a 100644 --- a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp +++ b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qrendertargetoutput.h> @@ -36,10 +11,7 @@ #include <QOpenGLShaderProgram> #include <QOpenGLVertexArrayObject> #include <QSurfaceFormat> - -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include <QtOpenGL/QOpenGLVersionFunctionsFactory> -#endif #if !QT_CONFIG(opengles2) && defined(QT_OPENGL_4_3) @@ -259,11 +231,7 @@ private Q_SLOTS: return; } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if ((m_func = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_4_3_Core>()) != nullptr) { -#else - if ((m_func = m_glContext.versionFunctions<QOpenGLFunctions_4_3_Core>()) != nullptr) { -#endif m_glHelper.initializeHelper(&m_glContext, m_func); m_initializationSuccessful = true; } @@ -931,11 +899,7 @@ private Q_SLOTS: QVERIFY(error == 0); // THEN -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QList<QVector4D> colors(512 * 512); -#else - QVector<QVector4D> colors(512 * 512); -#endif textures[3]->bind(); m_func->glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_FLOAT, colors.data()); textures[3]->release(); @@ -1360,7 +1324,7 @@ private Q_SLOTS: const std::vector<ShaderUniformBlock> activeUniformBlocks = m_glHelper.programUniformBlocks(shaderProgram.programId()); // THEN - QCOMPARE(activeUniformBlocks.size(), 1); + QCOMPARE(activeUniformBlocks.size(), 1U); const ShaderUniformBlock uniformBlock = activeUniformBlocks.front(); QCOMPARE(uniformBlock.m_activeUniformsCount, 1); @@ -1383,7 +1347,7 @@ private Q_SLOTS: std::vector<ShaderAttribute> activeAttributes = m_glHelper.programAttributesAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeAttributes.size(), 2); + QCOMPARE(activeAttributes.size(), 2U); std::sort(activeAttributes.begin(), activeAttributes.end(), [] (const ShaderAttribute &a, const ShaderAttribute &b) { return a.m_location < b.m_location; }); const ShaderAttribute attribute1 = activeAttributes.at(0); @@ -1414,7 +1378,7 @@ private Q_SLOTS: std::vector<ShaderUniform> activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeUniforms.size(), 4); + QCOMPARE(activeUniforms.size(), 4U); std::sort(activeUniforms.begin(), activeUniforms.end(), [] (const ShaderUniform &a, const ShaderUniform &b) { return a.m_location < b.m_location; }); const ShaderUniform uniform1 = activeUniforms.at(0); diff --git a/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt b/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt index ff49b6d42..96566709c 100644 --- a/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt +++ b/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from materialparametergathererjob.pro. ##################################################################### diff --git a/tests/auto/render/opengl/materialparametergathererjob/materialparametergathererjob.pro b/tests/auto/render/opengl/materialparametergathererjob/materialparametergathererjob.pro deleted file mode 100644 index 106e7a263..000000000 --- a/tests/auto/render/opengl/materialparametergathererjob/materialparametergathererjob.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE = app - -TARGET = tst_materialparametergathererjob - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_materialparametergathererjob.cpp - -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp b/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp index 73017bead..f8d2ecdb6 100644 --- a/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp +++ b/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qentity.h> @@ -237,7 +212,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 0); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 0U); // WHEN gatherer->run(); @@ -257,7 +232,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); // WHEN gatherer->setHandles(testAspect.nodeManagers()->materialManager()->activeHandles()); @@ -279,7 +254,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); // WHEN gatherer->setHandles(testAspect.nodeManagers()->materialManager()->activeHandles()); @@ -311,7 +286,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast<Qt3DRender::Render::TechniqueFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(frameGraphFilter->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -351,7 +326,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast<Qt3DRender::Render::TechniqueFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(frameGraphFilter->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -387,7 +362,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast<Qt3DRender::Render::TechniqueFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(frameGraphFilter->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -421,7 +396,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::RenderPassFilter *backendPassFilter = static_cast<Qt3DRender::Render::RenderPassFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(frameGraphFilter->id())); QVERIFY(backendPassFilter != nullptr); @@ -461,7 +436,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::RenderPassFilter *backendPassFilter = static_cast<Qt3DRender::Render::RenderPassFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(frameGraphFilter->id())); QVERIFY(backendPassFilter != nullptr); @@ -512,7 +487,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast<Qt3DRender::Render::TechniqueFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast<Qt3DRender::Render::RenderPassFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -527,7 +502,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); @@ -568,7 +543,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast<Qt3DRender::Render::TechniqueFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast<Qt3DRender::Render::RenderPassFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -583,7 +558,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); @@ -623,7 +598,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast<Qt3DRender::Render::TechniqueFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast<Qt3DRender::Render::RenderPassFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -638,7 +613,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); @@ -677,7 +652,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast<Qt3DRender::Render::TechniqueFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast<Qt3DRender::Render::RenderPassFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -692,7 +667,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); @@ -727,7 +702,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast<Qt3DRender::Render::TechniqueFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast<Qt3DRender::Render::RenderPassFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -742,7 +717,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); @@ -771,7 +746,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast<Qt3DRender::Render::TechniqueFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast<Qt3DRender::Render::RenderPassFilter *>(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -786,7 +761,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); diff --git a/tests/auto/render/opengl/opengl.pro b/tests/auto/render/opengl/opengl.pro deleted file mode 100644 index 2e99a970d..000000000 --- a/tests/auto/render/opengl/opengl.pro +++ /dev/null @@ -1,23 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += \ - filtercompatibletechniquejob \ - graphicshelpergl3_3 \ - graphicshelpergl3_2 \ - graphicshelpergl2 \ - glshadermanager \ - textures \ - renderer \ - renderviewutils \ - renderviews \ - renderqueue \ - renderviewbuilder \ - qgraphicsutils \ - computecommand \ - gltexturemanager - -qtHaveModule(quick) { - SUBDIRS += \ - materialparametergathererjob -} -!macos: SUBDIRS += graphicshelpergl4 diff --git a/tests/auto/render/opengl/opengl_render_plugin.pri b/tests/auto/render/opengl/opengl_render_plugin.pri deleted file mode 100644 index 50fade878..000000000 --- a/tests/auto/render/opengl/opengl_render_plugin.pri +++ /dev/null @@ -1,18 +0,0 @@ -# Found no way of having the test runner include the correct -# library path as runtime - -#PLUGIN_SRC_PATH = $$PWD/../../../../src/plugins/renderers/opengl - -#INCLUDEPATH += \ -# $$PLUGIN_SRC_PATH/graphicshelpers \ -# $$PLUGIN_SRC_PATH/io \ -# $$PLUGIN_SRC_PATH/jobs \ -# $$PLUGIN_SRC_PATH/managers \ -# $$PLUGIN_SRC_PATH/renderer \ -# $$PLUGIN_SRC_PATH/renderstates \ -# $$PLUGIN_SRC_PATH/textures - -#LIBS += -L$$[QT_INSTALL_PLUGINS]/renderers/ -lopenglrenderer - -# Instead we link against the sources directly -include(../../../../src/plugins/renderers/opengl/opengl.pri) diff --git a/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt b/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt index c0874f12e..496be0d86 100644 --- a/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt +++ b/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qgraphicsutils.pro. ##################################################################### diff --git a/tests/auto/render/opengl/qgraphicsutils/qgraphicsutils.pro b/tests/auto/render/opengl/qgraphicsutils/qgraphicsutils.pro deleted file mode 100644 index 8c936c527..000000000 --- a/tests/auto/render/opengl/qgraphicsutils/qgraphicsutils.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qgraphicsutils - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qgraphicsutils.cpp - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp b/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp index aefbeffbe..b7af84ba6 100644 --- a/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp +++ b/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2014 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) 2014 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qgraphicsutils_p.h> diff --git a/tests/auto/render/opengl/renderer/CMakeLists.txt b/tests/auto/render/opengl/renderer/CMakeLists.txt index 209b10fa2..9bb043c51 100644 --- a/tests/auto/render/opengl/renderer/CMakeLists.txt +++ b/tests/auto/render/opengl/renderer/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from renderer.pro. ##################################################################### diff --git a/tests/auto/render/opengl/renderer/renderer.pro b/tests/auto/render/opengl/renderer/renderer.pro deleted file mode 100644 index a4a459655..000000000 --- a/tests/auto/render/opengl/renderer/renderer.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_renderer - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_renderer.cpp - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) - -CONFIG += useCommonTestAspect -include(../../commons/commons.pri) diff --git a/tests/auto/render/opengl/renderer/tst_renderer.cpp b/tests/auto/render/opengl/renderer/tst_renderer.cpp index 69855f346..46c909a1e 100644 --- a/tests/auto/render/opengl/renderer/tst_renderer.cpp +++ b/tests/auto/render/opengl/renderer/tst_renderer.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QMutex> @@ -81,14 +56,14 @@ private Q_SLOTS: std::vector<Qt3DCore::QAspectJobPtr> jobs = renderer.preRenderingJobs(); // THEN - QCOMPARE(jobs.size(), 0); + QCOMPARE(jobs.size(), 0U); // WHEN renderer.m_sendBufferCaptureJob->addRequest({Qt3DCore::QNodeId(), {}}); jobs = renderer.preRenderingJobs(); // THEN - QCOMPARE(jobs.size(), 1); // SendBufferCaptureJob + QCOMPARE(jobs.size(), 1U); // SendBufferCaptureJob // Note: pending render buffer captures are only cleared when the job is run // WHEN @@ -97,7 +72,7 @@ private Q_SLOTS: // THEN QCOMPARE(jobs.size(), - 1); // SendBufferCaptureJob´ + 1U); // SendBufferCaptureJob´ // Note: pending set fence handles are only cleared when the job is run // Properly shutdown command thread @@ -138,16 +113,16 @@ private Q_SLOTS: // NOTE: FilterCompatibleTechniqueJob and ShaderGathererJob cannot run because the context // is not initialized in this test - const int renderViewBuilderMaterialCacheJobCount = 1 + 1; + const uint renderViewBuilderMaterialCacheJobCount = 1 + 1; // syncMaterialGathererJob // n * materialGathererJob (where n depends on the numbers of available threads and the number of materials) - const int layerCacheJobCount = 2; + const uint layerCacheJobCount = 2; // filterEntityByLayerJob, // syncFilterEntityByLayerJob - const int singleRenderViewCommandRebuildJobCount = 1 + Qt3DCore::QAspectJobManager::idealThreadCount(); + const uint singleRenderViewCommandRebuildJobCount = 1 + Qt3DCore::QAspectJobManager::idealThreadCount(); - const int singleRenderViewJobCount = 8 + 1 * Qt3DCore::QAspectJobManager::idealThreadCount(); + const uint singleRenderViewJobCount = 8 + 1 * Qt3DCore::QAspectJobManager::idealThreadCount(); // RenderViewBuilder renderViewJob, // syncRenderViewInitializationJob, // syncFrustumCullingJob, diff --git a/tests/auto/render/opengl/renderqueue/CMakeLists.txt b/tests/auto/render/opengl/renderqueue/CMakeLists.txt index a2c5cb688..ed215fcd0 100644 --- a/tests/auto/render/opengl/renderqueue/CMakeLists.txt +++ b/tests/auto/render/opengl/renderqueue/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from renderqueue.pro. ##################################################################### diff --git a/tests/auto/render/opengl/renderqueue/renderqueue.pro b/tests/auto/render/opengl/renderqueue/renderqueue.pro deleted file mode 100644 index 19106ba92..000000000 --- a/tests/auto/render/opengl/renderqueue/renderqueue.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE = app - -TARGET = tst_renderqueue - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_renderqueue.cpp - -include(../../../core/common/common.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp index ca176f7c2..f6abfdf36 100644 --- a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp +++ b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2014 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) 2014 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QMutex> @@ -199,7 +174,8 @@ void tst_RenderQueue::concurrentQueueAccess() // WHEN unlocked // THEN QVERIFY (renderQueue->isFrameQueueComplete()); - QCOMPARE(renderQueue->nextFrameQueue().size(), renderQueue->targetRenderViewCount()); + QCOMPARE(renderQueue->nextFrameQueue().size(), + size_t(renderQueue->targetRenderViewCount())); // reset queue for next frame renderQueue->reset(); diff --git a/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt b/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt index 1cfec3785..5a439d5a0 100644 --- a/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt +++ b/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from renderviewbuilder.pro. ##################################################################### diff --git a/tests/auto/render/opengl/renderviewbuilder/renderviewbuilder.pro b/tests/auto/render/opengl/renderviewbuilder/renderviewbuilder.pro deleted file mode 100644 index b7b8f5b81..000000000 --- a/tests/auto/render/opengl/renderviewbuilder/renderviewbuilder.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_renderviewbuilder - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_renderviewbuilder.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp index 62b0bed05..53848c340 100644 --- a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp +++ b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/qaspectjobmanager_p.h> @@ -251,8 +226,8 @@ private Q_SLOTS: QVERIFY(renderViewBuilder.syncRenderViewPostCommandUpdateJob().isNull()); QVERIFY(renderViewBuilder.syncRenderViewPostInitializationJob().isNull()); - QCOMPARE(renderViewBuilder.renderViewCommandUpdaterJobs().size(), 0); - QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 0); + QCOMPARE(renderViewBuilder.renderViewCommandUpdaterJobs().size(), 0U); + QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 0U); // WHEN renderViewBuilder.prepareJobs(); @@ -264,9 +239,9 @@ private Q_SLOTS: QVERIFY(renderViewBuilder.filterEntityByLayerJob().isNull()); QVERIFY(renderViewBuilder.syncFilterEntityByLayerJob().isNull()); - QCOMPARE(renderViewBuilder.renderViewCommandUpdaterJobs().size(), Qt3DCore::QAspectJobManager::idealThreadCount()); - QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 0); - QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 8 + 1 * Qt3DCore::QAspectJobManager::idealThreadCount()); + QCOMPARE(renderViewBuilder.renderViewCommandUpdaterJobs().size(), size_t(Qt3DCore::QAspectJobManager::idealThreadCount())); + QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 0U); + QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 8U + 1 * Qt3DCore::QAspectJobManager::idealThreadCount()); } { @@ -282,7 +257,7 @@ private Q_SLOTS: QVERIFY(!renderViewBuilder.syncFilterEntityByLayerJob().isNull()); // mark jobs dirty and recheck - QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 10 + renderViewBuilder.optimalJobCount()); + QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 10U + renderViewBuilder.optimalJobCount()); } { @@ -296,11 +271,11 @@ private Q_SLOTS: QCOMPARE(renderViewBuilder.materialGathererCacheNeedsToBeRebuilt(), true); // We have elementsPerJob = qMax(materialHandles.size() / m_optimalParallelJobCount, 1) // Given we have 2 materials -> 1 element per job -> so we need 2 jobs - QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 2); + QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 2U); QVERIFY(!renderViewBuilder.syncMaterialGathererJob().isNull()); // mark jobs dirty and recheck - QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 13); + QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 13U); } } @@ -328,10 +303,10 @@ private Q_SLOTS: // THEN // Step 1 - QCOMPARE(renderViewBuilder.renderViewJob()->dependencies().size(), 1); // Depends upon skinning palette update + QCOMPARE(renderViewBuilder.renderViewJob()->dependencies().size(), 1U); // Depends upon skinning palette update // Step 2 - QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().size(), 1); + QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().size(), 1U); QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().front().toStrongRef().data(), renderViewBuilder.renderViewJob().data()); @@ -339,21 +314,21 @@ private Q_SLOTS: QVERIFY(renderViewBuilder.filterEntityByLayerJob().isNull()); QVERIFY(renderViewBuilder.syncFilterEntityByLayerJob().isNull()); - QCOMPARE(renderViewBuilder.filterProximityJob()->dependencies().size(), 2); + QCOMPARE(renderViewBuilder.filterProximityJob()->dependencies().size(), 2U); QVERIFY(containsDependency(renderViewBuilder.filterProximityJob()->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(renderViewBuilder.filterProximityJob()->dependencies(), expandBVJob)); - QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().size(), 1); + QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().size(), 1U); QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().front().toStrongRef().data(), renderViewBuilder.syncRenderViewPostInitializationJob().data()); - QCOMPARE(renderViewBuilder.syncPreFrustumCullingJob()->dependencies().size(), 3); + QCOMPARE(renderViewBuilder.syncPreFrustumCullingJob()->dependencies().size(), 3U); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), wordTransformJob)); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), testAspect.renderer()->updateShaderDataTransformJob())); // Step 4 - QCOMPARE(renderViewBuilder.frustumCullingJob()->dependencies().size(), 2); + QCOMPARE(renderViewBuilder.frustumCullingJob()->dependencies().size(), 2U); QVERIFY(containsDependency(renderViewBuilder.frustumCullingJob()->dependencies(), renderViewBuilder.syncPreFrustumCullingJob())); QVERIFY(containsDependency(renderViewBuilder.frustumCullingJob()->dependencies(), expandBVJob)); @@ -368,7 +343,7 @@ private Q_SLOTS: // Step 5 for (const auto &renderViewBuilderJob : renderViewBuilder.renderViewCommandUpdaterJobs()) { - QCOMPARE(renderViewBuilderJob->dependencies().size(), 1); + QCOMPARE(renderViewBuilderJob->dependencies().size(), 1U); QCOMPARE(renderViewBuilderJob->dependencies().front().toStrongRef().data(), renderViewBuilder.syncRenderViewPreCommandUpdateJob().data()); } @@ -389,44 +364,44 @@ private Q_SLOTS: // THEN // Step 1 - QCOMPARE(renderViewBuilder.renderViewJob()->dependencies().size(), 1); // Depends upon skinning palette update + QCOMPARE(renderViewBuilder.renderViewJob()->dependencies().size(), 1U); // Depends upon skinning palette update // Step 2 - QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().size(), 1); + QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().size(), 1U); QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().front().toStrongRef().data(), renderViewBuilder.renderViewJob().data()); // Step 3 - QCOMPARE(renderViewBuilder.filterEntityByLayerJob()->dependencies().size(), 3); + QCOMPARE(renderViewBuilder.filterEntityByLayerJob()->dependencies().size(), 3U); QVERIFY(containsDependency(renderViewBuilder.filterEntityByLayerJob()->dependencies(), updateEntityLayerJob)); QVERIFY(containsDependency(renderViewBuilder.filterEntityByLayerJob()->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(renderViewBuilder.filterEntityByLayerJob()->dependencies(), updateTreeEnabledJob)); - QCOMPARE(renderViewBuilder.syncFilterEntityByLayerJob()->dependencies().size(), 1); + QCOMPARE(renderViewBuilder.syncFilterEntityByLayerJob()->dependencies().size(), 1U); QVERIFY(containsDependency(renderViewBuilder.syncFilterEntityByLayerJob()->dependencies(), renderViewBuilder.filterEntityByLayerJob())); - QCOMPARE(renderViewBuilder.filterProximityJob()->dependencies().size(), 2); + QCOMPARE(renderViewBuilder.filterProximityJob()->dependencies().size(), 2U); QVERIFY(containsDependency(renderViewBuilder.filterProximityJob()->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(renderViewBuilder.filterProximityJob()->dependencies(), expandBVJob)); - QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().size(), 1); + QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().size(), 1U); QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().front().toStrongRef().data(), renderViewBuilder.syncRenderViewPostInitializationJob().data()); - QCOMPARE(renderViewBuilder.syncPreFrustumCullingJob()->dependencies().size(), 3); + QCOMPARE(renderViewBuilder.syncPreFrustumCullingJob()->dependencies().size(), 3U); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), wordTransformJob)); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), testAspect.renderer()->updateShaderDataTransformJob())); for (const auto &materialGatherer : renderViewBuilder.materialGathererJobs()) { - QCOMPARE(materialGatherer->dependencies().size(), 3); + QCOMPARE(materialGatherer->dependencies().size(), 3U); QVERIFY(containsDependency(materialGatherer->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(materialGatherer->dependencies(), testAspect.renderer()->introspectShadersJob())); QVERIFY(containsDependency(materialGatherer->dependencies(), testAspect.renderer()->filterCompatibleTechniqueJob())); } // Step 4 - QCOMPARE(renderViewBuilder.frustumCullingJob()->dependencies().size(), 2); + QCOMPARE(renderViewBuilder.frustumCullingJob()->dependencies().size(), 2U); QVERIFY(containsDependency(renderViewBuilder.frustumCullingJob()->dependencies(), renderViewBuilder.syncPreFrustumCullingJob())); QVERIFY(containsDependency(renderViewBuilder.frustumCullingJob()->dependencies(), expandBVJob)); @@ -440,7 +415,7 @@ private Q_SLOTS: // Step 5 for (const auto &renderViewBuilderJob : renderViewBuilder.renderViewCommandUpdaterJobs()) { - QCOMPARE(renderViewBuilderJob->dependencies().size(), 1); + QCOMPARE(renderViewBuilderJob->dependencies().size(), 1U); QCOMPARE(renderViewBuilderJob->dependencies().front().toStrongRef().data(), renderViewBuilder.syncRenderViewPreCommandUpdateJob().data()); } @@ -491,7 +466,7 @@ private Q_SLOTS: // THEN Qt3DRender::Render::RendererCache<Qt3DRender::Render::OpenGL::RenderCommand> *cache = renderer->cache(); - QCOMPARE(cache->gatheredLights.size(), 2); + QCOMPARE(cache->gatheredLights.size(), 2U); QVERIFY(cache->environmentLight != nullptr); } @@ -512,7 +487,7 @@ private Q_SLOTS: // THEN Qt3DRender::Render::RendererCache<Qt3DRender::Render::OpenGL::RenderCommand> *cache = renderer->cache(); - QCOMPARE(cache->renderableEntities.size(), 1); + QCOMPARE(cache->renderableEntities.size(), 1U); } void checkComputableEntitiesFilteringExecution() @@ -532,7 +507,7 @@ private Q_SLOTS: // THEN Qt3DRender::Render::RendererCache<Qt3DRender::Render::OpenGL::RenderCommand> *cache = renderer->cache(); - QCOMPARE(cache->computeEntities.size(), 1); + QCOMPARE(cache->computeEntities.size(), 1U); } void checkSyncRenderViewInitializationExecution() @@ -675,8 +650,8 @@ private Q_SLOTS: std::vector<Qt3DRender::Render::Entity *> filteredEntity = renderViewBuilder.filterEntityByLayerJob()->filteredEntities(); // THEN - QCOMPARE(renderableEntity.size(), 200); - QCOMPARE(filteredEntity.size(), 100); + QCOMPARE(renderableEntity.size(), 200U); + QCOMPARE(filteredEntity.size(), 100U); std::sort(renderableEntity.begin(), renderableEntity.end()); @@ -684,7 +659,7 @@ private Q_SLOTS: renderableEntity = Qt3DRender::Render::entitiesInSubset(renderableEntity, filteredEntity); // THEN - QCOMPARE(renderableEntity.size(), 100); + QCOMPARE(renderableEntity.size(), 100U); for (const auto entity : renderableEntity) { QVERIFY(std::find(filteredEntity.begin(), filteredEntity.end(), diff --git a/tests/auto/render/opengl/renderviews/CMakeLists.txt b/tests/auto/render/opengl/renderviews/CMakeLists.txt index e3c0b0f58..bcc8b88d1 100644 --- a/tests/auto/render/opengl/renderviews/CMakeLists.txt +++ b/tests/auto/render/opengl/renderviews/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from renderviews.pro. ##################################################################### diff --git a/tests/auto/render/opengl/renderviews/renderviews.pro b/tests/auto/render/opengl/renderviews/renderviews.pro deleted file mode 100644 index 7efbaec14..000000000 --- a/tests/auto/render/opengl/renderviews/renderviews.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_renderviews - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_renderviews.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/renderviews/tst_renderviews.cpp b/tests/auto/render/opengl/renderviews/tst_renderviews.cpp index 9d4765f8a..f73a9e7db 100644 --- a/tests/auto/render/opengl/renderviews/tst_renderviews.cpp +++ b/tests/auto/render/opengl/renderviews/tst_renderviews.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 #include <QtTest/QTest> #include <qbackendnodetester.h> @@ -294,6 +269,68 @@ private Q_SLOTS: << QList<ShaderParameterPack> { pack1, minifiedPack1, minifiedPack1, pack1, minifiedPack1, minifiedPack1 }; } + void checkShaderParameterPackStoresSingleUBOPerBlockIndex() + { + // GIVEN + ShaderParameterPack pack; + auto nodeId1 = Qt3DCore::QNodeId::createId(); + auto nodeId2 = Qt3DCore::QNodeId::createId(); + + BlockToUBO ubo1 { 1, nodeId1, false, {}}; + BlockToUBO ubo2 { 1, nodeId2, false, {}}; + + // WHEN + pack.setUniformBuffer(ubo1); + pack.setUniformBuffer(ubo2); + + // THEN + QCOMPARE(pack.uniformBuffers().size(), 1U); + QCOMPARE(pack.uniformBuffers().front().m_blockIndex, 1); + QCOMPARE(pack.uniformBuffers().front().m_bufferID, nodeId2); + + // WHEN + BlockToUBO ubo3 { 2, nodeId2, false, {}}; + pack.setUniformBuffer(ubo3); + + // THEN + QCOMPARE(pack.uniformBuffers().size(), 2U); + QCOMPARE(pack.uniformBuffers().front().m_blockIndex, 1); + QCOMPARE(pack.uniformBuffers().front().m_bufferID, nodeId2); + QCOMPARE(pack.uniformBuffers().back().m_blockIndex, 2); + QCOMPARE(pack.uniformBuffers().back().m_bufferID, nodeId2); + } + + void checkShaderParameterPackStoresSingleSSBOPerBlockIndex() + { + // GIVEN + ShaderParameterPack pack; + auto nodeId1 = Qt3DCore::QNodeId::createId(); + auto nodeId2 = Qt3DCore::QNodeId::createId(); + + BlockToSSBO ssbo1 { 1, 0, nodeId1}; + BlockToSSBO ssbo2 { 1, 0, nodeId2}; + + // WHEN + pack.setShaderStorageBuffer(ssbo1); + pack.setShaderStorageBuffer(ssbo2); + + // THEN + QCOMPARE(pack.shaderStorageBuffers().size(), 1U); + QCOMPARE(pack.shaderStorageBuffers().front().m_blockIndex, 1); + QCOMPARE(pack.shaderStorageBuffers().front().m_bufferID, nodeId2); + + // WHEN + BlockToSSBO ssbo3 { 2, 1, nodeId2}; + pack.setShaderStorageBuffer(ssbo3); + + // THEN + QCOMPARE(pack.shaderStorageBuffers().size(), 2U); + QCOMPARE(pack.shaderStorageBuffers().front().m_blockIndex, 1); + QCOMPARE(pack.shaderStorageBuffers().front().m_bufferID, nodeId2); + QCOMPARE(pack.shaderStorageBuffers().back().m_blockIndex, 2); + QCOMPARE(pack.shaderStorageBuffers().back().m_bufferID, nodeId2); + } + void checkRenderViewUniformMinification() { QFETCH(QList<QShaderProgram*>, shaders); diff --git a/tests/auto/render/opengl/renderviewutils/CMakeLists.txt b/tests/auto/render/opengl/renderviewutils/CMakeLists.txt index 771e49e10..d4e5a3b13 100644 --- a/tests/auto/render/opengl/renderviewutils/CMakeLists.txt +++ b/tests/auto/render/opengl/renderviewutils/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from renderviewutils.pro. ##################################################################### diff --git a/tests/auto/render/opengl/renderviewutils/renderviewutils.pro b/tests/auto/render/opengl/renderviewutils/renderviewutils.pro deleted file mode 100644 index e9c9f8d51..000000000 --- a/tests/auto/render/opengl/renderviewutils/renderviewutils.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_renderviewutils - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_renderviewutils.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp index 629952422..d6f3ce220 100644 --- a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp +++ b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.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 #include <QtTest/QTest> #include <qbackendnodetester.h> @@ -462,7 +437,7 @@ void tst_RenderViewUtils::topLevelScalarValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock")); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1); + QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 1); // WHEN Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); @@ -536,7 +511,7 @@ void tst_RenderViewUtils::topLevelTextureValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock")); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1); + QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 1); // WHEN Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); @@ -577,7 +552,7 @@ void tst_RenderViewUtils::topLevelArrayValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock")); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1); + QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 1); // WHEN Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); @@ -647,7 +622,7 @@ void tst_RenderViewUtils::nestedShaderDataValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendArrayShaderData, QStringLiteral("MyBlock")); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 3); + QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 3); // WHEN auto it = blockBuilder.activeUniformNamesToValue.cbegin(); @@ -721,7 +696,8 @@ void tst_RenderViewUtils::topLevelStructValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, blockName); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), shaderData->buildUniformMapNameIds(blockName).size()); + QCOMPARE(size_t(blockBuilder.activeUniformNamesToValue.size()), + shaderData->buildUniformMapNameIds(blockName).size()); // WHEN Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); @@ -770,7 +746,7 @@ void tst_RenderViewUtils::topLevelDynamicProperties() // build name-value map blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock")); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 3); + QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 3); QCOMPARE(blockBuilder.activeUniformNamesToValue.value(Qt3DRender::Render::StringToInt::lookupId("MyBlock.scalar")), shaderData->property("scalar")); @@ -835,8 +811,8 @@ void tst_RenderViewUtils::transformedProperties() // THEN QCOMPARE(position0Value, positionQt); - QCOMPARE(position1Value, viewMatrix * worldMatrix * position); - QCOMPARE(position2Value, worldMatrix * position); + QCOMPARE(position1Value, (viewMatrix * worldMatrix).map(position)); + QCOMPARE(position2Value, worldMatrix.map(position)); QCOMPARE(position3Value, Vector3D((worldMatrix * Vector4D(position, 0.0f)))); } diff --git a/tests/auto/render/opengl/textures/CMakeLists.txt b/tests/auto/render/opengl/textures/CMakeLists.txt index ce74fcfac..fac0800f0 100644 --- a/tests/auto/render/opengl/textures/CMakeLists.txt +++ b/tests/auto/render/opengl/textures/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from textures.pro. ##################################################################### diff --git a/tests/auto/render/opengl/textures/textures.pro b/tests/auto/render/opengl/textures/textures.pro deleted file mode 100644 index a116756af..000000000 --- a/tests/auto/render/opengl/textures/textures.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_textures - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_textures.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/textures/tst_textures.cpp b/tests/auto/render/opengl/textures/tst_textures.cpp index 8eb338f90..72c09a342 100644 --- a/tests/auto/render/opengl/textures/tst_textures.cpp +++ b/tests/auto/render/opengl/textures/tst_textures.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> diff --git a/tests/auto/render/parameter/CMakeLists.txt b/tests/auto/render/parameter/CMakeLists.txt index a3e197e5f..3d7a7c1b1 100644 --- a/tests/auto/render/parameter/CMakeLists.txt +++ b/tests/auto/render/parameter/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from parameter.pro. ##################################################################### ## tst_parameter Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_parameter LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_parameter SOURCES tst_parameter.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/parameter/parameter.pro b/tests/auto/render/parameter/parameter.pro deleted file mode 100644 index 8a0ad9dc1..000000000 --- a/tests/auto/render/parameter/parameter.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_parameter - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_parameter.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/parameter/tst_parameter.cpp b/tests/auto/render/parameter/tst_parameter.cpp index 625256fc4..77ad44515 100644 --- a/tests/auto/render/parameter/tst_parameter.cpp +++ b/tests/auto/render/parameter/tst_parameter.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qparameter.h> diff --git a/tests/auto/render/pickboundingvolumejob/CMakeLists.txt b/tests/auto/render/pickboundingvolumejob/CMakeLists.txt index 4e3404870..01f9b5d79 100644 --- a/tests/auto/render/pickboundingvolumejob/CMakeLists.txt +++ b/tests/auto/render/pickboundingvolumejob/CMakeLists.txt @@ -1,16 +1,25 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from pickboundingvolumejob.pro. ##################################################################### ## tst_pickboundingvolumejob Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_pickboundingvolumejob LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_pickboundingvolumejob SOURCES ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_pickboundingvolumejob.cpp INCLUDE_DIRECTORIES ../qmlscenereader - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DExtras diff --git a/tests/auto/render/pickboundingvolumejob/pickboundingvolumejob.pro b/tests/auto/render/pickboundingvolumejob/pickboundingvolumejob.pro deleted file mode 100644 index f89ba0173..000000000 --- a/tests/auto/render/pickboundingvolumejob/pickboundingvolumejob.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app - -TARGET = tst_pickboundingvolumejob -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_pickboundingvolumejob.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 += \ - pickboundingvolumejob.qrc diff --git a/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml b/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml index 87e7a8aac..03cd0ab13 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_childentity.qml b/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml index 7376b53e5..ac9a712a2 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_dragdisabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml index 9b7f973a9..170057769 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_dragenabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml index 747b7e858..1b8e031b9 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml index f80726068..2294be884 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_dragenabledoverlapping.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml index 4280b8555..344e14f93 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_improperframegraph.qml b/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml index f0b88acba..70ac60921 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_layerfilter.qml b/tests/auto/render/pickboundingvolumejob/testscene_layerfilter.qml index 392623a6a..23b3e17e2 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_layerfilter.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_layerfilter.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_nested_layerfilter.qml b/tests/auto/render/pickboundingvolumejob/testscene_nested_layerfilter.qml index b913b6f5f..806586d15 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_nested_layerfilter.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_nested_layerfilter.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_nopicking.qml b/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml index 86471f8b2..c3b27a7fd 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.14 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml b/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml index 759544bb9..9fc0c1cc8 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_pickersdisabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml index a24289835..540fa34db 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/testscene_priorityoverlapping.qml b/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml index 7cacb3d2d..d72c66cb6 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.13 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml b/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml index daafc0edd..3d7526711 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// 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/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp index df0eab407..ed748b8c7 100644 --- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp +++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qmlscenereader.h" #include "testarbiter.h" @@ -329,7 +304,7 @@ private Q_SLOTS: const std::vector<Qt3DRender::Render::PickingUtils::ViewportCameraAreaDetails> &results = gatherer.gather(test->frameGraphRoot()); // THEN - QCOMPARE(results.size(), 1); + QCOMPARE(results.size(), 1U); auto vca = results.front(); QCOMPARE(vca.area, QSize(600, 600)); QCOMPARE(vca.cameraId, camera->id()); @@ -392,7 +367,7 @@ private Q_SLOTS: { // WHEN - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207., 303.), QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -406,7 +381,7 @@ private Q_SLOTS: { // WHEN - auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(207., 303.), QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -417,7 +392,7 @@ private Q_SLOTS: { // WHEN - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(390., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(390., 300.), QPointF(390., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -431,7 +406,7 @@ private Q_SLOTS: { // WHEN - auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(390., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(390., 300.), QPointF(390., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -491,7 +466,7 @@ private Q_SLOTS: QVERIFY(earlyReturn); // WHEN - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(400., 440.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(400., 440.), QPointF(400., 440.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); earlyReturn = !pickBVJob.runHelper(); @@ -540,7 +515,7 @@ private Q_SLOTS: Qt3DRender::Render::PickBoundingVolumeJob pickBVJob; initializePickBoundingVolumeJob(&pickBVJob, test.data()); - auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(207., 303.), + auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(207., 303.), QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); @@ -596,7 +571,7 @@ private Q_SLOTS: Qt3DRender::Render::PickBoundingVolumeJob pickBVJob; initializePickBoundingVolumeJob(&pickBVJob, test.data()); - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207., 303.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207., 303.), QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -646,7 +621,7 @@ private Q_SLOTS: { // WHEN - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207., 303.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207., 303.), QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -658,7 +633,7 @@ private Q_SLOTS: { // WHEN - auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(207., 303.), + auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(207., 303.), QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -709,7 +684,7 @@ private Q_SLOTS: { // WHEN - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207., 303.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207., 303.), QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -721,7 +696,7 @@ private Q_SLOTS: { // WHEN - auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(207., 303.), + auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(207., 303.), QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -771,7 +746,7 @@ private Q_SLOTS: Qt3DRender::Render::PickBoundingVolumeJob pickBVJob; initializePickBoundingVolumeJob(&pickBVJob, test.data()); - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207., 303.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207., 303.), QPointF(207., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); const bool earlyReturn = !pickBVJob.runHelper(); @@ -846,7 +821,7 @@ private Q_SLOTS: QVERIFY(mouseClickedSpy.isValid()); { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207.0, 303.0), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207.0, 303.0), QPointF(207.0, 303.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -856,15 +831,15 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); } { // WHEN -> Move on same object - auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(207.0, 303.0), + auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(207.0, 303.0), QPointF(207.0, 303.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -874,15 +849,15 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); } { // WHEN -> Release on object - auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(207.0, 303.0), + auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(207.0, 303.0), QPointF(207.0, 303.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -892,10 +867,10 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseButtonReleasedSpy.count(), /*backAndFrontPicking ? 2 :*/ 1); - QCOMPARE(mouseClickedSpy.count(), 1); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseButtonReleasedSpy.size(), /*backAndFrontPicking ? 2 :*/ 1); + QCOMPARE(mouseClickedSpy.size(), 1); } mouseButtonPressedSpy.clear(); @@ -905,10 +880,10 @@ private Q_SLOTS: { // WHEN -> Release outside of object - auto event1 = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207.0, 303.0), + auto event1 = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207.0, 303.0), QPointF(207.0, 303.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event1); - auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(0.0, 0.0), + auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(0.0, 0.0), QPointF(0.0, 0.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event2); bool earlyReturn = !pickBVJob.runHelper(); @@ -918,9 +893,9 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 1); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 1); } } @@ -974,7 +949,7 @@ private Q_SLOTS: initializePickBoundingVolumeJob(&pickBVJob, test.data()); { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207.0, 303.0), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(207.0, 303.0), QPointF(207.0, 303.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -984,14 +959,14 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); } { // WHEN -> Releasing out of the viewport - auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(10000.0, 10000.0), + auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(10000.0, 10000.0), QPointF(10000.0, 10000.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1001,9 +976,9 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 1); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 1); } mouseButtonPressedSpy.clear(); @@ -1012,18 +987,19 @@ private Q_SLOTS: { // WHEN -> Releasing out of the viewport - auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(10000.0, 10000.0), + auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(10000.0, 10000.0), QPointF(10000.0, 10000.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); + Q_UNUSED(earlyReturn); Qt3DCore::QAspectJobPrivate::get(&pickBVJob)->postFrame(test->aspectManager()); // THEN -> Should have received nothing QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 0); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 0); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); } } @@ -1084,7 +1060,7 @@ private Q_SLOTS: initializePickBoundingVolumeJob(&pickBVJob, test.data()); { - auto event = QMouseEvent(QMouseEvent::HoverMove, QPointF(207.0, 303.0), + auto event = QMouseEvent(QMouseEvent::HoverMove, QPointF(207.0, 303.0), QPointF(207.0, 303.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1094,13 +1070,13 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseEntered.count(), 1); - QCOMPARE(mouseExited.count(), 0); + QCOMPARE(mouseEntered.size(), 1); + QCOMPARE(mouseExited.size(), 0); } { // WHEN -> HoverMove Out - auto event = QMouseEvent(QEvent::HoverMove, QPointF(20.0, 40.0), + auto event = QMouseEvent(QEvent::HoverMove, QPointF(20.0, 40.0), QPointF(20.0, 40.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1110,8 +1086,8 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseEntered.count(), 1); - QCOMPARE(mouseExited.count(), 1); + QCOMPARE(mouseEntered.size(), 1); + QCOMPARE(mouseExited.size(), 1); } mouseEntered.clear(); @@ -1119,10 +1095,10 @@ private Q_SLOTS: // WHEN -> HoverMove In + Pressed other { - auto event1 = QMouseEvent(QEvent::HoverMove, QPointF(207.0, 303.0), + auto event1 = QMouseEvent(QEvent::HoverMove, QPointF(207.0, 303.0), QPointF(207.0, 303.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event1); - auto event2 = QMouseEvent(QEvent::MouseButtonPress, QPointF(0.0, 0.0), + auto event2 = QMouseEvent(QEvent::MouseButtonPress, QPointF(0.0, 0.0), QPointF(0.0, 0.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event2); bool earlyReturn = !pickBVJob.runHelper(); @@ -1132,8 +1108,8 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseEntered.count(), 1); - QCOMPARE(mouseExited.count(), 1); + QCOMPARE(mouseEntered.size(), 1); + QCOMPARE(mouseExited.size(), 1); } } @@ -1200,7 +1176,7 @@ private Q_SLOTS: initializePickBoundingVolumeJob(&pickBVJob, test.data()); { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(400.0, 300.0), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(400.0, 300.0), QPointF(400.0, 300.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1210,17 +1186,17 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); } mouseButtonPressedSpy.clear(); { // WHEN -> Move on same object - auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(400.0, 300.0), + auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(400.0, 300.0), QPointF(400.0, 300.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1230,17 +1206,17 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 0); - QCOMPARE(mouseMovedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 0); + QCOMPARE(mouseMovedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); } mouseMovedSpy.clear(); // WHEN -> Release on object { - auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(400.0, 300.0), + auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(400.0, 300.0), QPointF(400.0, 300.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1250,10 +1226,10 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker->isPressed()); QVERIFY(!picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 0); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 1); - QCOMPARE(mouseClickedSpy.count(), 1); + QCOMPARE(mouseButtonPressedSpy.size(), 0); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 1); + QCOMPARE(mouseClickedSpy.size(), 1); } // WHEN -> Release outside of object @@ -1262,10 +1238,10 @@ private Q_SLOTS: mouseButtonReleasedSpy.clear(); { - auto event1 = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(400., 300.), + auto event1 = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(400., 300.), QPointF(400., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event1); - auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(0., 0.), + auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(0., 0.), QPointF(0., 0.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event2); bool earlyReturn = !pickBVJob.runHelper(); @@ -1275,10 +1251,10 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker->isPressed()); QVERIFY(!picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 1); - QCOMPARE(mouseClickedSpy.count(), 1); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 1); + QCOMPARE(mouseClickedSpy.size(), 1); } } @@ -1374,7 +1350,7 @@ private Q_SLOTS: initializePickBoundingVolumeJob(&pickBVJob, test.data()); { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(320., 303.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(320., 303.), QPointF(320., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1385,17 +1361,17 @@ private Q_SLOTS: QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy1.count(), 0); - QCOMPARE(mouseButtonReleasedSpy1.count(), 0); - QCOMPARE(mouseClickedSpy1.count(), 0); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy1.size(), 0); + QCOMPARE(mouseButtonReleasedSpy1.size(), 0); + QCOMPARE(mouseClickedSpy1.size(), 0); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); } { // WHEN -> Move on next object, show stay on previous picker unless all picks are requested - auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(280., 303.), + auto event = QMouseEvent(QMouseEvent::MouseMove, QPointF(280., 303.), QPointF(280., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1406,20 +1382,20 @@ private Q_SLOTS: if (pickResultMode != Qt3DRender::QPickingSettings::AllPicks) { QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseMovedSpy1.count(), 1); - QCOMPARE(mouseButtonReleasedSpy1.count(), 0); - QCOMPARE(mouseClickedSpy1.count(), 0); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseMovedSpy1.size(), 1); + QCOMPARE(mouseButtonReleasedSpy1.size(), 0); + QCOMPARE(mouseClickedSpy1.size(), 0); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); } else { QVERIFY(!picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy2.count(), 0); - QCOMPARE(mouseMovedSpy2.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseButtonReleasedSpy2.count(), 0); - QCOMPARE(mouseClickedSpy2.count(), 0); - QCOMPARE(mouseEntered2.count(), 1); - QCOMPARE(mouseExited2.count(), 0); + QCOMPARE(mouseButtonPressedSpy2.size(), 0); + QCOMPARE(mouseMovedSpy2.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseButtonReleasedSpy2.size(), 0); + QCOMPARE(mouseClickedSpy2.size(), 0); + QCOMPARE(mouseEntered2.size(), 1); + QCOMPARE(mouseExited2.size(), 0); } } } @@ -1474,7 +1450,7 @@ private Q_SLOTS: Qt3DRender::Render::PickBoundingVolumeJob pickBVJob; initializePickBoundingVolumeJob(&pickBVJob, test.data()); - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(400., 300.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(400., 300.), QPointF(400., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1484,12 +1460,12 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); - QCOMPARE(mouseEntered.count(), 0); - QCOMPARE(mouseExited.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); + QCOMPARE(mouseEntered.size(), 0); + QCOMPARE(mouseExited.size(), 0); } void checkPickerAndViewports() @@ -1543,7 +1519,7 @@ private Q_SLOTS: initializePickBoundingVolumeJob(&pickBVJob, test.data()); { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(280., 300.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(280., 300.), QPointF(280., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1553,12 +1529,12 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); - QCOMPARE(mouseEntered.count(), 0); - QCOMPARE(mouseExited.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); + QCOMPARE(mouseEntered.size(), 0); + QCOMPARE(mouseExited.size(), 0); } // WHEN reset -> Presset on object in vp2 @@ -1566,7 +1542,7 @@ private Q_SLOTS: backendPicker->setEnabled(true); { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(320., 300.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(320., 300.), QPointF(320., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1576,12 +1552,12 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); - QCOMPARE(mouseEntered.count(), 0); - QCOMPARE(mouseExited.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); + QCOMPARE(mouseEntered.size(), 0); + QCOMPARE(mouseExited.size(), 0); } } @@ -1628,7 +1604,7 @@ private Q_SLOTS: initializePickBoundingVolumeJob(&pickBVJob, test.data()); { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(150., 300.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(150., 300.), QPointF(150., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1640,17 +1616,17 @@ private Q_SLOTS: QVERIFY(picker1->isPressed()); QVERIFY(!backendPicker2->isPressed()); QVERIFY(!picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 0); - auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(150., 300.), + auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(150., 300.), QPointF(150., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event2); pickBVJob.runHelper(); } { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(450., 300.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(450., 300.), QPointF(450., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1660,8 +1636,8 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker2->isPressed()); QVERIFY(picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); } } @@ -1735,7 +1711,7 @@ private Q_SLOTS: // WHEN -> Pressed on object1 in VP1 { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(200.0f, 300.0f), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(200.0, 300.0), QPointF(200.0, 300.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1753,21 +1729,21 @@ private Q_SLOTS: QVERIFY(!picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 0); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 0); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 0); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 0); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); - auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(200.0f, 300.0f), - Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(200.0, 300.0), QPointF(200.0, 300.0), + Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event2); pickBVJob.runHelper(); } // WHEN -> Pressed on object2 in VP2 { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(541.0f, 183.0f), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(541.0, 183.0), QPointF(541.0, 183.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1785,13 +1761,13 @@ private Q_SLOTS: QVERIFY(!picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 0); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 0); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); - auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(541.0f, 183.0f), + auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(541.0, 183.0), QPointF(541.0, 183.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event2); pickBVJob.runHelper(); @@ -1799,7 +1775,7 @@ private Q_SLOTS: // WHEN -> Pressed on object3 in VP1 { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(80.0f, 150.0f), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(80.0, 150.0), QPointF(80.0, 150.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1817,16 +1793,16 @@ private Q_SLOTS: QVERIFY(!picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 0); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 0); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); } // WHEN -> Pressed on object3 in VP2 { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(504.0f, 263.0f), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(504.0, 263.0), QPointF(504.0, 263.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1844,16 +1820,16 @@ private Q_SLOTS: QVERIFY(!picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 0); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 0); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); } // WHEN -> Pressed on object4 in VP1 { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(160.0f, 431.0f), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(160.0, 431.0), QPointF(160.0, 431.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1871,13 +1847,13 @@ private Q_SLOTS: QVERIFY(picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 1); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 1); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); - auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(160.0f, 431.0f), + auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(160.0, 431.0), QPointF(160.0, 431.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event2); pickBVJob.runHelper(); @@ -1885,7 +1861,7 @@ private Q_SLOTS: // WHEN -> Pressed on object4 in VP2 { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(447.0f, 472.0f), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(447.0, 472.0), QPointF(447.0, 472.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1903,13 +1879,13 @@ private Q_SLOTS: QVERIFY(picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 2); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 2); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); - auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(447.0f, 472.0f), + auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(447.0, 472.0), QPointF(447.0, 472.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event2); pickBVJob.runHelper(); @@ -1917,7 +1893,7 @@ private Q_SLOTS: // WHEN -> Pressed on object5 in VP1 { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(153.0f, 195.0f), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(153.0, 195.0), QPointF(153.0, 195.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -1935,13 +1911,13 @@ private Q_SLOTS: QVERIFY(!picker4->isPressed()); QVERIFY(backendPicker5->isPressed()); QVERIFY(picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 2); - QCOMPARE(mouseButtonPressedSpy5.count(), 1); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 2); + QCOMPARE(mouseButtonPressedSpy5.size(), 1); - auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(153.0f, 195.0f), + auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(153.0, 195.0), QPointF(153.0, 195.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event2); pickBVJob.runHelper(); @@ -1959,12 +1935,12 @@ private Q_SLOTS: QMatrix4x4 m; m.rotate(360.f / float(n) * float(j), 0.f, 0.f, 1.f); for (int i=0; i<n; i++) { - const double angle = M_PI * 2. / double(n) * i; - const double x = std::sin(angle) * 10.; - const double z = std::cos(angle) * 10.; + const float angle = float(M_PI) * 2.f / float(n) * float(i); + const float x = std::sin(angle) * 10.f; + const float z = std::cos(angle) * 10.f; QVector3D pos(x, 0.f, z); QVector3D up(0.f, 1.f, 0.f); - QTest::newRow(QString::number(k++).toLatin1().data()) << m * pos << m * up; + QTest::newRow(QString::number(k++).toLatin1().data()) << m.map(pos) << m.map(up); } } } @@ -2025,7 +2001,7 @@ private Q_SLOTS: Qt3DRender::Render::PickBoundingVolumeJob pickBVJob; initializePickBoundingVolumeJob(&pickBVJob, test.data()); - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(303., 303.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(303., 303.), QPointF(303., 303.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -2035,12 +2011,12 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); - QCOMPARE(mouseEntered.count(), 0); - QCOMPARE(mouseExited.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); + QCOMPARE(mouseEntered.size(), 0); + QCOMPARE(mouseExited.size(), 0); } void checkPriorityPicking() @@ -2112,7 +2088,7 @@ private Q_SLOTS: // WHEN -> Pressed on object { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(300., 300.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(300., 300.), QPointF(300., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -2122,25 +2098,25 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseMovedSpy1.count(), 0); - QCOMPARE(mouseButtonReleasedSpy1.count(), 0); - QCOMPARE(mouseClickedSpy1.count(), 0); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseMovedSpy1.size(), 0); + QCOMPARE(mouseButtonReleasedSpy1.size(), 0); + QCOMPARE(mouseClickedSpy1.size(), 0); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); QVERIFY(!backendPicker2->isPressed()); QVERIFY(!picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy2.count(), 0); - QCOMPARE(mouseMovedSpy2.count(), 0); - QCOMPARE(mouseButtonReleasedSpy2.count(), 0); - QCOMPARE(mouseClickedSpy2.count(), 0); - QCOMPARE(mouseEntered2.count(), 0); - QCOMPARE(mouseExited2.count(), 0); + QCOMPARE(mouseButtonPressedSpy2.size(), 0); + QCOMPARE(mouseMovedSpy2.size(), 0); + QCOMPARE(mouseButtonReleasedSpy2.size(), 0); + QCOMPARE(mouseClickedSpy2.size(), 0); + QCOMPARE(mouseEntered2.size(), 0); + QCOMPARE(mouseExited2.size(), 0); } { - auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(300., 300.), + auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(300., 300.), QPointF(300., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); pickBVJob.runHelper(); @@ -2148,21 +2124,21 @@ private Q_SLOTS: QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseMovedSpy1.count(), 0); - QCOMPARE(mouseButtonReleasedSpy1.count(), 1); - QCOMPARE(mouseClickedSpy1.count(), 1); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseMovedSpy1.size(), 0); + QCOMPARE(mouseButtonReleasedSpy1.size(), 1); + QCOMPARE(mouseClickedSpy1.size(), 1); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); QVERIFY(!backendPicker2->isPressed()); QVERIFY(!picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy2.count(), 0); - QCOMPARE(mouseMovedSpy2.count(), 0); - QCOMPARE(mouseButtonReleasedSpy2.count(), 0); - QCOMPARE(mouseClickedSpy2.count(), 0); - QCOMPARE(mouseEntered2.count(), 0); - QCOMPARE(mouseExited2.count(), 0); + QCOMPARE(mouseButtonPressedSpy2.size(), 0); + QCOMPARE(mouseMovedSpy2.size(), 0); + QCOMPARE(mouseButtonReleasedSpy2.size(), 0); + QCOMPARE(mouseClickedSpy2.size(), 0); + QCOMPARE(mouseEntered2.size(), 0); + QCOMPARE(mouseExited2.size(), 0); } } @@ -2180,7 +2156,7 @@ private Q_SLOTS: // WHEN -> Pressed on object { - auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(300., 300.), + auto event = QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(300., 300.), QPointF(300., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); bool earlyReturn = !pickBVJob.runHelper(); @@ -2190,25 +2166,25 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 0); - QCOMPARE(mouseMovedSpy1.count(), 0); - QCOMPARE(mouseButtonReleasedSpy1.count(), 0); - QCOMPARE(mouseClickedSpy1.count(), 0); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 0); + QCOMPARE(mouseMovedSpy1.size(), 0); + QCOMPARE(mouseButtonReleasedSpy1.size(), 0); + QCOMPARE(mouseClickedSpy1.size(), 0); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); QVERIFY(backendPicker2->isPressed()); QVERIFY(picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseMovedSpy2.count(), 0); - QCOMPARE(mouseButtonReleasedSpy2.count(), 0); - QCOMPARE(mouseClickedSpy2.count(), 0); - QCOMPARE(mouseEntered2.count(), 0); - QCOMPARE(mouseExited2.count(), 0); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseMovedSpy2.size(), 0); + QCOMPARE(mouseButtonReleasedSpy2.size(), 0); + QCOMPARE(mouseClickedSpy2.size(), 0); + QCOMPARE(mouseEntered2.size(), 0); + QCOMPARE(mouseExited2.size(), 0); } { - auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(300., 300.), + auto event = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(300., 300.), QPointF(300., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); pickBVJob.processMouseEvent(nullptr, &event); pickBVJob.runHelper(); @@ -2216,21 +2192,21 @@ private Q_SLOTS: QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 0); - QCOMPARE(mouseMovedSpy1.count(), 0); - QCOMPARE(mouseButtonReleasedSpy1.count(), 0); - QCOMPARE(mouseClickedSpy1.count(), 0); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 0); + QCOMPARE(mouseMovedSpy1.size(), 0); + QCOMPARE(mouseButtonReleasedSpy1.size(), 0); + QCOMPARE(mouseClickedSpy1.size(), 0); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); QVERIFY(!backendPicker2->isPressed()); QVERIFY(!picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseMovedSpy2.count(), 0); - QCOMPARE(mouseButtonReleasedSpy2.count(), 1); - QCOMPARE(mouseClickedSpy2.count(), 1); - QCOMPARE(mouseEntered2.count(), 0); - QCOMPARE(mouseExited2.count(), 0); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseMovedSpy2.size(), 0); + QCOMPARE(mouseButtonReleasedSpy2.size(), 1); + QCOMPARE(mouseClickedSpy2.size(), 1); + QCOMPARE(mouseEntered2.size(), 0); + QCOMPARE(mouseExited2.size(), 0); } } } @@ -2258,7 +2234,7 @@ private Q_SLOTS: std::vector<Qt3DRender::Render::PickingUtils::ViewportCameraAreaDetails> results = gatherer.gather(test->frameGraphRoot()); // THEN - QCOMPARE(results.size(), 0); + QCOMPARE(results.size(), 0U); // WHEN Qt3DRender::Render::FrameGraphNode *backendFGNode = test->nodeManagers()->frameGraphManager()->lookupNode(noPicking->id()); @@ -2274,8 +2250,8 @@ private Q_SLOTS: results = gatherer.gather(test->frameGraphRoot()); // THEN - QCOMPARE(results.size(), 1); - auto vca = results.front(); + QCOMPARE(results.size(), 1U); + const auto &vca = results.front(); QCOMPARE(vca.area, QSize(600, 600)); QCOMPARE(vca.cameraId, camera->id()); QCOMPARE(vca.viewport, QRectF(0., 0., 1., 1.)); diff --git a/tests/auto/render/picking/CMakeLists.txt b/tests/auto/render/picking/CMakeLists.txt index 662532c34..0c031aba1 100644 --- a/tests/auto/render/picking/CMakeLists.txt +++ b/tests/auto/render/picking/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from picking.pro. ##################################################################### ## tst_picking Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_picking LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_picking SOURCES tst_picking.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DExtras diff --git a/tests/auto/render/picking/picking.pro b/tests/auto/render/picking/picking.pro deleted file mode 100644 index 3d7ad7875..000000000 --- a/tests/auto/render/picking/picking.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app - -TARGET = tst_picking - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib 3dextras - -CONFIG += testcase - -SOURCES += tst_picking.cpp diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp index 860a236d5..268a06bb4 100644 --- a/tests/auto/render/picking/tst_picking.cpp +++ b/tests/auto/render/picking/tst_picking.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 #include <QtTest/QTest> #include <Qt3DCore/qentity.h> diff --git a/tests/auto/render/proximityfilter/CMakeLists.txt b/tests/auto/render/proximityfilter/CMakeLists.txt index 5e52d4643..5cc440911 100644 --- a/tests/auto/render/proximityfilter/CMakeLists.txt +++ b/tests/auto/render/proximityfilter/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from proximityfilter.pro. ##################################################################### ## tst_proximityfilter Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_proximityfilter LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_proximityfilter SOURCES tst_proximityfilter.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/proximityfilter/proximityfilter.pro b/tests/auto/render/proximityfilter/proximityfilter.pro deleted file mode 100644 index 74599e4f0..000000000 --- a/tests/auto/render/proximityfilter/proximityfilter.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_proximityfilter - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_proximityfilter.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/proximityfilter/tst_proximityfilter.cpp b/tests/auto/render/proximityfilter/tst_proximityfilter.cpp index 52537d457..4a71af946 100644 --- a/tests/auto/render/proximityfilter/tst_proximityfilter.cpp +++ b/tests/auto/render/proximityfilter/tst_proximityfilter.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2017 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/proximityfiltering/CMakeLists.txt b/tests/auto/render/proximityfiltering/CMakeLists.txt index 81d2f0a93..39f1fcc55 100644 --- a/tests/auto/render/proximityfiltering/CMakeLists.txt +++ b/tests/auto/render/proximityfiltering/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from proximityfiltering.pro. ##################################################################### ## tst_proximityfiltering Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_proximityfiltering LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_proximityfiltering SOURCES tst_proximityfiltering.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/proximityfiltering/proximityfiltering.pro b/tests/auto/render/proximityfiltering/proximityfiltering.pro deleted file mode 100644 index 68b709ec5..000000000 --- a/tests/auto/render/proximityfiltering/proximityfiltering.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_proximityfiltering - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_proximityfiltering.cpp - -CONFIG += useCommonTestAspect - -include(../commons/commons.pri) diff --git a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp index 0bf7f7c69..45dcf3049 100644 --- a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp +++ b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire -** 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) 2016 Paul Lemire +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qentity.h> @@ -108,8 +83,8 @@ private Q_SLOTS: // THEN QCOMPARE(filterJob.hasProximityFilter(), false); - QCOMPARE(filterJob.filteredEntities().size(), 0); - QCOMPARE(filterJob.proximityFilterIds().size(), 0); + QCOMPARE(filterJob.filteredEntities().size(), 0U); + QCOMPARE(filterJob.proximityFilterIds().size(), 0U); QVERIFY(filterJob.manager() == nullptr); } @@ -329,7 +304,7 @@ private Q_SLOTS: // THEN const std::vector<Qt3DRender::Render::Entity *> &filterEntities = filterJob.filteredEntities(); - QCOMPARE(filterEntities.size(), expectedSelectedEntities.size()); + QCOMPARE(filterEntities.size(), size_t(expectedSelectedEntities.size())); for (int i = 0, m = expectedSelectedEntities.size(); i < m; ++i) QCOMPARE(filterEntities.at(i)->peerId(), expectedSelectedEntities.at(i)); diff --git a/tests/auto/render/qabstractlight/CMakeLists.txt b/tests/auto/render/qabstractlight/CMakeLists.txt index 46f498dc5..4bab67818 100644 --- a/tests/auto/render/qabstractlight/CMakeLists.txt +++ b/tests/auto/render/qabstractlight/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qabstractlight.pro. ##################################################################### ## tst_qabstractlight Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qabstractlight LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qabstractlight SOURCES tst_qabstractlight.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qabstractlight/qabstractlight.pro b/tests/auto/render/qabstractlight/qabstractlight.pro deleted file mode 100644 index d71c0958f..000000000 --- a/tests/auto/render/qabstractlight/qabstractlight.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qabstractlight - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qabstractlight.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qabstractlight/tst_qabstractlight.cpp b/tests/auto/render/qabstractlight/tst_qabstractlight.cpp index 7c2162ecf..1efb83711 100644 --- a/tests/auto/render/qabstractlight/tst_qabstractlight.cpp +++ b/tests/auto/render/qabstractlight/tst_qabstractlight.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qabstracttexture/CMakeLists.txt b/tests/auto/render/qabstracttexture/CMakeLists.txt index c6b67b60b..9b7f3d960 100644 --- a/tests/auto/render/qabstracttexture/CMakeLists.txt +++ b/tests/auto/render/qabstracttexture/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qabstracttexture.pro. ##################################################################### ## tst_qabstracttexture Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qabstracttexture LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qabstracttexture SOURCES tst_qabstracttexture.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qabstracttexture/qabstracttexture.pro b/tests/auto/render/qabstracttexture/qabstracttexture.pro deleted file mode 100644 index 77f9bd3ff..000000000 --- a/tests/auto/render/qabstracttexture/qabstracttexture.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qabstracttexture - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qabstracttexture.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp index 126e77ac2..f4398f5fb 100644 --- a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp +++ b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qabstracttexture.h> @@ -112,7 +87,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.format(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -120,7 +95,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.format(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -131,7 +106,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.generateMipMaps(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -139,7 +114,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.generateMipMaps(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -150,7 +125,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.width(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -158,7 +133,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.width(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -169,7 +144,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.height(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -177,7 +152,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.height(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -188,7 +163,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.depth(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -196,7 +171,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.depth(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -207,7 +182,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.magnificationFilter(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -215,7 +190,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.magnificationFilter(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -226,7 +201,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.minificationFilter(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -234,7 +209,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.minificationFilter(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -245,7 +220,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.maximumAnisotropy(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -253,7 +228,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.maximumAnisotropy(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -264,7 +239,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.comparisonFunction(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -272,7 +247,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.comparisonFunction(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -283,7 +258,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.comparisonMode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -291,7 +266,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.comparisonMode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -302,7 +277,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.layers(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -310,7 +285,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.layers(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -321,7 +296,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.samples(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -329,7 +304,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.samples(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -340,7 +315,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.mipLevels(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -348,7 +323,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.mipLevels(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -781,7 +756,7 @@ private Q_SLOTS: dTexture->setStatus(newStatus); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(abstractTexture.status(), newStatus); @@ -791,7 +766,7 @@ private Q_SLOTS: dTexture->setStatus(newStatus); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(abstractTexture.status(), newStatus); } @@ -808,7 +783,7 @@ private Q_SLOTS: dTexture->setHandleType(newType); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(abstractTexture.handleType(), newType); @@ -818,7 +793,7 @@ private Q_SLOTS: dTexture->setHandleType(newType); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(abstractTexture.handleType(), newType); } @@ -834,7 +809,7 @@ private Q_SLOTS: dTexture->setHandle(QVariant(1)); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(abstractTexture.handle(), QVariant(1)); // WHEN @@ -843,7 +818,7 @@ private Q_SLOTS: dTexture->setHandle(QVariant(1)); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(abstractTexture.handle(), QVariant(1)); } diff --git a/tests/auto/render/qabstracttextureimage/CMakeLists.txt b/tests/auto/render/qabstracttextureimage/CMakeLists.txt index 99b7fc264..20e78bbfa 100644 --- a/tests/auto/render/qabstracttextureimage/CMakeLists.txt +++ b/tests/auto/render/qabstracttextureimage/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qabstracttextureimage.pro. ##################################################################### ## tst_qabstracttextureimage Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qabstracttextureimage LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qabstracttextureimage SOURCES tst_qabstracttextureimage.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qabstracttextureimage/qabstracttextureimage.pro b/tests/auto/render/qabstracttextureimage/qabstracttextureimage.pro deleted file mode 100644 index f494700e2..000000000 --- a/tests/auto/render/qabstracttextureimage/qabstracttextureimage.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qabstracttextureimage - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qabstracttextureimage.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp b/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp index 8ea482ceb..2e479330d 100644 --- a/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp +++ b/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -79,7 +54,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTextureImage.mipLevel(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -87,7 +62,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTextureImage.mipLevel(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -98,7 +73,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTextureImage.layer(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -106,7 +81,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTextureImage.layer(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -117,7 +92,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTextureImage.face(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -125,7 +100,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTextureImage.face(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qattribute/CMakeLists.txt b/tests/auto/render/qattribute/CMakeLists.txt index cc12ac7a3..3a09ed89d 100644 --- a/tests/auto/render/qattribute/CMakeLists.txt +++ b/tests/auto/render/qattribute/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qattribute.pro. ##################################################################### ## tst_qattribute Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qattribute LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qattribute SOURCES tst_qattribute.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qattribute/qattribute.pro b/tests/auto/render/qattribute/qattribute.pro deleted file mode 100644 index 667e9909f..000000000 --- a/tests/auto/render/qattribute/qattribute.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qattribute - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qattribute.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp index 8cc3f1b8c..3e9ed3381 100644 --- a/tests/auto/render/qattribute/tst_qattribute.cpp +++ b/tests/auto/render/qattribute/tst_qattribute.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qblitframebuffer/CMakeLists.txt b/tests/auto/render/qblitframebuffer/CMakeLists.txt index 488d7aeb8..4d92fceb0 100644 --- a/tests/auto/render/qblitframebuffer/CMakeLists.txt +++ b/tests/auto/render/qblitframebuffer/CMakeLists.txt @@ -1,15 +1,24 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qblitframebuffer.pro. ##################################################################### ## tst_qblitframebuffer Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qblitframebuffer LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qblitframebuffer SOURCES tst_qblitframebuffer.cpp INCLUDE_DIRECTORIES ../../core/common - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qblitframebuffer/qblitframebuffer.pro b/tests/auto/render/qblitframebuffer/qblitframebuffer.pro deleted file mode 100644 index 219bad3d2..000000000 --- a/tests/auto/render/qblitframebuffer/qblitframebuffer.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qblitframebuffer - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qblitframebuffer.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qblitframebuffer/tst_qblitframebuffer.cpp b/tests/auto/render/qblitframebuffer/tst_qblitframebuffer.cpp index 2ff8a35ee..38845f809 100644 --- a/tests/auto/render/qblitframebuffer/tst_qblitframebuffer.cpp +++ b/tests/auto/render/qblitframebuffer/tst_qblitframebuffer.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qboundingvolumedebug/CMakeLists.txt b/tests/auto/render/qboundingvolumedebug/CMakeLists.txt index aff6c3853..07eb9c7aa 100644 --- a/tests/auto/render/qboundingvolumedebug/CMakeLists.txt +++ b/tests/auto/render/qboundingvolumedebug/CMakeLists.txt @@ -1,16 +1,25 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qboundingvolumedebug.pro. ##################################################################### ## tst_qboundingvolumedebug Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qboundingvolumedebug LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qboundingvolumedebug SOURCES ../commons/testrenderer.cpp ../commons/testrenderer.h tst_qboundingvolumedebug.cpp INCLUDE_DIRECTORIES ../commons - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qboundingvolumedebug/qboundingvolumedebug.pro b/tests/auto/render/qboundingvolumedebug/qboundingvolumedebug.pro deleted file mode 100644 index 38c0d2db9..000000000 --- a/tests/auto/render/qboundingvolumedebug/qboundingvolumedebug.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qboundingvolumedebug - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qboundingvolumedebug.cpp - -include(../commons/commons.pri) diff --git a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp index 2f2ce50f7..499c83368 100644 --- a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp +++ b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.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 #include <QtTest/QTest> #include <Qt3DCore/QEntity> diff --git a/tests/auto/render/qbuffer/CMakeLists.txt b/tests/auto/render/qbuffer/CMakeLists.txt index b4a808daf..4138145fd 100644 --- a/tests/auto/render/qbuffer/CMakeLists.txt +++ b/tests/auto/render/qbuffer/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qbuffer.pro. # special case skip regeneration @@ -6,10 +9,16 @@ ## tst_qbuffer Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qt3d_qbuffer LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qt3d_qbuffer SOURCES tst_qbuffer.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qbuffer/qbuffer.pro b/tests/auto/render/qbuffer/qbuffer.pro deleted file mode 100644 index 314bee184..000000000 --- a/tests/auto/render/qbuffer/qbuffer.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qbuffer - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qbuffer.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp index 8379cc210..235f01ea1 100644 --- a/tests/auto/render/qbuffer/tst_qbuffer.cpp +++ b/tests/auto/render/qbuffer/tst_qbuffer.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qcamera/CMakeLists.txt b/tests/auto/render/qcamera/CMakeLists.txt index d9513feb3..fa1c86a4b 100644 --- a/tests/auto/render/qcamera/CMakeLists.txt +++ b/tests/auto/render/qcamera/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qcamera.pro. ##################################################################### ## tst_qcamera Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qcamera LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qcamera SOURCES tst_qcamera.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qcamera/qcamera.pro b/tests/auto/render/qcamera/qcamera.pro deleted file mode 100644 index 0ce2d23bc..000000000 --- a/tests/auto/render/qcamera/qcamera.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qcamera - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qcamera.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qcamera/tst_qcamera.cpp b/tests/auto/render/qcamera/tst_qcamera.cpp index 4e8da68cf..a8486ad06 100644 --- a/tests/auto/render/qcamera/tst_qcamera.cpp +++ b/tests/auto/render/qcamera/tst_qcamera.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** 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) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/qcameralens/CMakeLists.txt b/tests/auto/render/qcameralens/CMakeLists.txt index 8fb669bfb..75be5baea 100644 --- a/tests/auto/render/qcameralens/CMakeLists.txt +++ b/tests/auto/render/qcameralens/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qcameralens.pro. ##################################################################### ## tst_qcameralens Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qcameralens LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qcameralens SOURCES tst_qcameralens.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qcameralens/qcameralens.pro b/tests/auto/render/qcameralens/qcameralens.pro deleted file mode 100644 index 0f517d5ef..000000000 --- a/tests/auto/render/qcameralens/qcameralens.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qcameralens - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qcameralens.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qcameralens/tst_qcameralens.cpp b/tests/auto/render/qcameralens/tst_qcameralens.cpp index 241515d7b..d429c72a8 100644 --- a/tests/auto/render/qcameralens/tst_qcameralens.cpp +++ b/tests/auto/render/qcameralens/tst_qcameralens.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -77,7 +52,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.projectionType(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -85,7 +60,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.projectionType(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -96,7 +71,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.nearPlane(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -104,7 +79,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.nearPlane(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -115,7 +90,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.farPlane(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -123,7 +98,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.farPlane(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -134,7 +109,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.fieldOfView(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -142,7 +117,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.fieldOfView(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -153,7 +128,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.aspectRatio(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -161,7 +136,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.aspectRatio(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -172,7 +147,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.left(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -180,7 +155,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.left(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -191,7 +166,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.right(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -199,7 +174,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.right(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -210,7 +185,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.bottom(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -218,7 +193,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.bottom(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -229,7 +204,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.top(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -237,7 +212,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.top(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -248,7 +223,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.exposure(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().toFloat(), -2.0f); // WHEN @@ -257,7 +232,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.exposure(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -270,7 +245,7 @@ private Q_SLOTS: QVERIFY(spy.isValid()); QCOMPARE(cameraLens.projectionMatrix(), newValue); QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::CustomProjection); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -278,7 +253,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.projectionMatrix(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -294,7 +269,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 8); // Triggered for each property being set + 1 + QCOMPARE(spy.size(), 8); // Triggered for each property being set + 1 QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::OrthographicProjection); QCOMPARE(cameraLens.nearPlane(), 0.5f); QCOMPARE(cameraLens.farPlane(), 50.0f); @@ -317,7 +292,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 5); // Triggered for each property being set (- projectionTye which is the default value) + 1 + QCOMPARE(spy.size(), 5); // Triggered for each property being set (- projectionTye which is the default value) + 1 QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::PerspectiveProjection); QCOMPARE(cameraLens.nearPlane(), 0.5f); QCOMPARE(cameraLens.farPlane(), 50.0f); @@ -338,7 +313,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 8); // Triggered for each property being set + 1 + QCOMPARE(spy.size(), 8); // Triggered for each property being set + 1 QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::FrustumProjection); QCOMPARE(cameraLens.nearPlane(), 0.5f); QCOMPARE(cameraLens.farPlane(), 50.0f); diff --git a/tests/auto/render/qcameraselector/CMakeLists.txt b/tests/auto/render/qcameraselector/CMakeLists.txt index d62f3f650..3d4931347 100644 --- a/tests/auto/render/qcameraselector/CMakeLists.txt +++ b/tests/auto/render/qcameraselector/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qcameraselector.pro. ##################################################################### ## tst_qcameraselector Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qcameraselector LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qcameraselector SOURCES tst_qcameraselector.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qcameraselector/qcameraselector.pro b/tests/auto/render/qcameraselector/qcameraselector.pro deleted file mode 100644 index c97153ba0..000000000 --- a/tests/auto/render/qcameraselector/qcameraselector.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qcameraselector - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qcameraselector.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp index 9b70887fe..a439be92c 100644 --- a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp +++ b/tests/auto/render/qcameraselector/tst_qcameraselector.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qclearbuffers/CMakeLists.txt b/tests/auto/render/qclearbuffers/CMakeLists.txt index 19e6b7af7..1a22194c8 100644 --- a/tests/auto/render/qclearbuffers/CMakeLists.txt +++ b/tests/auto/render/qclearbuffers/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qclearbuffers.pro. ##################################################################### ## tst_qclearbuffer Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qclearbuffer LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qclearbuffer SOURCES tst_qclearbuffers.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qclearbuffers/qclearbuffers.pro b/tests/auto/render/qclearbuffers/qclearbuffers.pro deleted file mode 100644 index 403db558b..000000000 --- a/tests/auto/render/qclearbuffers/qclearbuffers.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qclearbuffer - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qclearbuffers.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp b/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp index 787b6540a..96f2c0bac 100644 --- a/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp +++ b/tests/auto/render/qclearbuffers/tst_qclearbuffers.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qcomputecommand/CMakeLists.txt b/tests/auto/render/qcomputecommand/CMakeLists.txt index 262ba4b3e..1e131f825 100644 --- a/tests/auto/render/qcomputecommand/CMakeLists.txt +++ b/tests/auto/render/qcomputecommand/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qcomputecommand.pro. ##################################################################### ## tst_qcomputecommand Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qcomputecommand LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qcomputecommand SOURCES tst_qcomputecommand.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qcomputecommand/qcomputecommand.pro b/tests/auto/render/qcomputecommand/qcomputecommand.pro deleted file mode 100644 index 92c971c51..000000000 --- a/tests/auto/render/qcomputecommand/qcomputecommand.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qcomputecommand - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qcomputecommand.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp b/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp index 202cbbf5e..cb47f7c2f 100644 --- a/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp +++ b/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -66,7 +41,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(computeCommand.workGroupX(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -74,7 +49,7 @@ private Q_SLOTS: // THEN QCOMPARE(computeCommand.workGroupX(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -85,7 +60,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(computeCommand.workGroupY(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -93,7 +68,7 @@ private Q_SLOTS: // THEN QCOMPARE(computeCommand.workGroupY(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -104,7 +79,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(computeCommand.workGroupZ(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -112,7 +87,7 @@ private Q_SLOTS: // THEN QCOMPARE(computeCommand.workGroupZ(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -123,7 +98,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(computeCommand.runType(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -131,7 +106,7 @@ private Q_SLOTS: // THEN QCOMPARE(computeCommand.runType(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qdispatchcompute/CMakeLists.txt b/tests/auto/render/qdispatchcompute/CMakeLists.txt index a7a16da4a..2bef1a9ea 100644 --- a/tests/auto/render/qdispatchcompute/CMakeLists.txt +++ b/tests/auto/render/qdispatchcompute/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qdispatchcompute.pro. ##################################################################### ## tst_qdispatchcompute Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qdispatchcompute LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qdispatchcompute SOURCES tst_qdispatchcompute.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qdispatchcompute/qdispatchcompute.pro b/tests/auto/render/qdispatchcompute/qdispatchcompute.pro deleted file mode 100644 index 163c17010..000000000 --- a/tests/auto/render/qdispatchcompute/qdispatchcompute.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qdispatchcompute - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qdispatchcompute.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp b/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp index f54edf8c2..cbb323d5b 100644 --- a/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp +++ b/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -65,7 +40,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(dispatchCompute.workGroupX(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -73,7 +48,7 @@ private Q_SLOTS: // THEN QCOMPARE(dispatchCompute.workGroupX(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -84,7 +59,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(dispatchCompute.workGroupY(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -92,7 +67,7 @@ private Q_SLOTS: // THEN QCOMPARE(dispatchCompute.workGroupY(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -103,7 +78,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(dispatchCompute.workGroupZ(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -111,7 +86,7 @@ private Q_SLOTS: // THEN QCOMPARE(dispatchCompute.workGroupZ(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qeffect/CMakeLists.txt b/tests/auto/render/qeffect/CMakeLists.txt index efbb84525..967dabb3e 100644 --- a/tests/auto/render/qeffect/CMakeLists.txt +++ b/tests/auto/render/qeffect/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qeffect.pro. ##################################################################### ## tst_qeffect Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qeffect LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qeffect SOURCES tst_qeffect.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qeffect/qeffect.pro b/tests/auto/render/qeffect/qeffect.pro deleted file mode 100644 index 4cb6abd13..000000000 --- a/tests/auto/render/qeffect/qeffect.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qeffect - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qeffect.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qeffect/tst_qeffect.cpp b/tests/auto/render/qeffect/tst_qeffect.cpp index f7e43186d..4e9feb671 100644 --- a/tests/auto/render/qeffect/tst_qeffect.cpp +++ b/tests/auto/render/qeffect/tst_qeffect.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/qenvironmentlight/CMakeLists.txt b/tests/auto/render/qenvironmentlight/CMakeLists.txt index 768ce5b6f..2aa7ce352 100644 --- a/tests/auto/render/qenvironmentlight/CMakeLists.txt +++ b/tests/auto/render/qenvironmentlight/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qenvironmentlight.pro. ##################################################################### ## tst_environmentlight Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qenvironmentlight LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qenvironmentlight SOURCES tst_qenvironmentlight.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qenvironmentlight/qenvironmentlight.pro b/tests/auto/render/qenvironmentlight/qenvironmentlight.pro deleted file mode 100644 index 8a66f65ba..000000000 --- a/tests/auto/render/qenvironmentlight/qenvironmentlight.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_environmentlight - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qenvironmentlight.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp b/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp index 5eab3a005..a350f42d7 100644 --- a/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp +++ b/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QSignalSpy> @@ -102,7 +77,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), texture); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -111,7 +86,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), texture); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // WHEN light.setIrradiance(nullptr); @@ -119,7 +94,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), nullptr); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -132,7 +107,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), texture); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -141,7 +116,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), nullptr); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -154,7 +129,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), texture); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -163,7 +138,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), nullptr); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -178,7 +153,7 @@ private Q_SLOTS: QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture); QCOMPARE(shaderData->property("irradianceSize").value<QVector3D>(), QVector3D(texture->width(), texture->height(), texture->depth())); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -208,7 +183,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), nullptr); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); // THEN @@ -225,7 +200,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), texture); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -234,7 +209,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), texture); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // WHEN light.setSpecular(nullptr); @@ -242,7 +217,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), nullptr); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -255,7 +230,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), texture); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -264,7 +239,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), nullptr); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -277,7 +252,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), texture); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -286,7 +261,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), nullptr); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -301,7 +276,7 @@ private Q_SLOTS: QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture); QCOMPARE(shaderData->property("specularSize").value<QVector3D>(), QVector3D(texture->width(), texture->height(), texture->depth())); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -331,7 +306,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), nullptr); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); // THEN diff --git a/tests/auto/render/qfilterkey/CMakeLists.txt b/tests/auto/render/qfilterkey/CMakeLists.txt index 8d762138f..d011adf8f 100644 --- a/tests/auto/render/qfilterkey/CMakeLists.txt +++ b/tests/auto/render/qfilterkey/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qfilterkey.pro. ##################################################################### ## tst_qfilterkey Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qfilterkey LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qfilterkey SOURCES tst_qfilterkey.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qfilterkey/qfilterkey.pro b/tests/auto/render/qfilterkey/qfilterkey.pro deleted file mode 100644 index fc77c8532..000000000 --- a/tests/auto/render/qfilterkey/qfilterkey.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qfilterkey - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qfilterkey.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qfilterkey/tst_qfilterkey.cpp b/tests/auto/render/qfilterkey/tst_qfilterkey.cpp index 4e7fe581a..3f66682bf 100644 --- a/tests/auto/render/qfilterkey/tst_qfilterkey.cpp +++ b/tests/auto/render/qfilterkey/tst_qfilterkey.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -64,7 +39,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(filterKey.value(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -72,7 +47,7 @@ private Q_SLOTS: // THEN QCOMPARE(filterKey.value(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -83,7 +58,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(filterKey.name(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -91,7 +66,7 @@ private Q_SLOTS: // THEN QCOMPARE(filterKey.name(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qframegraphnode/CMakeLists.txt b/tests/auto/render/qframegraphnode/CMakeLists.txt index d7847bd53..b78023810 100644 --- a/tests/auto/render/qframegraphnode/CMakeLists.txt +++ b/tests/auto/render/qframegraphnode/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qframegraphnode.pro. ##################################################################### ## tst_qframegraphnode Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qframegraphnode LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qframegraphnode SOURCES tst_qframegraphnode.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qframegraphnode/qframegraphnode.pro b/tests/auto/render/qframegraphnode/qframegraphnode.pro deleted file mode 100644 index 308e16d57..000000000 --- a/tests/auto/render/qframegraphnode/qframegraphnode.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qframegraphnode -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qframegraphnode.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp index 4c11a9258..eb44b3a7d 100644 --- a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp +++ b/tests/auto/render/qframegraphnode/tst_qframegraphnode.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qgeometry/CMakeLists.txt b/tests/auto/render/qgeometry/CMakeLists.txt index 47163666d..9d48fbcf7 100644 --- a/tests/auto/render/qgeometry/CMakeLists.txt +++ b/tests/auto/render/qgeometry/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qgeometry.pro. ##################################################################### ## tst_qgeometry Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qgeometry LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qgeometry SOURCES tst_qgeometry.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qgeometry/qgeometry.pro b/tests/auto/render/qgeometry/qgeometry.pro deleted file mode 100644 index e19569162..000000000 --- a/tests/auto/render/qgeometry/qgeometry.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qgeometry - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qgeometry.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp index 59684567b..798a8e1ea 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> @@ -140,8 +115,8 @@ private Q_SLOTS: dNode->setExtent(minExt, maxExt); // THEN - QCOMPARE(spyMinExtent.count(), 1); - QCOMPARE(spyMaxExtent.count(), 1); + QCOMPARE(spyMinExtent.size(), 1); + QCOMPARE(spyMaxExtent.size(), 1); QCOMPARE(geometry->minExtent(), minExt); QCOMPARE(geometry->maxExtent(), maxExt); @@ -152,8 +127,8 @@ private Q_SLOTS: dNode->setExtent(minExt, maxExt); // THEN - QCOMPARE(spyMinExtent.count(), 0); - QCOMPARE(spyMaxExtent.count(), 0); + QCOMPARE(spyMinExtent.size(), 0); + QCOMPARE(spyMaxExtent.size(), 0); } }; diff --git a/tests/auto/render/qgeometryrenderer/CMakeLists.txt b/tests/auto/render/qgeometryrenderer/CMakeLists.txt index 64337c36a..82b5c03b9 100644 --- a/tests/auto/render/qgeometryrenderer/CMakeLists.txt +++ b/tests/auto/render/qgeometryrenderer/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qgeometryrenderer.pro. ##################################################################### ## tst_qgeometryrenderer Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qgeometryrenderer LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qgeometryrenderer SOURCES tst_qgeometryrenderer.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro b/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro deleted file mode 100644 index 92a52d088..000000000 --- a/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qgeometryrenderer - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qgeometryrenderer.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp index 8fd08b133..53188f391 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qgraphicsapifilter/CMakeLists.txt b/tests/auto/render/qgraphicsapifilter/CMakeLists.txt index 6f3c056ae..d980431a9 100644 --- a/tests/auto/render/qgraphicsapifilter/CMakeLists.txt +++ b/tests/auto/render/qgraphicsapifilter/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qgraphicsapifilter.pro. ##################################################################### ## tst_qgraphicsapifilter Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qgraphicsapifilter LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qgraphicsapifilter SOURCES tst_qgraphicsapifilter.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qgraphicsapifilter/qgraphicsapifilter.pro b/tests/auto/render/qgraphicsapifilter/qgraphicsapifilter.pro deleted file mode 100644 index ce2d9ac12..000000000 --- a/tests/auto/render/qgraphicsapifilter/qgraphicsapifilter.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qgraphicsapifilter - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_qgraphicsapifilter.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp index ea14c27bb..4a92c9d94 100644 --- a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp +++ b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.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 #include <QtTest/QTest> #include <QObject> @@ -84,7 +59,7 @@ private Q_SLOTS: // THEN QCOMPARE(apiFilter.profile(), Qt3DRender::QGraphicsApiFilter::CoreProfile); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } { @@ -94,7 +69,7 @@ private Q_SLOTS: // THEN QCOMPARE(apiFilter.majorVersion(), 4); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } { @@ -104,7 +79,7 @@ private Q_SLOTS: // THEN QCOMPARE(apiFilter.minorVersion(), 5); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } { @@ -115,7 +90,7 @@ private Q_SLOTS: // THEN QCOMPARE(apiFilter.extensions(), extensions); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } { @@ -126,7 +101,7 @@ private Q_SLOTS: // THEN QCOMPARE(apiFilter.vendor(), vendor); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } } diff --git a/tests/auto/render/qlayerfilter/CMakeLists.txt b/tests/auto/render/qlayerfilter/CMakeLists.txt index 0776acc50..de1dab7b3 100644 --- a/tests/auto/render/qlayerfilter/CMakeLists.txt +++ b/tests/auto/render/qlayerfilter/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qlayerfilter.pro. ##################################################################### ## tst_qlayerfilter Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qlayerfilter LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qlayerfilter SOURCES tst_qlayerfilter.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qlayerfilter/qlayerfilter.pro b/tests/auto/render/qlayerfilter/qlayerfilter.pro deleted file mode 100644 index 61fe3bfc9..000000000 --- a/tests/auto/render/qlayerfilter/qlayerfilter.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qlayerfilter - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qlayerfilter.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp index da31944f7..cdf3a1c25 100644 --- a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp +++ b/tests/auto/render/qlayerfilter/tst_qlayerfilter.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qlevelofdetail/CMakeLists.txt b/tests/auto/render/qlevelofdetail/CMakeLists.txt index d376a4805..a3c186d61 100644 --- a/tests/auto/render/qlevelofdetail/CMakeLists.txt +++ b/tests/auto/render/qlevelofdetail/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qlevelofdetail.pro. ##################################################################### ## tst_qlevelofdetail Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qlevelofdetail LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qlevelofdetail SOURCES tst_qlevelofdetail.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qlevelofdetail/qlevelofdetail.pro b/tests/auto/render/qlevelofdetail/qlevelofdetail.pro deleted file mode 100644 index e8d7010a3..000000000 --- a/tests/auto/render/qlevelofdetail/qlevelofdetail.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qlevelofdetail - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qlevelofdetail.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qlevelofdetail/tst_qlevelofdetail.cpp b/tests/auto/render/qlevelofdetail/tst_qlevelofdetail.cpp index 1ca307e7c..72645df60 100644 --- a/tests/auto/render/qlevelofdetail/tst_qlevelofdetail.cpp +++ b/tests/auto/render/qlevelofdetail/tst_qlevelofdetail.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qmaterial/CMakeLists.txt b/tests/auto/render/qmaterial/CMakeLists.txt index 109f03a74..19b0ff61a 100644 --- a/tests/auto/render/qmaterial/CMakeLists.txt +++ b/tests/auto/render/qmaterial/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qmaterial.pro. ##################################################################### ## tst_qmaterial Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qmaterial LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qmaterial SOURCES tst_qmaterial.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DExtras diff --git a/tests/auto/render/qmaterial/qmaterial.pro b/tests/auto/render/qmaterial/qmaterial.pro deleted file mode 100644 index e1e2d2f4f..000000000 --- a/tests/auto/render/qmaterial/qmaterial.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qmaterial - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib 3dextras - -CONFIG += testcase - -SOURCES += tst_qmaterial.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp index 58831efd4..ba36f41ba 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qmemorybarrier/CMakeLists.txt b/tests/auto/render/qmemorybarrier/CMakeLists.txt index 4091853c4..ef9eabd60 100644 --- a/tests/auto/render/qmemorybarrier/CMakeLists.txt +++ b/tests/auto/render/qmemorybarrier/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qmemorybarrier.pro. ##################################################################### ## tst_qmemorybarrier Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qmemorybarrier LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qmemorybarrier SOURCES tst_qmemorybarrier.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qmemorybarrier/qmemorybarrier.pro b/tests/auto/render/qmemorybarrier/qmemorybarrier.pro deleted file mode 100644 index 35b6c46a8..000000000 --- a/tests/auto/render/qmemorybarrier/qmemorybarrier.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qmemorybarrier - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qmemorybarrier.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp b/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp index ae1d3360c..edb6d31a9 100644 --- a/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp +++ b/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -68,7 +43,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(memoryBarrier.waitOperations(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -76,7 +51,7 @@ private Q_SLOTS: // THEN QCOMPARE(memoryBarrier.waitOperations(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qmesh/CMakeLists.txt b/tests/auto/render/qmesh/CMakeLists.txt index 11a98192a..0ff1c8bad 100644 --- a/tests/auto/render/qmesh/CMakeLists.txt +++ b/tests/auto/render/qmesh/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qmesh.pro. ##################################################################### ## tst_qmesh Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qmesh LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qmesh SOURCES tst_qmesh.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qmesh/qmesh.pro b/tests/auto/render/qmesh/qmesh.pro deleted file mode 100644 index 8d0e69abc..000000000 --- a/tests/auto/render/qmesh/qmesh.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qmesh - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qmesh.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qmesh/tst_qmesh.cpp b/tests/auto/render/qmesh/tst_qmesh.cpp index 16545046d..598cb840b 100644 --- a/tests/auto/render/qmesh/tst_qmesh.cpp +++ b/tests/auto/render/qmesh/tst_qmesh.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> @@ -33,6 +8,8 @@ QT_WARNING_DISABLE_DEPRECATED #include <QtTest/QTest> #include <Qt3DRender/qmesh.h> #include <Qt3DRender/private/qmesh_p.h> +#include <Qt3DCore/qaspectengine.h> +#include <Qt3DCore/private/qaspectengine_p.h> #include <QObject> #include <QSignalSpy> #include <Qt3DCore/private/qscene_p.h> @@ -78,7 +55,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(mesh.source(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -86,7 +63,7 @@ private Q_SLOTS: // THEN QCOMPARE(mesh.source(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -97,7 +74,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(mesh.meshName(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -105,7 +82,7 @@ private Q_SLOTS: // THEN QCOMPARE(mesh.meshName(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -113,11 +90,11 @@ private Q_SLOTS: { // GIVEN TestArbiter arbiter; + Qt3DCore::QAspectEngine engine; + Qt3DCore::QScene *scene = Qt3DCore::QAspectEnginePrivate::get(&engine)->m_scene; Qt3DRender::QMesh mesh; - arbiter.setArbiterOnNode(&mesh); - Qt3DCore::QAspectEngine *engine = reinterpret_cast<Qt3DCore::QAspectEngine*>(0xdeadbeef); - Qt3DCore::QScene *scene = new Qt3DCore::QScene(engine); + arbiter.setArbiterOnNode(&mesh); Qt3DCore::QNodePrivate *meshd = Qt3DCore::QNodePrivate::get(&mesh); meshd->setScene(scene); QCoreApplication::processEvents(); @@ -150,11 +127,11 @@ private Q_SLOTS: { // GIVEN TestArbiter arbiter; + Qt3DCore::QAspectEngine engine; + Qt3DCore::QScene *scene = Qt3DCore::QAspectEnginePrivate::get(&engine)->m_scene; Qt3DRender::QMesh mesh; - arbiter.setArbiterOnNode(&mesh); - Qt3DCore::QAspectEngine *engine = reinterpret_cast<Qt3DCore::QAspectEngine*>(0xdeadbeef); - Qt3DCore::QScene *scene = new Qt3DCore::QScene(engine); + arbiter.setArbiterOnNode(&mesh); Qt3DCore::QNodePrivate *meshd = Qt3DCore::QNodePrivate::get(&mesh); meshd->setScene(scene); QCoreApplication::processEvents(); diff --git a/tests/auto/render/qmlscenereader/qmlscenereader.cpp b/tests/auto/render/qmlscenereader/qmlscenereader.cpp index 182782edb..e6da809c9 100644 --- a/tests/auto/render/qmlscenereader/qmlscenereader.cpp +++ b/tests/auto/render/qmlscenereader/qmlscenereader.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qmlscenereader.h" #include <QQmlEngine> @@ -82,3 +46,5 @@ void QmlSceneReader::loadComplete() } QT_END_NAMESPACE + +#include "moc_qmlscenereader.cpp" diff --git a/tests/auto/render/qmlscenereader/qmlscenereader.h b/tests/auto/render/qmlscenereader/qmlscenereader.h index 9d4643d93..f9b2d79b7 100644 --- a/tests/auto/render/qmlscenereader/qmlscenereader.h +++ b/tests/auto/render/qmlscenereader/qmlscenereader.h @@ -1,41 +1,8 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#ifndef QMLSCENEREADER_H +#define QMLSCENEREADER_H #include <QObject> @@ -61,3 +28,5 @@ private: }; QT_END_NAMESPACE + +#endif diff --git a/tests/auto/render/qmlscenereader/qmlscenereader.pri b/tests/auto/render/qmlscenereader/qmlscenereader.pri deleted file mode 100644 index 829f2a612..000000000 --- a/tests/auto/render/qmlscenereader/qmlscenereader.pri +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDEPATH += $$PWD - -SOURCES += $$PWD/qmlscenereader.cpp - -HEADERS += $$PWD/qmlscenereader.h - -QT += core-private qml diff --git a/tests/auto/render/qobjectpicker/CMakeLists.txt b/tests/auto/render/qobjectpicker/CMakeLists.txt index 4ec7deed1..2127bd489 100644 --- a/tests/auto/render/qobjectpicker/CMakeLists.txt +++ b/tests/auto/render/qobjectpicker/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qobjectpicker.pro. ##################################################################### ## tst_qobjectpicker Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qobjectpicker LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qobjectpicker SOURCES tst_qobjectpicker.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qobjectpicker/qobjectpicker.pro b/tests/auto/render/qobjectpicker/qobjectpicker.pro deleted file mode 100644 index 8cffbf171..000000000 --- a/tests/auto/render/qobjectpicker/qobjectpicker.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qobjectpicker - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qobjectpicker.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp index 81b0110b1..5f34f9382 100644 --- a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp +++ b/tests/auto/render/qobjectpicker/tst_qobjectpicker.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 #include <QtTest/QTest> #include <QtTest/QSignalSpy> diff --git a/tests/auto/render/qparameter/CMakeLists.txt b/tests/auto/render/qparameter/CMakeLists.txt index 6bfd7ded5..bc1d98872 100644 --- a/tests/auto/render/qparameter/CMakeLists.txt +++ b/tests/auto/render/qparameter/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qparameter.pro. ##################################################################### ## tst_qparameter Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qparameter LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qparameter SOURCES tst_qparameter.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qparameter/qparameter.pro b/tests/auto/render/qparameter/qparameter.pro deleted file mode 100644 index 88759d220..000000000 --- a/tests/auto/render/qparameter/qparameter.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qparameter - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qparameter.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qparameter/tst_qparameter.cpp b/tests/auto/render/qparameter/tst_qparameter.cpp index b4c307dc6..38bae4dc0 100644 --- a/tests/auto/render/qparameter/tst_qparameter.cpp +++ b/tests/auto/render/qparameter/tst_qparameter.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qparameter.h> @@ -64,7 +39,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(parameter.name(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -72,7 +47,7 @@ private Q_SLOTS: // THEN QCOMPARE(parameter.name(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -83,7 +58,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(parameter.value(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -91,7 +66,7 @@ private Q_SLOTS: // THEN QCOMPARE(parameter.value(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -194,13 +169,13 @@ private Q_SLOTS: parameter.setValue(QVariant::fromValue(node.data())); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(parameter.value(), QVariant::fromValue(node.data())); spy.clear(); } // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(parameter.value(), QVariant()); } diff --git a/tests/auto/render/qproximityfilter/CMakeLists.txt b/tests/auto/render/qproximityfilter/CMakeLists.txt index e5caa85f7..b453a6eb8 100644 --- a/tests/auto/render/qproximityfilter/CMakeLists.txt +++ b/tests/auto/render/qproximityfilter/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qproximityfilter.pro. ##################################################################### ## tst_qproximityfilter Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qproximityfilter LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qproximityfilter SOURCES tst_qproximityfilter.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qproximityfilter/qproximityfilter.pro b/tests/auto/render/qproximityfilter/qproximityfilter.pro deleted file mode 100644 index 4a12e244f..000000000 --- a/tests/auto/render/qproximityfilter/qproximityfilter.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qproximityfilter - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qproximityfilter.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp b/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp index 3336d757e..5006efc70 100644 --- a/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp +++ b/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2017 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qproximityfilter.h> @@ -72,7 +47,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(proximityFilter.entity(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -80,7 +55,7 @@ private Q_SLOTS: // THEN QCOMPARE(proximityFilter.entity(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -91,7 +66,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(proximityFilter.distanceThreshold(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -99,7 +74,7 @@ private Q_SLOTS: // THEN QCOMPARE(proximityFilter.distanceThreshold(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qray3d/CMakeLists.txt b/tests/auto/render/qray3d/CMakeLists.txt index 073608c9b..21863a119 100644 --- a/tests/auto/render/qray3d/CMakeLists.txt +++ b/tests/auto/render/qray3d/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qray3d.pro. ##################################################################### ## 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 - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender 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 92ee11dcb..29f0c644b 100644 --- a/tests/auto/render/qray3d/tst_qray3d.cpp +++ b/tests/auto/render/qray3d/tst_qray3d.cpp @@ -1,31 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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) 2016 The Qt Company Ltd. +// Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <Qt3DRender/private/qray3d_p.h> @@ -517,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)); } diff --git a/tests/auto/render/qraycaster/CMakeLists.txt b/tests/auto/render/qraycaster/CMakeLists.txt index 98590e7de..f1d936b54 100644 --- a/tests/auto/render/qraycaster/CMakeLists.txt +++ b/tests/auto/render/qraycaster/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qraycaster.pro. ##################################################################### ## tst_qraycaster Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qraycaster LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qraycaster SOURCES tst_qraycaster.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qraycaster/qraycaster.pro b/tests/auto/render/qraycaster/qraycaster.pro deleted file mode 100644 index 035c7a77b..000000000 --- a/tests/auto/render/qraycaster/qraycaster.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qraycaster - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qraycaster.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qraycaster/tst_qraycaster.cpp b/tests/auto/render/qraycaster/tst_qraycaster.cpp index 96f6d92eb..f4a5e3400 100644 --- a/tests/auto/render/qraycaster/tst_qraycaster.cpp +++ b/tests/auto/render/qraycaster/tst_qraycaster.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QtTest/QSignalSpy> @@ -193,7 +168,7 @@ private Q_SLOTS: // THEN // Check that the QRayCaster triggers the expected signal - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } }; diff --git a/tests/auto/render/qrendercapture/CMakeLists.txt b/tests/auto/render/qrendercapture/CMakeLists.txt index 30e22310c..e22876398 100644 --- a/tests/auto/render/qrendercapture/CMakeLists.txt +++ b/tests/auto/render/qrendercapture/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qrendercapture.pro. ##################################################################### ## tst_qrendercapture Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qrendercapture LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qrendercapture SOURCES tst_qrendercapture.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qrendercapture/qrendercapture.pro b/tests/auto/render/qrendercapture/qrendercapture.pro deleted file mode 100644 index deba9a381..000000000 --- a/tests/auto/render/qrendercapture/qrendercapture.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qrendercapture - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qrendercapture.cpp - -include(../commons/commons.pri) -include(../../core/common/common.pri) diff --git a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp index 2b4fcec6b..e4e82921b 100644 --- a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp +++ b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QtTest/QSignalSpy> diff --git a/tests/auto/render/qrenderpass/CMakeLists.txt b/tests/auto/render/qrenderpass/CMakeLists.txt index b562daed8..e7a1773d4 100644 --- a/tests/auto/render/qrenderpass/CMakeLists.txt +++ b/tests/auto/render/qrenderpass/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qrenderpass.pro. ##################################################################### ## tst_qrenderpass Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qrenderpass LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qrenderpass SOURCES tst_qrenderpass.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qrenderpass/qrenderpass.pro b/tests/auto/render/qrenderpass/qrenderpass.pro deleted file mode 100644 index dbe733839..000000000 --- a/tests/auto/render/qrenderpass/qrenderpass.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qrenderpass - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qrenderpass.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp b/tests/auto/render/qrenderpass/tst_qrenderpass.cpp index 479fffa29..2e93ec237 100644 --- a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp +++ b/tests/auto/render/qrenderpass/tst_qrenderpass.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -75,7 +50,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderPass.shaderProgram(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -83,7 +58,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderPass.shaderProgram(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN diff --git a/tests/auto/render/qrenderpassfilter/CMakeLists.txt b/tests/auto/render/qrenderpassfilter/CMakeLists.txt index 9711d9e79..9c1bcf2e3 100644 --- a/tests/auto/render/qrenderpassfilter/CMakeLists.txt +++ b/tests/auto/render/qrenderpassfilter/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qrenderpassfilter.pro. ##################################################################### ## tst_qrenderpassfilter Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qrenderpassfilter LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qrenderpassfilter SOURCES tst_qrenderpassfilter.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro b/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro deleted file mode 100644 index e2af720d9..000000000 --- a/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qrenderpassfilter -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qrenderpassfilter.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp index 6441119f2..3cd621bcb 100644 --- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp +++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> @@ -48,8 +23,8 @@ private Q_SLOTS: { QScopedPointer<Qt3DRender::QRenderPassFilter> defaultRenderPassFilter(new Qt3DRender::QRenderPassFilter); - QCOMPARE(defaultRenderPassFilter->matchAny().count(), 0); - QCOMPARE(defaultRenderPassFilter->parameters().count(), 0); + QCOMPARE(defaultRenderPassFilter->matchAny().size(), 0); + QCOMPARE(defaultRenderPassFilter->parameters().size(), 0); } void checkPropertyUpdates() diff --git a/tests/auto/render/qrendersettings/CMakeLists.txt b/tests/auto/render/qrendersettings/CMakeLists.txt index 1cc0673f1..5bf8ae811 100644 --- a/tests/auto/render/qrendersettings/CMakeLists.txt +++ b/tests/auto/render/qrendersettings/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qrendersettings.pro. ##################################################################### ## tst_qrendersettings Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qrendersettings LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qrendersettings SOURCES tst_qrendersettings.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qrendersettings/qrendersettings.pro b/tests/auto/render/qrendersettings/qrendersettings.pro deleted file mode 100644 index 9de505ff1..000000000 --- a/tests/auto/render/qrendersettings/qrendersettings.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qrendersettings - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qrendersettings.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qrendersettings/tst_qrendersettings.cpp b/tests/auto/render/qrendersettings/tst_qrendersettings.cpp index 51c53610e..748f2fd19 100644 --- a/tests/auto/render/qrendersettings/tst_qrendersettings.cpp +++ b/tests/auto/render/qrendersettings/tst_qrendersettings.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -79,7 +54,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderSettings.renderPolicy(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -87,7 +62,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderSettings.renderPolicy(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -99,7 +74,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderSettings.activeFrameGraph(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -107,7 +82,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderSettings.activeFrameGraph(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -118,7 +93,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(pickingSettings->pickMethod(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -126,7 +101,7 @@ private Q_SLOTS: // THEN QCOMPARE(pickingSettings->pickMethod(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -137,7 +112,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(pickingSettings->pickResultMode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -145,7 +120,7 @@ private Q_SLOTS: // THEN QCOMPARE(pickingSettings->pickResultMode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -156,7 +131,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(pickingSettings->faceOrientationPickingMode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -164,7 +139,7 @@ private Q_SLOTS: // THEN QCOMPARE(pickingSettings->faceOrientationPickingMode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qrenderstate/CMakeLists.txt b/tests/auto/render/qrenderstate/CMakeLists.txt index 5b71e872c..db5cff150 100644 --- a/tests/auto/render/qrenderstate/CMakeLists.txt +++ b/tests/auto/render/qrenderstate/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qrenderstate.pro. ##################################################################### ## tst_qrenderstate Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qrenderstate LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qrenderstate SOURCES tst_qrenderstate.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qrenderstate/qrenderstate.pro b/tests/auto/render/qrenderstate/qrenderstate.pro deleted file mode 100644 index 60bdfef01..000000000 --- a/tests/auto/render/qrenderstate/qrenderstate.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qrenderstate - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qrenderstate.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qrenderstate/tst_qrenderstate.cpp b/tests/auto/render/qrenderstate/tst_qrenderstate.cpp index 64ad63e3a..52b4d481a 100644 --- a/tests/auto/render/qrenderstate/tst_qrenderstate.cpp +++ b/tests/auto/render/qrenderstate/tst_qrenderstate.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/qrenderstateset/CMakeLists.txt b/tests/auto/render/qrenderstateset/CMakeLists.txt index 359bef913..eb0648378 100644 --- a/tests/auto/render/qrenderstateset/CMakeLists.txt +++ b/tests/auto/render/qrenderstateset/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qrenderstateset.pro. ##################################################################### ## tst_qrenderstateset Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qrenderstateset LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qrenderstateset SOURCES tst_qrenderstateset.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qrenderstateset/qrenderstateset.pro b/tests/auto/render/qrenderstateset/qrenderstateset.pro deleted file mode 100644 index 3a0fb757b..000000000 --- a/tests/auto/render/qrenderstateset/qrenderstateset.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qrenderstateset -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qrenderstateset.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp index 39b45ee42..25f638136 100644 --- a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp +++ b/tests/auto/render/qrenderstateset/tst_qrenderstateset.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qrendersurfaceselector/CMakeLists.txt b/tests/auto/render/qrendersurfaceselector/CMakeLists.txt index a6f438089..140981906 100644 --- a/tests/auto/render/qrendersurfaceselector/CMakeLists.txt +++ b/tests/auto/render/qrendersurfaceselector/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qrendersurfaceselector.pro. ##################################################################### ## tst_qrendersurfaceselector Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qrendersurfaceselector LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qrendersurfaceselector SOURCES tst_qrendersurfaceselector.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qrendersurfaceselector/qrendersurfaceselector.pro b/tests/auto/render/qrendersurfaceselector/qrendersurfaceselector.pro deleted file mode 100644 index bbd9455d0..000000000 --- a/tests/auto/render/qrendersurfaceselector/qrendersurfaceselector.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qrendersurfaceselector -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qrendersurfaceselector.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp index fa75e3580..26309450b 100644 --- a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp +++ b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qentity.h> @@ -128,7 +103,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderSurfaceSelector.surface(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -136,7 +111,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderSurfaceSelector.surface(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // Prevents crashes with temporary window being destroyed renderSurfaceSelector.setSurface(nullptr); @@ -151,7 +126,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderSurfaceSelector.externalRenderTargetSize(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -159,7 +134,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderSurfaceSelector.externalRenderTargetSize(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -170,7 +145,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderSurfaceSelector.surfacePixelRatio(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -178,7 +153,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderSurfaceSelector.surfacePixelRatio(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qrendertarget/CMakeLists.txt b/tests/auto/render/qrendertarget/CMakeLists.txt index cec7db335..69f98e8a8 100644 --- a/tests/auto/render/qrendertarget/CMakeLists.txt +++ b/tests/auto/render/qrendertarget/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qrendertarget.pro. ##################################################################### ## tst_qrendertarget Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qrendertarget LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qrendertarget SOURCES tst_qrendertarget.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qrendertarget/qrendertarget.pro b/tests/auto/render/qrendertarget/qrendertarget.pro deleted file mode 100644 index 094dd67a7..000000000 --- a/tests/auto/render/qrendertarget/qrendertarget.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qrendertarget - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qrendertarget.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qrendertarget/tst_qrendertarget.cpp b/tests/auto/render/qrendertarget/tst_qrendertarget.cpp index 3377e6f8f..afc9d1973 100644 --- a/tests/auto/render/qrendertarget/tst_qrendertarget.cpp +++ b/tests/auto/render/qrendertarget/tst_qrendertarget.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qrendertarget.h> diff --git a/tests/auto/render/qrendertargetoutput/CMakeLists.txt b/tests/auto/render/qrendertargetoutput/CMakeLists.txt index 1c8763c0e..ad555b718 100644 --- a/tests/auto/render/qrendertargetoutput/CMakeLists.txt +++ b/tests/auto/render/qrendertargetoutput/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qrendertargetoutput.pro. ##################################################################### ## tst_qrendertargetoutput Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qrendertargetoutput LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qrendertargetoutput SOURCES tst_qrendertargetoutput.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qrendertargetoutput/qrendertargetoutput.pro b/tests/auto/render/qrendertargetoutput/qrendertargetoutput.pro deleted file mode 100644 index e42f4fc22..000000000 --- a/tests/auto/render/qrendertargetoutput/qrendertargetoutput.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qrendertargetoutput - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qrendertargetoutput.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp b/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp index 0fed1d7bb..e70382dfa 100644 --- a/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp +++ b/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QObject> @@ -75,7 +50,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderTargetOutput.attachmentPoint(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -83,7 +58,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderTargetOutput.attachmentPoint(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -95,7 +70,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderTargetOutput.texture(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -103,7 +78,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderTargetOutput.texture(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -115,7 +90,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderTargetOutput.mipLevel(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -123,7 +98,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderTargetOutput.mipLevel(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -135,7 +110,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderTargetOutput.layer(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -143,7 +118,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderTargetOutput.layer(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -155,7 +130,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderTargetOutput.face(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -163,7 +138,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderTargetOutput.face(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qrendertargetselector/CMakeLists.txt b/tests/auto/render/qrendertargetselector/CMakeLists.txt index d4145d667..74d759d48 100644 --- a/tests/auto/render/qrendertargetselector/CMakeLists.txt +++ b/tests/auto/render/qrendertargetselector/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qrendertargetselector.pro. ##################################################################### ## tst_qrendertargetselector Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qrendertargetselector LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qrendertargetselector SOURCES tst_qrendertargetselector.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qrendertargetselector/qrendertargetselector.pro b/tests/auto/render/qrendertargetselector/qrendertargetselector.pro deleted file mode 100644 index 4821b25ec..000000000 --- a/tests/auto/render/qrendertargetselector/qrendertargetselector.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qrendertargetselector -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qrendertargetselector.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp index 8cd1c1a3b..645cda011 100644 --- a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp +++ b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qscene2d/CMakeLists.txt b/tests/auto/render/qscene2d/CMakeLists.txt index ff585b314..d84583007 100644 --- a/tests/auto/render/qscene2d/CMakeLists.txt +++ b/tests/auto/render/qscene2d/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qscene2d.pro. ##################################################################### ## qscene2d Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(qscene2d LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(qscene2d SOURCES tst_qscene2d.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DQuickScene2D diff --git a/tests/auto/render/qscene2d/qscene2d.pro b/tests/auto/render/qscene2d/qscene2d.pro deleted file mode 100644 index b1d4d45a9..000000000 --- a/tests/auto/render/qscene2d/qscene2d.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = qscene2d - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib 3dquickscene2d 3dquickscene2d-private - -CONFIG += testcase - -SOURCES += tst_qscene2d.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qscene2d/tst_qscene2d.cpp b/tests/auto/render/qscene2d/tst_qscene2d.cpp index 3a9c0bc71..6a48d596f 100644 --- a/tests/auto/render/qscene2d/tst_qscene2d.cpp +++ b/tests/auto/render/qscene2d/tst_qscene2d.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** 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) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DQuickScene2D/qscene2d.h> @@ -76,7 +51,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(scene2d.output(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -84,7 +59,7 @@ private Q_SLOTS: // THEN QCOMPARE(scene2d.output(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -95,7 +70,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(scene2d.renderPolicy(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -103,7 +78,7 @@ private Q_SLOTS: // THEN QCOMPARE(scene2d.renderPolicy(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -114,7 +89,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(scene2d.item(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -122,7 +97,7 @@ private Q_SLOTS: // THEN QCOMPARE(scene2d.item(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -134,7 +109,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(scene2d.isMouseEnabled(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -142,7 +117,7 @@ private Q_SLOTS: // THEN QCOMPARE(scene2d.isMouseEnabled(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qsceneloader/CMakeLists.txt b/tests/auto/render/qsceneloader/CMakeLists.txt index 0b447eb19..345976078 100644 --- a/tests/auto/render/qsceneloader/CMakeLists.txt +++ b/tests/auto/render/qsceneloader/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qsceneloader.pro. ##################################################################### ## tst_qsceneloader Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qsceneloader LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qsceneloader SOURCES tst_qsceneloader.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qsceneloader/qsceneloader.pro b/tests/auto/render/qsceneloader/qsceneloader.pro deleted file mode 100644 index 7f516f19f..000000000 --- a/tests/auto/render/qsceneloader/qsceneloader.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qsceneloader - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qsceneloader.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qsceneloader/tst_qsceneloader.cpp b/tests/auto/render/qsceneloader/tst_qsceneloader.cpp index c12d72db6..8a3d23563 100644 --- a/tests/auto/render/qsceneloader/tst_qsceneloader.cpp +++ b/tests/auto/render/qsceneloader/tst_qsceneloader.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qentity.h> diff --git a/tests/auto/render/qscreenraycaster/CMakeLists.txt b/tests/auto/render/qscreenraycaster/CMakeLists.txt index 4f63bddff..317552c53 100644 --- a/tests/auto/render/qscreenraycaster/CMakeLists.txt +++ b/tests/auto/render/qscreenraycaster/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qscreenraycaster.pro. ##################################################################### ## tst_qscreenraycaster Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qscreenraycaster LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qscreenraycaster SOURCES tst_qscreenraycaster.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qscreenraycaster/qscreenraycaster.pro b/tests/auto/render/qscreenraycaster/qscreenraycaster.pro deleted file mode 100644 index d4a9c4f9f..000000000 --- a/tests/auto/render/qscreenraycaster/qscreenraycaster.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qscreenraycaster - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qscreenraycaster.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qscreenraycaster/tst_qscreenraycaster.cpp b/tests/auto/render/qscreenraycaster/tst_qscreenraycaster.cpp index e12872d6c..f54ff2344 100644 --- a/tests/auto/render/qscreenraycaster/tst_qscreenraycaster.cpp +++ b/tests/auto/render/qscreenraycaster/tst_qscreenraycaster.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QtTest/QSignalSpy> diff --git a/tests/auto/render/qsetfence/CMakeLists.txt b/tests/auto/render/qsetfence/CMakeLists.txt index 07f5b593d..849c80e4c 100644 --- a/tests/auto/render/qsetfence/CMakeLists.txt +++ b/tests/auto/render/qsetfence/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qsetfence.pro. ##################################################################### ## tst_qsetfence Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qsetfence LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qsetfence SOURCES tst_qsetfence.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qsetfence/qsetfence.pro b/tests/auto/render/qsetfence/qsetfence.pro deleted file mode 100644 index 4e70559c9..000000000 --- a/tests/auto/render/qsetfence/qsetfence.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qsetfence - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qsetfence.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qsetfence/tst_qsetfence.cpp b/tests/auto/render/qsetfence/tst_qsetfence.cpp index 0c74c6e83..392b34f81 100644 --- a/tests/auto/render/qsetfence/tst_qsetfence.cpp +++ b/tests/auto/render/qsetfence/tst_qsetfence.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qsetfence.h> @@ -92,14 +56,14 @@ private Q_SLOTS: // THEN QCOMPARE(setFence.handleType(), Qt3DRender::QSetFence::OpenGLFenceId); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); dNode->setHandleType(Qt3DRender::QSetFence::OpenGLFenceId); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -115,14 +79,14 @@ private Q_SLOTS: // THEN QCOMPARE(setFence.handle(),QVariant(984)); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); dNode->setHandle(QVariant(984)); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } }; diff --git a/tests/auto/render/qshaderimage/CMakeLists.txt b/tests/auto/render/qshaderimage/CMakeLists.txt index 88efbf38d..5275b5daf 100644 --- a/tests/auto/render/qshaderimage/CMakeLists.txt +++ b/tests/auto/render/qshaderimage/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qshaderimage.pro. ##################################################################### ## tst_qshaderimage Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qshaderimage LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qshaderimage SOURCES tst_qshaderimage.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qshaderimage/qshaderimage.pro b/tests/auto/render/qshaderimage/qshaderimage.pro deleted file mode 100644 index 1990b9732..000000000 --- a/tests/auto/render/qshaderimage/qshaderimage.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qshaderimage - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qshaderimage.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp index cc5081063..2b5295ac4 100644 --- a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp +++ b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qshaderimage.h> @@ -85,7 +49,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.texture(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -93,7 +57,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.texture(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -104,7 +68,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.layered(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -112,7 +76,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.layered(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -123,7 +87,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.mipLevel(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -131,7 +95,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.mipLevel(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -142,7 +106,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.layer(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -150,7 +114,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.layer(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -161,7 +125,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.access(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -169,7 +133,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.access(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -180,7 +144,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.format(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -188,7 +152,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.format(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -387,13 +351,13 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.texture(), &tex); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); } // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QVERIFY(shaderImage.texture() == nullptr); } diff --git a/tests/auto/render/qshaderprogram/CMakeLists.txt b/tests/auto/render/qshaderprogram/CMakeLists.txt index 670f76235..3c0b013f0 100644 --- a/tests/auto/render/qshaderprogram/CMakeLists.txt +++ b/tests/auto/render/qshaderprogram/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qshaderprogram.pro. ##################################################################### ## tst_qshaderprogram Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qshaderprogram LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qshaderprogram SOURCES tst_qshaderprogram.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qshaderprogram/qshaderprogram.pro b/tests/auto/render/qshaderprogram/qshaderprogram.pro deleted file mode 100644 index 4ab65c455..000000000 --- a/tests/auto/render/qshaderprogram/qshaderprogram.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qshaderprogram - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qshaderprogram.cpp - -RESOURCES += \ - shaders.qrc - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp b/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp index b7aa7f8de..cf096bf9a 100644 --- a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp +++ b/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qshaderprogram.h> @@ -78,7 +53,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.vertexShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -86,7 +61,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.vertexShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -97,7 +72,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.tessellationControlShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -105,7 +80,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.tessellationControlShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -116,7 +91,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.tessellationEvaluationShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -124,7 +99,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.tessellationEvaluationShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -135,7 +110,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.geometryShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -143,7 +118,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.geometryShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -154,7 +129,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.fragmentShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -162,7 +137,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.fragmentShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -173,7 +148,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.computeShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -181,7 +156,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.computeShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -192,7 +167,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.format(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -200,7 +175,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.format(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -400,7 +375,7 @@ private Q_SLOTS: dNode->setLog(logValue); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(log(), logValue); @@ -409,7 +384,7 @@ private Q_SLOTS: dNode->setLog(logValue); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(log(), logValue); @@ -434,7 +409,7 @@ private Q_SLOTS: dNode->setStatus(newStatus); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(status(), newStatus); @@ -443,7 +418,7 @@ private Q_SLOTS: dNode->setStatus(newStatus); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(status(), newStatus); @@ -488,7 +463,7 @@ private Q_SLOTS: QCoreApplication::processEvents(); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 1); spy.clear(); @@ -500,7 +475,7 @@ private Q_SLOTS: QCoreApplication::processEvents(); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 1); } } diff --git a/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt b/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt index 816cada5a..1e682b37c 100644 --- a/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt +++ b/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qshaderprogrambuilder.pro. ##################################################################### ## tst_qshaderprogrambuilder Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qshaderprogrambuilder LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qshaderprogrambuilder SOURCES tst_qshaderprogrambuilder.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qshaderprogrambuilder/qshaderprogrambuilder.pro b/tests/auto/render/qshaderprogrambuilder/qshaderprogrambuilder.pro deleted file mode 100644 index 32fe88e9f..000000000 --- a/tests/auto/render/qshaderprogrambuilder/qshaderprogrambuilder.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qshaderprogrambuilder - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qshaderprogrambuilder.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp b/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp index 484eca943..eddb56b52 100644 --- a/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp +++ b/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -82,7 +57,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.shaderProgram(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -90,7 +65,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.shaderProgram(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -101,7 +76,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.enabledLayers(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -109,7 +84,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.enabledLayers(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -120,7 +95,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.vertexShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -128,7 +103,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.vertexShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -139,7 +114,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.tessellationControlShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -147,7 +122,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.tessellationControlShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -158,7 +133,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.tessellationEvaluationShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -166,7 +141,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.tessellationEvaluationShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -177,7 +152,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.geometryShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -185,7 +160,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.geometryShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -196,7 +171,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.fragmentShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -204,7 +179,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.fragmentShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -215,7 +190,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.computeShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -223,7 +198,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.computeShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -510,7 +485,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(vertexShaderCode(), QByteArrayLiteral("vertex")); } { @@ -520,7 +495,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(fragmentShaderCode(), QByteArrayLiteral("fragment")); } { @@ -530,7 +505,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(geometryShaderCode(), QByteArrayLiteral("geometry")); } { @@ -541,7 +516,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(computeShaderCode(), QByteArrayLiteral("compute")); } { @@ -551,7 +526,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(tessellationControlShaderCode(), QByteArrayLiteral("control")); } { @@ -561,7 +536,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(tessellationEvaluationShaderCode(), QByteArrayLiteral("eval")); } } diff --git a/tests/auto/render/qsharedgltexture/CMakeLists.txt b/tests/auto/render/qsharedgltexture/CMakeLists.txt index 758725b24..cfda90503 100644 --- a/tests/auto/render/qsharedgltexture/CMakeLists.txt +++ b/tests/auto/render/qsharedgltexture/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qsharedgltexture.pro. ##################################################################### ## tst_qsharedgltexture Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qsharedgltexture LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qsharedgltexture SOURCES tst_qsharedgltexture.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qsharedgltexture/qsharedgltexture.pro b/tests/auto/render/qsharedgltexture/qsharedgltexture.pro deleted file mode 100644 index a5c76aa7d..000000000 --- a/tests/auto/render/qsharedgltexture/qsharedgltexture.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qsharedgltexture - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qsharedgltexture.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp b/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp index f7185320b..f95988f0b 100644 --- a/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp +++ b/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> @@ -67,7 +42,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(glTexture.textureId(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -75,7 +50,7 @@ private Q_SLOTS: // THEN QCOMPARE(glTexture.textureId(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qsortpolicy/CMakeLists.txt b/tests/auto/render/qsortpolicy/CMakeLists.txt index 27fcda50e..af6701103 100644 --- a/tests/auto/render/qsortpolicy/CMakeLists.txt +++ b/tests/auto/render/qsortpolicy/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qsortpolicy.pro. ##################################################################### ## tst_qsortmethod Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qsortmethod LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qsortmethod SOURCES tst_qsortpolicy.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qsortpolicy/qsortpolicy.pro b/tests/auto/render/qsortpolicy/qsortpolicy.pro deleted file mode 100644 index c9020109f..000000000 --- a/tests/auto/render/qsortpolicy/qsortpolicy.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qsortmethod -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qsortpolicy.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp index 43168b74c..72a8c1cf1 100644 --- a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp +++ b/tests/auto/render/qsortpolicy/tst_qsortpolicy.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qtechnique/CMakeLists.txt b/tests/auto/render/qtechnique/CMakeLists.txt index 3334ed098..527c599c4 100644 --- a/tests/auto/render/qtechnique/CMakeLists.txt +++ b/tests/auto/render/qtechnique/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qtechnique.pro. ##################################################################### ## tst_qtechnique Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qtechnique LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qtechnique SOURCES tst_qtechnique.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qtechnique/qtechnique.pro b/tests/auto/render/qtechnique/qtechnique.pro deleted file mode 100644 index cf6ecbee9..000000000 --- a/tests/auto/render/qtechnique/qtechnique.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qtechnique - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qtechnique.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qtechnique/tst_qtechnique.cpp b/tests/auto/render/qtechnique/tst_qtechnique.cpp index 4a344c9d0..819a27b2d 100644 --- a/tests/auto/render/qtechnique/tst_qtechnique.cpp +++ b/tests/auto/render/qtechnique/tst_qtechnique.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -135,7 +110,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(technique.graphicsApiFilter()->majorVersion(), 3); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -143,14 +118,14 @@ private Q_SLOTS: // THEN QCOMPARE(technique.graphicsApiFilter()->majorVersion(), 3); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // WHEN technique.graphicsApiFilter()->setMinorVersion(2); // THEN QCOMPARE(technique.graphicsApiFilter()->minorVersion(), 2); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -158,14 +133,14 @@ private Q_SLOTS: // THEN QCOMPARE(technique.graphicsApiFilter()->minorVersion(), 2); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // WHEN technique.graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::CoreProfile); // THEN QCOMPARE(technique.graphicsApiFilter()->profile(), Qt3DRender::QGraphicsApiFilter::CoreProfile); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -173,7 +148,7 @@ private Q_SLOTS: // THEN QCOMPARE(technique.graphicsApiFilter()->profile(), Qt3DRender::QGraphicsApiFilter::CoreProfile); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qtechniquefilter/CMakeLists.txt b/tests/auto/render/qtechniquefilter/CMakeLists.txt index 21679659e..f4722e093 100644 --- a/tests/auto/render/qtechniquefilter/CMakeLists.txt +++ b/tests/auto/render/qtechniquefilter/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qtechniquefilter.pro. ##################################################################### ## tst_qtechniquefilter Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qtechniquefilter LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qtechniquefilter SOURCES tst_qtechniquefilter.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qtechniquefilter/qtechniquefilter.pro b/tests/auto/render/qtechniquefilter/qtechniquefilter.pro deleted file mode 100644 index 303f9561b..000000000 --- a/tests/auto/render/qtechniquefilter/qtechniquefilter.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qtechniquefilter -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qtechniquefilter.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp index 0e2c3ff2f..035ecb428 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> @@ -48,8 +23,8 @@ private Q_SLOTS: { QScopedPointer<Qt3DRender::QTechniqueFilter> defaulttechniqueFilter(new Qt3DRender::QTechniqueFilter); - QCOMPARE(defaulttechniqueFilter->matchAll().count(), 0); - QCOMPARE(defaulttechniqueFilter->parameters().count(), 0); + QCOMPARE(defaulttechniqueFilter->matchAll().size(), 0); + QCOMPARE(defaulttechniqueFilter->parameters().size(), 0); } void checkPropertyUpdates() diff --git a/tests/auto/render/qtexturedataupdate/CMakeLists.txt b/tests/auto/render/qtexturedataupdate/CMakeLists.txt index 3a083208e..455cf8a3c 100644 --- a/tests/auto/render/qtexturedataupdate/CMakeLists.txt +++ b/tests/auto/render/qtexturedataupdate/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qtexturedataupdate.pro. ##################################################################### ## tst_qtexturedataupdate Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qtexturedataupdate LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qtexturedataupdate SOURCES tst_qtexturedataupdate.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qtexturedataupdate/qtexturedataupdate.pro b/tests/auto/render/qtexturedataupdate/qtexturedataupdate.pro deleted file mode 100644 index 89a076523..000000000 --- a/tests/auto/render/qtexturedataupdate/qtexturedataupdate.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qtexturedataupdate - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qtexturedataupdate.cpp - diff --git a/tests/auto/render/qtexturedataupdate/tst_qtexturedataupdate.cpp b/tests/auto/render/qtexturedataupdate/tst_qtexturedataupdate.cpp index 3a8432d2e..be978dd8b 100644 --- a/tests/auto/render/qtexturedataupdate/tst_qtexturedataupdate.cpp +++ b/tests/auto/render/qtexturedataupdate/tst_qtexturedataupdate.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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) 2019 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qtexturedataupdate.h> diff --git a/tests/auto/render/qtextureimage/CMakeLists.txt b/tests/auto/render/qtextureimage/CMakeLists.txt index 7769fe076..f7a6995e2 100644 --- a/tests/auto/render/qtextureimage/CMakeLists.txt +++ b/tests/auto/render/qtextureimage/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qtextureimage.pro. ##################################################################### ## tst_qtextureimage Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qtextureimage LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qtextureimage SOURCES tst_qtextureimage.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qtextureimage/qtextureimage.pro b/tests/auto/render/qtextureimage/qtextureimage.pro deleted file mode 100644 index 9f556e41b..000000000 --- a/tests/auto/render/qtextureimage/qtextureimage.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qtextureimage - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qtextureimage.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qtextureimage/tst_qtextureimage.cpp b/tests/auto/render/qtextureimage/tst_qtextureimage.cpp index 9b2c75fb3..e10587a40 100644 --- a/tests/auto/render/qtextureimage/tst_qtextureimage.cpp +++ b/tests/auto/render/qtextureimage/tst_qtextureimage.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> @@ -68,7 +43,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(textureImage.source(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -76,7 +51,7 @@ private Q_SLOTS: // THEN QCOMPARE(textureImage.source(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -87,7 +62,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(textureImage.isMirrored(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -95,7 +70,7 @@ private Q_SLOTS: // THEN QCOMPARE(textureImage.isMirrored(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qtextureimagedata/CMakeLists.txt b/tests/auto/render/qtextureimagedata/CMakeLists.txt index 3f0be8b45..32bfe1402 100644 --- a/tests/auto/render/qtextureimagedata/CMakeLists.txt +++ b/tests/auto/render/qtextureimagedata/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qtextureimagedata.pro. ##################################################################### ## tst_qtextureimagedata Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qtextureimagedata LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qtextureimagedata SOURCES tst_qtextureimagedata.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qtextureimagedata/qtextureimagedata.pro b/tests/auto/render/qtextureimagedata/qtextureimagedata.pro deleted file mode 100644 index b734db9d1..000000000 --- a/tests/auto/render/qtextureimagedata/qtextureimagedata.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qtextureimagedata -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qtextureimagedata.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qtextureimagedata/tst_qtextureimagedata.cpp b/tests/auto/render/qtextureimagedata/tst_qtextureimagedata.cpp index 82b54e185..d21b8ceb7 100644 --- a/tests/auto/render/qtextureimagedata/tst_qtextureimagedata.cpp +++ b/tests/auto/render/qtextureimagedata/tst_qtextureimagedata.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/qtextureloader/CMakeLists.txt b/tests/auto/render/qtextureloader/CMakeLists.txt index d8f3eaf9d..35f4ebfc5 100644 --- a/tests/auto/render/qtextureloader/CMakeLists.txt +++ b/tests/auto/render/qtextureloader/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qtextureloader.pro. ##################################################################### ## tst_qtextureloader Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qtextureloader LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qtextureloader SOURCES tst_qtextureloader.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qtextureloader/qtextureloader.pro b/tests/auto/render/qtextureloader/qtextureloader.pro deleted file mode 100644 index 089a2c61a..000000000 --- a/tests/auto/render/qtextureloader/qtextureloader.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qtextureloader - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qtextureloader.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qtextureloader/tst_qtextureloader.cpp b/tests/auto/render/qtextureloader/tst_qtextureloader.cpp index 78c9a15a8..a2c58debc 100644 --- a/tests/auto/render/qtextureloader/tst_qtextureloader.cpp +++ b/tests/auto/render/qtextureloader/tst_qtextureloader.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> @@ -74,7 +49,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(textureLoader.source(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -82,7 +57,7 @@ private Q_SLOTS: // THEN QCOMPARE(textureLoader.source(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -93,7 +68,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(textureLoader.isMirrored(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -101,7 +76,7 @@ private Q_SLOTS: // THEN QCOMPARE(textureLoader.isMirrored(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qviewport/CMakeLists.txt b/tests/auto/render/qviewport/CMakeLists.txt index 527ee817a..40609c7c3 100644 --- a/tests/auto/render/qviewport/CMakeLists.txt +++ b/tests/auto/render/qviewport/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qviewport.pro. ##################################################################### ## tst_qviewport Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qviewport LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qviewport SOURCES tst_qviewport.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qviewport/qviewport.pro b/tests/auto/render/qviewport/qviewport.pro deleted file mode 100644 index bc9931741..000000000 --- a/tests/auto/render/qviewport/qviewport.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qviewport - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qviewport.cpp - -include(../../core/common/common.pri) diff --git a/tests/auto/render/qviewport/tst_qviewport.cpp b/tests/auto/render/qviewport/tst_qviewport.cpp index 287894c22..13cb4c91b 100644 --- a/tests/auto/render/qviewport/tst_qviewport.cpp +++ b/tests/auto/render/qviewport/tst_qviewport.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 #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qwaitfence/CMakeLists.txt b/tests/auto/render/qwaitfence/CMakeLists.txt index 001388b92..bff569c93 100644 --- a/tests/auto/render/qwaitfence/CMakeLists.txt +++ b/tests/auto/render/qwaitfence/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qwaitfence.pro. ##################################################################### ## tst_qwaitfence Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qwaitfence LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qwaitfence SOURCES tst_qwaitfence.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/qwaitfence/qwaitfence.pro b/tests/auto/render/qwaitfence/qwaitfence.pro deleted file mode 100644 index 18ac21088..000000000 --- a/tests/auto/render/qwaitfence/qwaitfence.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qwaitfence - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_qwaitfence.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/qwaitfence/tst_qwaitfence.cpp b/tests/auto/render/qwaitfence/tst_qwaitfence.cpp index 4c842c2cc..535513f57 100644 --- a/tests/auto/render/qwaitfence/tst_qwaitfence.cpp +++ b/tests/auto/render/qwaitfence/tst_qwaitfence.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -82,7 +46,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(waitFence.handleType(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -90,7 +54,7 @@ private Q_SLOTS: // THEN QCOMPARE(waitFence.handleType(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -101,7 +65,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(waitFence.handle(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -109,7 +73,7 @@ private Q_SLOTS: // THEN QCOMPARE(waitFence.handle(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -120,7 +84,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(waitFence.waitOnCPU(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -128,7 +92,7 @@ private Q_SLOTS: // THEN QCOMPARE(waitFence.waitOnCPU(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -139,7 +103,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(waitFence.timeout(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -147,7 +111,7 @@ private Q_SLOTS: // THEN QCOMPARE(waitFence.timeout(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/raycaster/CMakeLists.txt b/tests/auto/render/raycaster/CMakeLists.txt index 7a955c9b0..16a30fad5 100644 --- a/tests/auto/render/raycaster/CMakeLists.txt +++ b/tests/auto/render/raycaster/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from raycaster.pro. ##################################################################### ## raycaster Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_raycaster LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_raycaster SOURCES tst_raycaster.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/raycaster/raycaster.pro b/tests/auto/render/raycaster/raycaster.pro deleted file mode 100644 index 798cc9705..000000000 --- a/tests/auto/render/raycaster/raycaster.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = raycaster - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_raycaster.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/raycaster/tst_raycaster.cpp b/tests/auto/render/raycaster/tst_raycaster.cpp index 593852c65..c0a057216 100644 --- a/tests/auto/render/raycaster/tst_raycaster.cpp +++ b/tests/auto/render/raycaster/tst_raycaster.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/raycasting/CMakeLists.txt b/tests/auto/render/raycasting/CMakeLists.txt index 20a39de93..fbde0ee9d 100644 --- a/tests/auto/render/raycasting/CMakeLists.txt +++ b/tests/auto/render/raycasting/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from raycasting.pro. ##################################################################### ## tst_raycasting Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_raycasting LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_raycasting SOURCES tst_raycasting.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/raycasting/raycasting.pro b/tests/auto/render/raycasting/raycasting.pro deleted file mode 100644 index 9eb5db48f..000000000 --- a/tests/auto/render/raycasting/raycasting.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app - -TARGET = tst_raycasting - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_raycasting.cpp diff --git a/tests/auto/render/raycasting/tst_raycasting.cpp b/tests/auto/render/raycasting/tst_raycasting.cpp index 22e516c44..30f2ef61e 100644 --- a/tests/auto/render/raycasting/tst_raycasting.cpp +++ b/tests/auto/render/raycasting/tst_raycasting.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 #include <QtTest/QTest> #include <Qt3DRender/private/entity_p.h> @@ -49,6 +24,7 @@ public: ~tst_RayCasting() {} private Q_SLOTS: + void initTestCase(); void shouldReturnValidHandle(); void shouldReturnResultForEachHandle(); void shouldReturnAllResults(); @@ -66,6 +42,13 @@ private: QList<Sphere> boundingVolumes; }; +void tst_RayCasting::initTestCase() +{ +#if defined Q_OS_QNX + QSKIP("This test times out on QNX (QTBUG-107694)"); +#endif +} + void tst_RayCasting::shouldIntersect_data() { QTest::addColumn<QRay3D>("ray"); @@ -186,7 +169,7 @@ void tst_RayCasting::shouldReturnAllResults() // THEN bool expectedHandlesFound = true; - for (QQueryHandle expected : qAsConst(handles)) { + for (QQueryHandle expected : std::as_const(handles)) { bool found = false; for (QCollisionQueryResult result : results) { if (result.handle() == expected) diff --git a/tests/auto/render/raycastingjob/CMakeLists.txt b/tests/auto/render/raycastingjob/CMakeLists.txt index 39a32da1f..5bbd5e326 100644 --- a/tests/auto/render/raycastingjob/CMakeLists.txt +++ b/tests/auto/render/raycastingjob/CMakeLists.txt @@ -1,16 +1,25 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from raycastingjob.pro. ##################################################################### ## tst_raycastingjob Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_raycastingjob LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_raycastingjob SOURCES ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_raycastingjob.cpp INCLUDE_DIRECTORIES ../qmlscenereader - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DExtras diff --git a/tests/auto/render/raycastingjob/raycastingjob.pro b/tests/auto/render/raycastingjob/raycastingjob.pro deleted file mode 100644 index 174de7fdc..000000000 --- a/tests/auto/render/raycastingjob/raycastingjob.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app - -TARGET = tst_raycastingjob -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_raycastingjob.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 += \ - raycastingjob.qrc diff --git a/tests/auto/render/raycastingjob/testscene_screenraycasting.qml b/tests/auto/render/raycastingjob/testscene_screenraycasting.qml index 47221aec8..1aa2f3254 100644 --- a/tests/auto/render/raycastingjob/testscene_screenraycasting.qml +++ b/tests/auto/render/raycastingjob/testscene_screenraycasting.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQml 2.14 import Qt3D.Core 2.14 diff --git a/tests/auto/render/raycastingjob/testscene_worldraycasting.qml b/tests/auto/render/raycastingjob/testscene_worldraycasting.qml index cdb6b9234..dc5bf9a55 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycasting.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycasting.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQml 2.14 import Qt3D.Core 2.14 diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml b/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml index efcc31e8f..22a3e1337 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQml 2.14 import Qt3D.Core 2.14 diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml index 5c6170ae6..3fb376200 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQml 2.14 import Qt3D.Core 2.14 diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml b/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml index 99ca26d6f..402044821 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQml 2.14 import Qt3D.Core 2.14 diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp index 72746b219..37d415299 100644 --- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp +++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qmlscenereader.h" #include "testarbiter.h" @@ -287,7 +262,7 @@ private Q_SLOTS: Qt3DCore::QComponentVector rootComponents = root->components(); Qt3DRender::QRayCaster *rayCaster = nullptr; - for (Qt3DCore::QComponent *c: qAsConst(rootComponents)) { + for (Qt3DCore::QComponent *c: std::as_const(rootComponents)) { rayCaster = qobject_cast<Qt3DRender::QRayCaster *>(c); if (rayCaster) break; @@ -319,7 +294,7 @@ private Q_SLOTS: QVERIFY(!rayCaster->isEnabled()); auto dirtyNodes = test->arbiter()->takeDirtyFrontEndNodes(); qDebug() << dirtyNodes; - QCOMPARE(dirtyNodes.count(), 1); // hits & disable + QCOMPARE(dirtyNodes.size(), 1); // hits & disable QCOMPARE(rayCaster->hits().size(), numIntersections); if (numIntersections) @@ -350,7 +325,7 @@ private Q_SLOTS: Qt3DCore::QComponentVector rootComponents = root->components(); Qt3DRender::QScreenRayCaster *rayCaster = nullptr; - for (Qt3DCore::QComponent *c: qAsConst(rootComponents)) { + for (Qt3DCore::QComponent *c: std::as_const(rootComponents)) { rayCaster = qobject_cast<Qt3DRender::QScreenRayCaster *>(c); if (rayCaster) break; @@ -381,7 +356,7 @@ private Q_SLOTS: QVERIFY(!backendRayCaster->isEnabled()); QVERIFY(!rayCaster->isEnabled()); auto dirtyNodes = test->arbiter()->takeDirtyFrontEndNodes(); - QCOMPARE(dirtyNodes.count(), 1); // hits & disable + QCOMPARE(dirtyNodes.size(), 1); // hits & disable QCOMPARE(rayCaster->hits().size(), numIntersections); if (numIntersections) diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro deleted file mode 100644 index b7381b9f3..000000000 --- a/tests/auto/render/render.pro +++ /dev/null @@ -1,163 +0,0 @@ -TEMPLATE = subdirs - -qtConfig(private_tests) { - SUBDIRS += \ - armature \ - aspect \ - attribute \ - blitframebuffer \ - buffer \ - computecommand \ - coordinatereader \ - ddstextures \ - effect \ - entity \ - filterentitybycomponent \ - filterkey \ - framegraphnode \ - framegraphvisitor \ - genericlambdajob \ - geometry \ - geometryrenderer \ - joint \ - ktxtextures \ - layerfiltering \ - levelofdetail \ - loadscenejob \ - material \ - memorybarrier \ - meshfunctors \ - objectpicker \ - parameter \ - proximityfilter \ - proximityfiltering \ - qabstractlight \ - qabstracttexture \ - qabstracttextureimage \ - qattribute \ - qblitframebuffer \ - qbuffer \ - qcamera \ - qcameralens \ - qcameraselector \ - qclearbuffers \ - qcomputecommand \ - qdispatchcompute \ - qeffect \ - qenvironmentlight \ - qfilterkey \ - qframegraphnode \ - qgeometry \ - qgeometryrenderer \ - qgraphicsapifilter \ - qlayerfilter \ - qlevelofdetail \ - qmemorybarrier \ - qmesh \ - qobjectpicker \ - qparameter \ - qproximityfilter \ - qraycaster \ - qrendercapture \ - qrenderpass \ - qrenderpassfilter \ - qrendersettings \ - qrenderstate \ - qrenderstateset \ - qrendersurfaceselector \ - qrendertarget \ - qrendertargetoutput \ - qrendertargetselector \ - qsceneloader \ - qscreenraycaster \ - qsetfence \ - qshaderimage \ - qshaderprogram \ - qshaderprogrambuilder \ - qsharedgltexture \ - qsortpolicy \ - qtechnique \ - qtechniquefilter \ - qtexturedataupdate \ - qtextureimage \ - qtextureimagedata \ - qtextureloader \ - qviewport \ - qwaitfence \ - raycaster \ - rendercapture \ - renderpass \ - rendertarget \ - sceneloader \ - segmentvisitor \ - setfence \ - shader \ - shaderbuilder \ - shadergraph \ - shaderimage \ - skeleton \ - sortpolicy \ - technique \ - texture \ - transform \ - trianglevisitor \ - uniform \ - vsyncframeadvanceservice \ - waitfence - - QT_FOR_CONFIG = 3dcore-private - # TO DO: These could be restored to be executed in all cases - # when aligned-malloc.pri becomes part of the test framework - !qtConfig(qt3d-simd-avx2): { - SUBDIRS += \ - qray3d \ - raycasting \ - triangleboundingvolume \ - } - - qtHaveModule(quick) { - SUBDIRS += \ - raycastingjob - } -} - -# Tests related to the OpenGL renderer -QT_FOR_CONFIG += 3drender-private - -qtConfig(qt3d-opengl-renderer):qtConfig(private_tests) { - - SUBDIRS += \ - opengl - - qtConfig(qt3d-extras) { - qtHaveModule(quick) { - SUBDIRS += \ - boundingsphere \ - pickboundingvolumejob \ - updateshaderdatatransformjob - } - - SUBDIRS += \ - qmaterial \ - geometryloaders \ - picking \ - gltfplugins - } - - qtConfig(qt3d-input) { - qtHaveModule(quick) { - SUBDIRS += \ - qscene2d \ - scene2d - } - } - - qtConfig(qt3d-simd-avx2): SUBDIRS += alignedresourcesmanagers-avx - qtConfig(qt3d-simd-sse2):!qtConfig(qt3d-simd-avx2): SUBDIRS += alignedresourcesmanagers-sse -} - -qtConfig(qt3d-rhi-renderer):qtConfig(private_tests):qtHaveModule(shadertools) { - - SUBDIRS += \ - rhi -} diff --git a/tests/auto/render/rendercapture/CMakeLists.txt b/tests/auto/render/rendercapture/CMakeLists.txt index 51c7dcb27..71a3346ed 100644 --- a/tests/auto/render/rendercapture/CMakeLists.txt +++ b/tests/auto/render/rendercapture/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from rendercapture.pro. ##################################################################### ## rendercapture Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_rendercapture LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_rendercapture SOURCES tst_rendercapture.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/rendercapture/rendercapture.pro b/tests/auto/render/rendercapture/rendercapture.pro deleted file mode 100644 index 419e15af0..000000000 --- a/tests/auto/render/rendercapture/rendercapture.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = rendercapture - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_rendercapture.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/rendercapture/tst_rendercapture.cpp b/tests/auto/render/rendercapture/tst_rendercapture.cpp index 272d49e13..550aae03f 100644 --- a/tests/auto/render/rendercapture/tst_rendercapture.cpp +++ b/tests/auto/render/rendercapture/tst_rendercapture.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/renderpass/CMakeLists.txt b/tests/auto/render/renderpass/CMakeLists.txt index 29bc40065..b0f785015 100644 --- a/tests/auto/render/renderpass/CMakeLists.txt +++ b/tests/auto/render/renderpass/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from renderpass.pro. ##################################################################### ## tst_renderpass Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_renderpass LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_renderpass SOURCES tst_renderpass.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/renderpass/renderpass.pro b/tests/auto/render/renderpass/renderpass.pro deleted file mode 100644 index 00d9b6bd5..000000000 --- a/tests/auto/render/renderpass/renderpass.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_renderpass - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_renderpass.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp index 7711de7d2..3c3f29fe3 100644 --- a/tests/auto/render/renderpass/tst_renderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.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 #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/rendertarget/CMakeLists.txt b/tests/auto/render/rendertarget/CMakeLists.txt index a714058dd..6f9856ece 100644 --- a/tests/auto/render/rendertarget/CMakeLists.txt +++ b/tests/auto/render/rendertarget/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from rendertarget.pro. ##################################################################### ## tst_rendertarget Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_rendertarget LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_rendertarget SOURCES tst_rendertarget.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/rendertarget/rendertarget.pro b/tests/auto/render/rendertarget/rendertarget.pro deleted file mode 100644 index 29eaf8b3a..000000000 --- a/tests/auto/render/rendertarget/rendertarget.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_rendertarget - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_rendertarget.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/rendertarget/tst_rendertarget.cpp b/tests/auto/render/rendertarget/tst_rendertarget.cpp index 5393abcf7..16bb10b66 100644 --- a/tests/auto/render/rendertarget/tst_rendertarget.cpp +++ b/tests/auto/render/rendertarget/tst_rendertarget.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/rhi/CMakeLists.txt b/tests/auto/render/rhi/CMakeLists.txt index 5c3043bbe..d7be2862c 100644 --- a/tests/auto/render/rhi/CMakeLists.txt +++ b/tests/auto/render/rhi/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from rhi.pro. if (NOT QT_BUILD_STANDALONE_TESTS) diff --git a/tests/auto/render/rhi/rhi.pro b/tests/auto/render/rhi/rhi.pro deleted file mode 100644 index 9391c8ce0..000000000 --- a/tests/auto/render/rhi/rhi.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += \ - rhi_renderviews \ - rhi_rendercommands \ - rhi_graphicspipelinemanager diff --git a/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt b/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt index a421a40b0..a9fb75aba 100644 --- a/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt @@ -1,9 +1,18 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from rhi_graphicspipelinemanager.pro. ##################################################################### ## tst_rhi_graphicspipelinemanager Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_rhi_graphicspipelinemanager LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_rhi_graphicspipelinemanager SOURCES tst_rhi_graphicspipelinemanager.cpp diff --git a/tests/auto/render/rhi/rhi_graphicspipelinemanager/rhi_graphicspipelinemanager.pro b/tests/auto/render/rhi/rhi_graphicspipelinemanager/rhi_graphicspipelinemanager.pro deleted file mode 100644 index 33d26fed8..000000000 --- a/tests/auto/render/rhi/rhi_graphicspipelinemanager/rhi_graphicspipelinemanager.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_rhi_rendercommands - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_rhi_rendercommands.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against RHI Renderer Plugin -include(../rhi_render_plugin.pri) diff --git a/tests/auto/render/rhi/rhi_graphicspipelinemanager/tst_rhi_graphicspipelinemanager.cpp b/tests/auto/render/rhi/rhi_graphicspipelinemanager/tst_rhi_graphicspipelinemanager.cpp index 3959fdad3..ce83fcaeb 100644 --- a/tests/auto/render/rhi/rhi_graphicspipelinemanager/tst_rhi_graphicspipelinemanager.cpp +++ b/tests/auto/render/rhi/rhi_graphicspipelinemanager/tst_rhi_graphicspipelinemanager.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/rhi/rhi_render_plugin.pri b/tests/auto/render/rhi/rhi_render_plugin.pri deleted file mode 100644 index 0e55ef886..000000000 --- a/tests/auto/render/rhi/rhi_render_plugin.pri +++ /dev/null @@ -1,5 +0,0 @@ -# Found no way of having the test runner include the correct -# library path as runtime - -# Instead we link against the sources directly -include(../../../../src/plugins/renderers/rhi/rhi.pri) diff --git a/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt b/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt index 1b5581f86..6a4a424c4 100644 --- a/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt @@ -1,9 +1,18 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from rhi_rendercommands.pro. ##################################################################### ## tst_rhi_rendercommands Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_rhi_rendercommands LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_rhi_rendercommands SOURCES tst_rhi_rendercommands.cpp diff --git a/tests/auto/render/rhi/rhi_rendercommands/rhi_rendercommands.pro b/tests/auto/render/rhi/rhi_rendercommands/rhi_rendercommands.pro deleted file mode 100644 index 33d26fed8..000000000 --- a/tests/auto/render/rhi/rhi_rendercommands/rhi_rendercommands.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_rhi_rendercommands - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_rhi_rendercommands.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against RHI Renderer Plugin -include(../rhi_render_plugin.pri) diff --git a/tests/auto/render/rhi/rhi_rendercommands/tst_rhi_rendercommands.cpp b/tests/auto/render/rhi/rhi_rendercommands/tst_rhi_rendercommands.cpp index 37bf3d5a1..7e93d0514 100644 --- a/tests/auto/render/rhi/rhi_rendercommands/tst_rhi_rendercommands.cpp +++ b/tests/auto/render/rhi/rhi_rendercommands/tst_rhi_rendercommands.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt b/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt index 58945c04c..e6d2e8f72 100644 --- a/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt @@ -1,9 +1,18 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from rhi_renderviews.pro. ##################################################################### ## tst_rhi_renderviews Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_rhi_renderviews LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_rhi_renderviews SOURCES tst_rhi_renderviews.cpp diff --git a/tests/auto/render/rhi/rhi_renderviews/rhi_renderviews.pro b/tests/auto/render/rhi/rhi_renderviews/rhi_renderviews.pro deleted file mode 100644 index 5f5d749f5..000000000 --- a/tests/auto/render/rhi/rhi_renderviews/rhi_renderviews.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_rhi_renderviews - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_rhi_renderviews.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against RHI Renderer Plugin -include(../rhi_render_plugin.pri) diff --git a/tests/auto/render/rhi/rhi_renderviews/tst_rhi_renderviews.cpp b/tests/auto/render/rhi/rhi_renderviews/tst_rhi_renderviews.cpp index 01e37ebac..788492d99 100644 --- a/tests/auto/render/rhi/rhi_renderviews/tst_rhi_renderviews.cpp +++ b/tests/auto/render/rhi/rhi_renderviews/tst_rhi_renderviews.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/scene2d/CMakeLists.txt b/tests/auto/render/scene2d/CMakeLists.txt index db8d99280..0dd1058b6 100644 --- a/tests/auto/render/scene2d/CMakeLists.txt +++ b/tests/auto/render/scene2d/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from scene2d.pro. ##################################################################### ## tst_scene2d Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_scene2d LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_scene2d SOURCES tst_scene2d.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DQuickScene2D diff --git a/tests/auto/render/scene2d/scene2d.pro b/tests/auto/render/scene2d/scene2d.pro deleted file mode 100644 index aacdea3e4..000000000 --- a/tests/auto/render/scene2d/scene2d.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_scene2d - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib 3dquickscene2d 3dquickscene2d-private - -CONFIG += testcase - -SOURCES += tst_scene2d.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/scene2d/tst_scene2d.cpp b/tests/auto/render/scene2d/tst_scene2d.cpp index a71d2f54a..95f30ad9a 100644 --- a/tests/auto/render/scene2d/tst_scene2d.cpp +++ b/tests/auto/render/scene2d/tst_scene2d.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** 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) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DQuickScene2D/qscene2d.h> @@ -67,11 +42,7 @@ public: e->type() <= QEvent::MouseMove) { QMouseEvent *me = static_cast<QMouseEvent *>(e); m_eventTypes.push_back(e->type()); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) m_mousePoints.push_back(me->position()); -#else - m_mousePoints.push_back(me->pos()); -#endif } return QQuickWindow::event(e); } diff --git a/tests/auto/render/sceneloader/CMakeLists.txt b/tests/auto/render/sceneloader/CMakeLists.txt index d93682014..5605978bb 100644 --- a/tests/auto/render/sceneloader/CMakeLists.txt +++ b/tests/auto/render/sceneloader/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from sceneloader.pro. ##################################################################### ## tst_sceneloader Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_sceneloader LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_sceneloader SOURCES tst_sceneloader.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/sceneloader/sceneloader.pro b/tests/auto/render/sceneloader/sceneloader.pro deleted file mode 100644 index 0ea616545..000000000 --- a/tests/auto/render/sceneloader/sceneloader.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_sceneloader - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_sceneloader.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/sceneloader/tst_sceneloader.cpp b/tests/auto/render/sceneloader/tst_sceneloader.cpp index b7bd8e1e6..3ff477520 100644 --- a/tests/auto/render/sceneloader/tst_sceneloader.cpp +++ b/tests/auto/render/sceneloader/tst_sceneloader.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 #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/segmentvisitor/CMakeLists.txt b/tests/auto/render/segmentvisitor/CMakeLists.txt index 5d8cb224e..19c4f3c0f 100644 --- a/tests/auto/render/segmentvisitor/CMakeLists.txt +++ b/tests/auto/render/segmentvisitor/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from segmentvisitor.pro. ##################################################################### ## segmentvisitor Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_segmentvisitor LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_segmentvisitor SOURCES tst_segmentvisitor.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/segmentvisitor/segmentvisitor.pro b/tests/auto/render/segmentvisitor/segmentvisitor.pro deleted file mode 100644 index 2f650aa0b..000000000 --- a/tests/auto/render/segmentvisitor/segmentvisitor.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = segmentvisitor - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_segmentvisitor.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/segmentvisitor/tst_segmentvisitor.cpp b/tests/auto/render/segmentvisitor/tst_segmentvisitor.cpp index 729121f26..c10f4657d 100644 --- a/tests/auto/render/segmentvisitor/tst_segmentvisitor.cpp +++ b/tests/auto/render/segmentvisitor/tst_segmentvisitor.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/setfence/CMakeLists.txt b/tests/auto/render/setfence/CMakeLists.txt index 013d6b5b0..04f3f3f2c 100644 --- a/tests/auto/render/setfence/CMakeLists.txt +++ b/tests/auto/render/setfence/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from setfence.pro. ##################################################################### ## tst_setfence Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_setfence LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_setfence SOURCES tst_setfence.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/setfence/setfence.pro b/tests/auto/render/setfence/setfence.pro deleted file mode 100644 index 5e9793c36..000000000 --- a/tests/auto/render/setfence/setfence.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_setfence - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_setfence.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/setfence/tst_setfence.cpp b/tests/auto/render/setfence/tst_setfence.cpp index d7ef930ca..786edb566 100644 --- a/tests/auto/render/setfence/tst_setfence.cpp +++ b/tests/auto/render/setfence/tst_setfence.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qsetfence.h> diff --git a/tests/auto/render/shader/CMakeLists.txt b/tests/auto/render/shader/CMakeLists.txt index 7b103142f..45f7bb828 100644 --- a/tests/auto/render/shader/CMakeLists.txt +++ b/tests/auto/render/shader/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from shader.pro. ##################################################################### ## tst_shader Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_shader LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_shader SOURCES tst_shader.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/shader/shader.pro b/tests/auto/render/shader/shader.pro deleted file mode 100644 index 6e8a8ec2e..000000000 --- a/tests/auto/render/shader/shader.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_shader - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_shader.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/shader/tst_shader.cpp b/tests/auto/render/shader/tst_shader.cpp index f94d71fa6..e2a9dc4d5 100644 --- a/tests/auto/render/shader/tst_shader.cpp +++ b/tests/auto/render/shader/tst_shader.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 #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/shaderbuilder/CMakeLists.txt b/tests/auto/render/shaderbuilder/CMakeLists.txt index bcdf36f06..1e51143d0 100644 --- a/tests/auto/render/shaderbuilder/CMakeLists.txt +++ b/tests/auto/render/shaderbuilder/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from shaderbuilder.pro. ##################################################################### ## tst_shaderbuilder Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_shaderbuilder LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_shaderbuilder SOURCES tst_shaderbuilder.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/shaderbuilder/shaderbuilder.pro b/tests/auto/render/shaderbuilder/shaderbuilder.pro deleted file mode 100644 index bd5f7dfe2..000000000 --- a/tests/auto/render/shaderbuilder/shaderbuilder.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_shaderbuilder - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_shaderbuilder.cpp -RESOURCES += shaderbuilder.qrc - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp index 3e3fdd4f9..40c0ff5b8 100644 --- a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp +++ b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> @@ -647,10 +622,10 @@ private slots: b.generateCode(Qt3DRender::QShaderProgram::Vertex); // THEN - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1); hashKey = b.hashKeyForShaderGraph(Qt3DRender::QShaderProgram::Vertex); - QCOMPARE(hashKey.length(), 40); + QCOMPARE(hashKey.size(), 40); QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).first(), QString::fromUtf8(hashKey) + QLatin1String(".qt3d")); @@ -664,7 +639,7 @@ private slots: b.generateCode(Qt3DRender::QShaderProgram::Vertex); // THEN - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1); QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).first(), QString::fromUtf8(hashKey) + QLatin1String(".qt3d")); } @@ -678,7 +653,7 @@ private slots: QByteArray gl2HashKey = b.hashKeyForShaderGraph(Qt3DRender::QShaderProgram::Vertex); // THEN - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 2); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 2); QVERIFY(gl2HashKey != hashKey); } } @@ -716,10 +691,10 @@ private slots: b.generateCode(Qt3DRender::QShaderProgram::Vertex); // THEN - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1); const QByteArray hashKey = b.hashKeyForShaderGraph(Qt3DRender::QShaderProgram::Vertex); - QCOMPARE(hashKey.length(), 40); + QCOMPARE(hashKey.size(), 40); QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).first(), QString::fromUtf8(hashKey) + QLatin1String(".qt3d")); @@ -765,7 +740,7 @@ private slots: b.generateCode(Qt3DRender::QShaderProgram::Vertex); // THEN - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 0); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 0); } void checkForceRebuildCache() @@ -801,7 +776,7 @@ private slots: b.generateCode(Qt3DRender::QShaderProgram::Vertex); // THEN -> We have rebuilt the shader file (even if we don't use it) - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1); } }; diff --git a/tests/auto/render/shadergraph/CMakeLists.txt b/tests/auto/render/shadergraph/CMakeLists.txt index 36789d1ec..d72d200e0 100644 --- a/tests/auto/render/shadergraph/CMakeLists.txt +++ b/tests/auto/render/shadergraph/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from shadergraph.pro. if(QT_FEATURE_private_tests) diff --git a/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt index b3c003f74..c3d1e1897 100644 --- a/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt @@ -1,15 +1,24 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qshadergenerator.pro. ##################################################################### ## tst_qshadergenerator Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qt3d_qshadergenerator LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # special case begin qt_internal_add_test(tst_qt3d_qshadergenerator # special case end SOURCES tst_qshadergenerator.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DRenderPrivate Qt::Gui ) diff --git a/tests/auto/render/shadergraph/qshadergenerator/qshadergenerator.pro b/tests/auto/render/shadergraph/qshadergenerator/qshadergenerator.pro deleted file mode 100644 index edd0be9eb..000000000 --- a/tests/auto/render/shadergraph/qshadergenerator/qshadergenerator.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -QT += testlib 3drender-private - -SOURCES += tst_qshadergenerator.cpp -TARGET = tst_qshadergenerator diff --git a/tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.cpp b/tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.cpp index 86aab00f9..aae4066a3 100644 --- a/tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.cpp +++ b/tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt index 31bf69fca..dd0d13872 100644 --- a/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt @@ -1,15 +1,24 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qshadergraph.pro. ##################################################################### ## tst_qshadergraph Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qt3d_qshadergraph LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # special case begin qt_internal_add_test(tst_qt3d_qshadergraph # special case end SOURCES tst_qshadergraph.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DRenderPrivate Qt::Gui ) diff --git a/tests/auto/render/shadergraph/qshadergraph/qshadergraph.pro b/tests/auto/render/shadergraph/qshadergraph/qshadergraph.pro deleted file mode 100644 index 2348ccb24..000000000 --- a/tests/auto/render/shadergraph/qshadergraph/qshadergraph.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -QT += testlib 3drender-private - -SOURCES += tst_qshadergraph.cpp -TARGET = tst_qshadergraph diff --git a/tests/auto/render/shadergraph/qshadergraph/tst_qshadergraph.cpp b/tests/auto/render/shadergraph/qshadergraph/tst_qshadergraph.cpp index 32f297653..6cb1a9fdd 100644 --- a/tests/auto/render/shadergraph/qshadergraph/tst_qshadergraph.cpp +++ b/tests/auto/render/shadergraph/qshadergraph/tst_qshadergraph.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt index 138194b67..780da9794 100644 --- a/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt @@ -1,15 +1,24 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qshadergraphloader.pro. ##################################################################### ## tst_qshadergraphloader Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qt3d_qshadergraphloader LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # special case begin qt_internal_add_test(tst_qt3d_qshadergraphloader # special case end SOURCES tst_qshadergraphloader.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DRenderPrivate Qt::Gui ) diff --git a/tests/auto/render/shadergraph/qshadergraphloader/qshadergraphloader.pro b/tests/auto/render/shadergraph/qshadergraphloader/qshadergraphloader.pro deleted file mode 100644 index 754f801e0..000000000 --- a/tests/auto/render/shadergraph/qshadergraphloader/qshadergraphloader.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -QT += testlib 3drender-private - -SOURCES += tst_qshadergraphloader.cpp -TARGET = tst_qshadergraphloader diff --git a/tests/auto/render/shadergraph/qshadergraphloader/tst_qshadergraphloader.cpp b/tests/auto/render/shadergraph/qshadergraphloader/tst_qshadergraphloader.cpp index e8510697f..2545226c3 100644 --- a/tests/auto/render/shadergraph/qshadergraphloader/tst_qshadergraphloader.cpp +++ b/tests/auto/render/shadergraph/qshadergraphloader/tst_qshadergraphloader.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt b/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt index f08e1f113..42ad45ee7 100644 --- a/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt @@ -1,15 +1,24 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qshadernodes.pro. ##################################################################### ## tst_qshadernodes Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qt3d_qshadernodes LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # special case begin qt_internal_add_test(tst_qt3d_qshadernodes # special case end SOURCES tst_qshadernodes.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DRenderPrivate Qt::Gui ) diff --git a/tests/auto/render/shadergraph/qshadernodes/qshadernodes.pro b/tests/auto/render/shadergraph/qshadernodes/qshadernodes.pro deleted file mode 100644 index 754cde9e1..000000000 --- a/tests/auto/render/shadergraph/qshadernodes/qshadernodes.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -QT += testlib 3drender-private - -SOURCES += tst_qshadernodes.cpp -TARGET = tst_qshadernodes diff --git a/tests/auto/render/shadergraph/qshadernodes/tst_qshadernodes.cpp b/tests/auto/render/shadergraph/qshadernodes/tst_qshadernodes.cpp index 6409b7136..28ecde1e1 100644 --- a/tests/auto/render/shadergraph/qshadernodes/tst_qshadernodes.cpp +++ b/tests/auto/render/shadergraph/qshadernodes/tst_qshadernodes.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt b/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt index 821af44ae..87634a423 100644 --- a/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt @@ -1,15 +1,24 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qshadernodesloader.pro. ##################################################################### ## tst_qshadernodesloader Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qt3d_qshadernodesloader LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + #special case begin qt_internal_add_test(tst_qt3d_qshadernodesloader #special case end SOURCES tst_qshadernodesloader.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DRenderPrivate Qt::Gui ) diff --git a/tests/auto/render/shadergraph/qshadernodesloader/qshadernodesloader.pro b/tests/auto/render/shadergraph/qshadernodesloader/qshadernodesloader.pro deleted file mode 100644 index 7da336b5e..000000000 --- a/tests/auto/render/shadergraph/qshadernodesloader/qshadernodesloader.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -QT += testlib 3drender-private - -SOURCES += tst_qshadernodesloader.cpp -TARGET = tst_qshadernodesloader diff --git a/tests/auto/render/shadergraph/qshadernodesloader/tst_qshadernodesloader.cpp b/tests/auto/render/shadergraph/qshadernodesloader/tst_qshadernodesloader.cpp index 24c6305a8..4d61c9c6e 100644 --- a/tests/auto/render/shadergraph/qshadernodesloader/tst_qshadernodesloader.cpp +++ b/tests/auto/render/shadergraph/qshadernodesloader/tst_qshadernodesloader.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/shadergraph/shadergraph.pro b/tests/auto/render/shadergraph/shadergraph.pro deleted file mode 100644 index 653a9a694..000000000 --- a/tests/auto/render/shadergraph/shadergraph.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = subdirs - -qtConfig(private_tests) { - SUBDIRS += \ - qshadergenerator \ - qshadergraph \ - qshadergraphloader \ - qshadernodes \ - qshadernodesloader -} diff --git a/tests/auto/render/shaderimage/CMakeLists.txt b/tests/auto/render/shaderimage/CMakeLists.txt index afb63106b..1cc618520 100644 --- a/tests/auto/render/shaderimage/CMakeLists.txt +++ b/tests/auto/render/shaderimage/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from shaderimage.pro. ##################################################################### ## tst_shaderimage Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_shaderimage LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_shaderimage SOURCES tst_shaderimage.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/shaderimage/shaderimage.pro b/tests/auto/render/shaderimage/shaderimage.pro deleted file mode 100644 index cbee46356..000000000 --- a/tests/auto/render/shaderimage/shaderimage.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_shaderimage - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_shaderimage.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/shaderimage/tst_shaderimage.cpp b/tests/auto/render/shaderimage/tst_shaderimage.cpp index 0771f1fe0..bae978c1f 100644 --- a/tests/auto/render/shaderimage/tst_shaderimage.cpp +++ b/tests/auto/render/shaderimage/tst_shaderimage.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qshaderimage.h> diff --git a/tests/auto/render/skeleton/CMakeLists.txt b/tests/auto/render/skeleton/CMakeLists.txt index 3ef0b74aa..a5c0bbe37 100644 --- a/tests/auto/render/skeleton/CMakeLists.txt +++ b/tests/auto/render/skeleton/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from skeleton.pro. ##################################################################### ## tst_skeleton Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_skeleton LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_skeleton SOURCES tst_skeleton.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/skeleton/skeleton.pro b/tests/auto/render/skeleton/skeleton.pro deleted file mode 100644 index 8dbd1b3df..000000000 --- a/tests/auto/render/skeleton/skeleton.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_skeleton - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_skeleton.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/skeleton/tst_skeleton.cpp b/tests/auto/render/skeleton/tst_skeleton.cpp index f98d26694..9f47f6c01 100644 --- a/tests/auto/render/skeleton/tst_skeleton.cpp +++ b/tests/auto/render/skeleton/tst_skeleton.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/private/skeleton_p.h> diff --git a/tests/auto/render/sortpolicy/CMakeLists.txt b/tests/auto/render/sortpolicy/CMakeLists.txt index edbc5b916..c9b8f61cf 100644 --- a/tests/auto/render/sortpolicy/CMakeLists.txt +++ b/tests/auto/render/sortpolicy/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from sortpolicy.pro. ##################################################################### ## tst_sortpolicy Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_sortpolicy LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_sortpolicy SOURCES tst_sortpolicy.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/sortpolicy/sortpolicy.pro b/tests/auto/render/sortpolicy/sortpolicy.pro deleted file mode 100644 index 18b28cff7..000000000 --- a/tests/auto/render/sortpolicy/sortpolicy.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_sortpolicy - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_sortpolicy.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/sortpolicy/tst_sortpolicy.cpp b/tests/auto/render/sortpolicy/tst_sortpolicy.cpp index 633a45871..8d22673fc 100644 --- a/tests/auto/render/sortpolicy/tst_sortpolicy.cpp +++ b/tests/auto/render/sortpolicy/tst_sortpolicy.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/technique/CMakeLists.txt b/tests/auto/render/technique/CMakeLists.txt index 364d98410..96a2356c3 100644 --- a/tests/auto/render/technique/CMakeLists.txt +++ b/tests/auto/render/technique/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from technique.pro. ##################################################################### ## tst_technique Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_technique LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_technique SOURCES tst_technique.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/technique/technique.pro b/tests/auto/render/technique/technique.pro deleted file mode 100644 index 78a6cf8c5..000000000 --- a/tests/auto/render/technique/technique.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_technique - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_technique.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/technique/tst_technique.cpp b/tests/auto/render/technique/tst_technique.cpp index 47a0a2413..bb2b07697 100644 --- a/tests/auto/render/technique/tst_technique.cpp +++ b/tests/auto/render/technique/tst_technique.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> @@ -140,7 +115,7 @@ private Q_SLOTS: QCOMPARE(backendTechnique.renderPasses().first(), pass.id()); QCOMPARE(backendTechnique.isCompatibleWithRenderer(), false); const std::vector<Qt3DCore::QNodeId> dirtyTechniques = nodeManagers.techniqueManager()->takeDirtyTechniques(); - QCOMPARE(dirtyTechniques.size(), 1); + QCOMPARE(dirtyTechniques.size(), 1U); QCOMPARE(dirtyTechniques.front(), backendTechnique.peerId()); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::TechniquesDirty); } @@ -198,12 +173,12 @@ private Q_SLOTS: QCOMPARE(backendTechnique.isEnabled(), newValue); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::TechniquesDirty); renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty); - QCOMPARE(nodeManagers.techniqueManager()->takeDirtyTechniques().size(), 1); + QCOMPARE(nodeManagers.techniqueManager()->takeDirtyTechniques().size(), 1U); } { // WHEN backendTechnique.setCompatibleWithRenderer(true); - QCOMPARE(nodeManagers.techniqueManager()->takeDirtyTechniques().size(), 0); + QCOMPARE(nodeManagers.techniqueManager()->takeDirtyTechniques().size(), 0U); technique.graphicsApiFilter()->setMajorVersion(4); technique.graphicsApiFilter()->setMinorVersion(5); @@ -218,7 +193,7 @@ private Q_SLOTS: QCOMPARE(backendTechnique.isCompatibleWithRenderer(), false); const std::vector<Qt3DCore::QNodeId> dirtyTechniques = nodeManagers.techniqueManager()->takeDirtyTechniques(); - QCOMPARE(dirtyTechniques.size(), 1); + QCOMPARE(dirtyTechniques.size(), 1U); QCOMPARE(dirtyTechniques.front(), backendTechnique.peerId()); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::TechniquesDirty); diff --git a/tests/auto/render/texture/CMakeLists.txt b/tests/auto/render/texture/CMakeLists.txt index b21103132..92fd24a8d 100644 --- a/tests/auto/render/texture/CMakeLists.txt +++ b/tests/auto/render/texture/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from texture.pro. ##################################################################### ## tst_texture Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_texture LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_texture SOURCES tst_texture.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/texture/texture.pro b/tests/auto/render/texture/texture.pro deleted file mode 100644 index 04231844f..000000000 --- a/tests/auto/render/texture/texture.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_texture - -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_texture.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/texture/tst_texture.cpp b/tests/auto/render/texture/tst_texture.cpp index ed38f4822..4d1ad4d1e 100644 --- a/tests/auto/render/texture/tst_texture.cpp +++ b/tests/auto/render/texture/tst_texture.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> @@ -461,7 +436,7 @@ void tst_RenderTexture::checkPropertyChanges() // THEN const std::vector<Qt3DRender::QTextureDataUpdate> pendingUpdates = backend.takePendingTextureDataUpdates(); - QCOMPARE(pendingUpdates.size(), 1); + QCOMPARE(pendingUpdates.size(), 1U); QCOMPARE(pendingUpdates.front(), updateData); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::TexturesDirty); QVERIFY(backend.dirtyFlags() == Qt3DRender::Render::Texture::DirtyPendingDataUpdates); @@ -514,7 +489,7 @@ void tst_RenderTexture::checkInitialUpdateData() // THEN -> should have received the update as part of the initial data const std::vector<Qt3DRender::QTextureDataUpdate> pendingUpdates = backend.takePendingTextureDataUpdates(); - QCOMPARE(pendingUpdates.size(), 1); + QCOMPARE(pendingUpdates.size(), 1U); QCOMPARE(pendingUpdates.front(), updateData); QVERIFY(backend.dirtyFlags() & Qt3DRender::Render::Texture::DirtyPendingDataUpdates); } diff --git a/tests/auto/render/transform/CMakeLists.txt b/tests/auto/render/transform/CMakeLists.txt index 35ac69af6..012bfcc28 100644 --- a/tests/auto/render/transform/CMakeLists.txt +++ b/tests/auto/render/transform/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from transform.pro. ##################################################################### ## tst_transform Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_transform LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_transform SOURCES tst_transform.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/transform/transform.pro b/tests/auto/render/transform/transform.pro deleted file mode 100644 index b671b92fd..000000000 --- a/tests/auto/render/transform/transform.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_transform - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_transform.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/transform/tst_transform.cpp b/tests/auto/render/transform/tst_transform.cpp index b6c3c0b41..56dad0347 100644 --- a/tests/auto/render/transform/tst_transform.cpp +++ b/tests/auto/render/transform/tst_transform.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/render/triangleboundingvolume/CMakeLists.txt b/tests/auto/render/triangleboundingvolume/CMakeLists.txt index 210f7ba12..d7809d08e 100644 --- a/tests/auto/render/triangleboundingvolume/CMakeLists.txt +++ b/tests/auto/render/triangleboundingvolume/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from triangleboundingvolume.pro. ##################################################################### ## tst_triangleboundingvolume Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_triangleboundingvolume LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_triangleboundingvolume SOURCES tst_triangleboundingvolume.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/triangleboundingvolume/triangleboundingvolume.pro b/tests/auto/render/triangleboundingvolume/triangleboundingvolume.pro deleted file mode 100644 index dcbb2c17f..000000000 --- a/tests/auto/render/triangleboundingvolume/triangleboundingvolume.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_triangleboundingvolume - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_triangleboundingvolume.cpp - diff --git a/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp b/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp index 72d9cba82..f669d7482 100644 --- a/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp +++ b/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.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 #include <QtTest/QTest> #include <Qt3DRender/private/entity_p.h> diff --git a/tests/auto/render/trianglevisitor/CMakeLists.txt b/tests/auto/render/trianglevisitor/CMakeLists.txt index 6a5064154..267d226da 100644 --- a/tests/auto/render/trianglevisitor/CMakeLists.txt +++ b/tests/auto/render/trianglevisitor/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from trianglevisitor.pro. ##################################################################### ## trianglevisitor Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_trianglevisitor LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_trianglevisitor SOURCES tst_trianglevisitor.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/trianglevisitor/trianglevisitor.pro b/tests/auto/render/trianglevisitor/trianglevisitor.pro deleted file mode 100644 index c5ecabb5f..000000000 --- a/tests/auto/render/trianglevisitor/trianglevisitor.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = trianglevisitor - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_trianglevisitor.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/trianglevisitor/tst_trianglevisitor.cpp b/tests/auto/render/trianglevisitor/tst_trianglevisitor.cpp index 39ac824f5..4f6972367 100644 --- a/tests/auto/render/trianglevisitor/tst_trianglevisitor.cpp +++ b/tests/auto/render/trianglevisitor/tst_trianglevisitor.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/uniform/CMakeLists.txt b/tests/auto/render/uniform/CMakeLists.txt index 327acef24..573ffeb16 100644 --- a/tests/auto/render/uniform/CMakeLists.txt +++ b/tests/auto/render/uniform/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from uniform.pro. ##################################################################### ## tst_uniform Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_uniform LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_uniform SOURCES tst_uniform.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/uniform/tst_uniform.cpp b/tests/auto/render/uniform/tst_uniform.cpp index 8e7a50579..132352bee 100644 --- a/tests/auto/render/uniform/tst_uniform.cpp +++ b/tests/auto/render/uniform/tst_uniform.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/private/uniform_p.h> diff --git a/tests/auto/render/uniform/uniform.pro b/tests/auto/render/uniform/uniform.pro deleted file mode 100644 index 44dd0266a..000000000 --- a/tests/auto/render/uniform/uniform.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_uniform - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_uniform.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) diff --git a/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt b/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt index fc964838c..3e24c9020 100644 --- a/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt +++ b/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt @@ -1,16 +1,25 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from updateshaderdatatransformjob.pro. ##################################################################### ## tst_updateshaderdatatransformjob Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_updateshaderdatatransformjob LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_updateshaderdatatransformjob SOURCES ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h tst_updateshaderdatatransformjob.cpp INCLUDE_DIRECTORIES ../qmlscenereader - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DExtras diff --git a/tests/auto/render/updateshaderdatatransformjob/test_scene_model_to_eye.qml b/tests/auto/render/updateshaderdatatransformjob/test_scene_model_to_eye.qml index 3b21b08ba..83e006b8f 100644 --- a/tests/auto/render/updateshaderdatatransformjob/test_scene_model_to_eye.qml +++ b/tests/auto/render/updateshaderdatatransformjob/test_scene_model_to_eye.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.9 import Qt3D.Render 2.9 diff --git a/tests/auto/render/updateshaderdatatransformjob/test_scene_model_to_world.qml b/tests/auto/render/updateshaderdatatransformjob/test_scene_model_to_world.qml index 59ccdd27f..cc1828822 100644 --- a/tests/auto/render/updateshaderdatatransformjob/test_scene_model_to_world.qml +++ b/tests/auto/render/updateshaderdatatransformjob/test_scene_model_to_world.qml @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.9 import Qt3D.Render 2.9 diff --git a/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp b/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp index 805b6c064..415f51d35 100644 --- a/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp +++ b/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -** 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) 2016 Paul Lemire <paul.lemire350@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/private/updateshaderdatatransformjob_p.h> @@ -141,7 +116,7 @@ struct NodeCollection // THEN QCOMPARE(aspect->nodeManagers()->shaderDataManager()->activeHandles().size(), size_t(shaderData.size())); - for (const Qt3DRender::QShaderData *s : qAsConst(shaderData)) { + for (const Qt3DRender::QShaderData *s : std::as_const(shaderData)) { Qt3DRender::Render::ShaderData *backend = aspect->nodeManagers()->shaderDataManager()->lookupResource(s->id()); QVERIFY(backend != nullptr); backendShaderData.push_back(backend); @@ -222,7 +197,7 @@ private Q_SLOTS: // See scene file to find translation const Qt3DRender::Render::ShaderData::PropertyValue propertyValue = props[QStringLiteral("eyePosition")]; QCOMPARE(backendShaderData->getTransformedProperty(&propertyValue, Matrix4x4(camera->viewMatrix())).value<Vector3D>(), - Matrix4x4(camera->viewMatrix()) * (Vector3D(1.0f, 1.0f, 1.0f) + Vector3D(0.0f, 5.0f, 0.0f))); + Matrix4x4(camera->viewMatrix()).map(Vector3D(1.0f, 1.0f, 1.0f) + Vector3D(0.0f, 5.0f, 0.0f))); } void checkRunModelToWorld() diff --git a/tests/auto/render/updateshaderdatatransformjob/updateshaderdatatransformjob.pro b/tests/auto/render/updateshaderdatatransformjob/updateshaderdatatransformjob.pro deleted file mode 100644 index 07c82acca..000000000 --- a/tests/auto/render/updateshaderdatatransformjob/updateshaderdatatransformjob.pro +++ /dev/null @@ -1,18 +0,0 @@ -TEMPLATE = app - -TARGET = tst_updateshaderdatatransformjob - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_updateshaderdatatransformjob.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) -include(../qmlscenereader/qmlscenereader.pri) -# Extra dependencies to build test scenes needed by the tests -QT += quick 3dquick 3dquick-private 3dextras 3dquickextras - -RESOURCES += \ - updateshaderdatatransformjob.qrc diff --git a/tests/auto/render/vsyncframeadvanceservice/CMakeLists.txt b/tests/auto/render/vsyncframeadvanceservice/CMakeLists.txt index 3a3a58ffd..4806e2fe8 100644 --- a/tests/auto/render/vsyncframeadvanceservice/CMakeLists.txt +++ b/tests/auto/render/vsyncframeadvanceservice/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from vsyncframeadvanceservice.pro. ##################################################################### ## tst_vsyncframeadvanceservice Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_vsyncframeadvanceservice LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_vsyncframeadvanceservice SOURCES tst_vsyncframeadvanceservice.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp index 806adff6b..23cfefd8d 100644 --- a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp +++ b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Paul Lemire -** 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 Paul Lemire +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QSemaphore> diff --git a/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro b/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro deleted file mode 100644 index 4d6b336d1..000000000 --- a/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_vsyncframeadvanceservice - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_vsyncframeadvanceservice.cpp diff --git a/tests/auto/render/waitfence/CMakeLists.txt b/tests/auto/render/waitfence/CMakeLists.txt index a2e12be66..e8bd3c58f 100644 --- a/tests/auto/render/waitfence/CMakeLists.txt +++ b/tests/auto/render/waitfence/CMakeLists.txt @@ -1,13 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from waitfence.pro. ##################################################################### ## tst_waitfence Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_waitfence LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_waitfence SOURCES tst_waitfence.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::3DCore Qt::3DCorePrivate Qt::3DRender diff --git a/tests/auto/render/waitfence/tst_waitfence.cpp b/tests/auto/render/waitfence/tst_waitfence.cpp index 26f473f45..7d718a0a2 100644 --- a/tests/auto/render/waitfence/tst_waitfence.cpp +++ b/tests/auto/render/waitfence/tst_waitfence.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only diff --git a/tests/auto/render/waitfence/waitfence.pro b/tests/auto/render/waitfence/waitfence.pro deleted file mode 100644 index cb8f71272..000000000 --- a/tests/auto/render/waitfence/waitfence.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_waitfence - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_waitfence.cpp - -include(../../core/common/common.pri) -include(../commons/commons.pri) |