diff options
Diffstat (limited to 'tests/auto/core')
74 files changed, 173 insertions, 286 deletions
diff --git a/tests/auto/core/aspectcommanddebugger/CMakeLists.txt b/tests/auto/core/aspectcommanddebugger/CMakeLists.txt index 3c4970c9d..9bbcf3e68 100644 --- a/tests/auto/core/aspectcommanddebugger/CMakeLists.txt +++ b/tests/auto/core/aspectcommanddebugger/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_aspectcommandddebugger Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_aspectcommandddebugger LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_aspectcommandddebugger SOURCES tst_aspectcommanddebugger.cpp diff --git a/tests/auto/core/aspectcommanddebugger/aspectcommanddebugger.pro b/tests/auto/core/aspectcommanddebugger/aspectcommanddebugger.pro deleted file mode 100644 index 029a84507..000000000 --- a/tests/auto/core/aspectcommanddebugger/aspectcommanddebugger.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_aspectcommandddebugger -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_aspectcommanddebugger.cpp - -QT += testlib 3dcore 3dcore-private core-private diff --git a/tests/auto/core/aspectcommanddebugger/tst_aspectcommanddebugger.cpp b/tests/auto/core/aspectcommanddebugger/tst_aspectcommanddebugger.cpp index d3134a9f3..71ee59192 100644 --- a/tests/auto/core/aspectcommanddebugger/tst_aspectcommanddebugger.cpp +++ b/tests/auto/core/aspectcommanddebugger/tst_aspectcommanddebugger.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/aspectcommanddebugger_p.h> diff --git a/tests/auto/core/common/common.pri b/tests/auto/core/common/common.pri deleted file mode 100644 index 53d2b1ac2..000000000 --- a/tests/auto/core/common/common.pri +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDEPATH += $$PWD - -qtConfig(private_tests) { - SOURCES += \ - $$PWD/qbackendnodetester.cpp - - HEADERS += \ - $$PWD/qbackendnodetester.h \ - $$PWD/testarbiter.h -} - -QT += core-private 3dcore 3dcore-private - -qtConfig(qt3d-simd-avx2) { - CONFIG += simd - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2 -} - -qtConfig(qt3d-simd-sse2):!qtConfig(qt3d-simd-avx2) { - CONFIG += simd - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2 -} diff --git a/tests/auto/core/common/qbackendnodetester.cpp b/tests/auto/core/common/qbackendnodetester.cpp index 5ed2ecc6d..f3dba9a74 100644 --- a/tests/auto/core/common/qbackendnodetester.cpp +++ b/tests/auto/core/common/qbackendnodetester.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qbackendnodetester.h" #include <Qt3DCore/qbackendnode.h> diff --git a/tests/auto/core/common/qbackendnodetester.h b/tests/auto/core/common/qbackendnodetester.h index 8a4482166..342056a68 100644 --- a/tests/auto/core/common/qbackendnodetester.h +++ b/tests/auto/core/common/qbackendnodetester.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QT3DCORE_QBACKENDNODETESTER_H #define QT3DCORE_QBACKENDNODETESTER_H diff --git a/tests/auto/core/common/testarbiter.h b/tests/auto/core/common/testarbiter.h index 81179f2ed..7f6109647 100644 --- a/tests/auto/core/common/testarbiter.h +++ b/tests/auto/core/common/testarbiter.h @@ -1,5 +1,5 @@ // Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/core/core.pro b/tests/auto/core/core.pro deleted file mode 100644 index a22402c3e..000000000 --- a/tests/auto/core/core.pro +++ /dev/null @@ -1,36 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS = \ - handle \ - qresourcemanager \ - nodes \ - qaspectengine \ - qaspectfactory \ - qaspectjob \ - qchangearbiter \ - qscene \ - qservicelocator \ - qjoint \ - qskeletonloader \ - qskeleton \ - qarmature - -qtConfig(private_tests) { - SUBDIRS += \ - qentity \ - qtransform \ - threadpooler \ - vector4d_base \ - vector3d_base \ - aspectcommanddebugger \ - qscheduler - - QT_FOR_CONFIG += 3dcore-private - qtConfig(qt3d-simd-sse2) { - SUBDIRS += \ - vector4d_sse \ - vector3d_sse \ - matrix4x4_sse - } - qtConfig(qt3d-simd-avx2): SUBDIRS += matrix4x4_avx2 -} diff --git a/tests/auto/core/handle/CMakeLists.txt b/tests/auto/core/handle/CMakeLists.txt index a7d5e6724..899136740 100644 --- a/tests/auto/core/handle/CMakeLists.txt +++ b/tests/auto/core/handle/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_handle Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_handle LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_handle SOURCES tst_handle.cpp diff --git a/tests/auto/core/handle/handle.pro b/tests/auto/core/handle/handle.pro deleted file mode 100644 index da2e504fe..000000000 --- a/tests/auto/core/handle/handle.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_handle -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_handle.cpp - -QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/handle/tst_handle.cpp b/tests/auto/core/handle/tst_handle.cpp index 176831dd9..568b377b7 100644 --- a/tests/auto/core/handle/tst_handle.cpp +++ b/tests/auto/core/handle/tst_handle.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/qhandle_p.h> diff --git a/tests/auto/core/matrix4x4_sse/CMakeLists.txt b/tests/auto/core/matrix4x4_sse/CMakeLists.txt index 35123cd17..4491f80a9 100644 --- a/tests/auto/core/matrix4x4_sse/CMakeLists.txt +++ b/tests/auto/core/matrix4x4_sse/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_matrix4x4_sse Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_matrix4x4_sse LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_matrix4x4_sse SOURCES tst_matrix4x4_sse.cpp diff --git a/tests/auto/core/matrix4x4_sse/matrix4x4_sse.pro b/tests/auto/core/matrix4x4_sse/matrix4x4_sse.pro deleted file mode 100644 index ca89373e2..000000000 --- a/tests/auto/core/matrix4x4_sse/matrix4x4_sse.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_matrix4x4_sse -CONFIG += testcase -QT += testlib 3dcore 3dcore-private - -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2 - -SOURCES += tst_matrix4x4_sse.cpp - diff --git a/tests/auto/core/matrix4x4_sse/tst_matrix4x4_sse.cpp b/tests/auto/core/matrix4x4_sse/tst_matrix4x4_sse.cpp index 24880430c..710288973 100644 --- a/tests/auto/core/matrix4x4_sse/tst_matrix4x4_sse.cpp +++ b/tests/auto/core/matrix4x4_sse/tst_matrix4x4_sse.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/matrix4x4_sse_p.h> diff --git a/tests/auto/core/nodes/CMakeLists.txt b/tests/auto/core/nodes/CMakeLists.txt index 9b2611c4a..bdda3be50 100644 --- a/tests/auto/core/nodes/CMakeLists.txt +++ b/tests/auto/core/nodes/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_nodes Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_nodes LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_nodes SOURCES tst_nodes.cpp diff --git a/tests/auto/core/nodes/nodes.pro b/tests/auto/core/nodes/nodes.pro deleted file mode 100644 index b2c43f5e6..000000000 --- a/tests/auto/core/nodes/nodes.pro +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = tst_nodes -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_nodes.cpp - -QT += testlib 3dcore 3dcore-private core-private - -include(../common/common.pri) diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index 7c5868e11..3c0439396 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qnode.h> diff --git a/tests/auto/core/qarmature/CMakeLists.txt b/tests/auto/core/qarmature/CMakeLists.txt index 6689f6a70..7bd6a5676 100644 --- a/tests/auto/core/qarmature/CMakeLists.txt +++ b/tests/auto/core/qarmature/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qarmature Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qarmature LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qarmature SOURCES tst_qarmature.cpp diff --git a/tests/auto/core/qarmature/qarmature.pro b/tests/auto/core/qarmature/qarmature.pro deleted file mode 100644 index 1d4769310..000000000 --- a/tests/auto/core/qarmature/qarmature.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qarmature - -QT += core-private 3dcore 3dcore-private testlib - -CONFIG += testcase - -SOURCES += tst_qarmature.cpp - -include(../common/common.pri) diff --git a/tests/auto/core/qarmature/tst_qarmature.cpp b/tests/auto/core/qarmature/tst_qarmature.cpp index 114c9abcb..54b916d00 100644 --- a/tests/auto/core/qarmature/tst_qarmature.cpp +++ b/tests/auto/core/qarmature/tst_qarmature.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qarmature.h> diff --git a/tests/auto/core/qaspectengine/CMakeLists.txt b/tests/auto/core/qaspectengine/CMakeLists.txt index 9e2651f82..251cac073 100644 --- a/tests/auto/core/qaspectengine/CMakeLists.txt +++ b/tests/auto/core/qaspectengine/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qaspectengine Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qaspectengine LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qaspectengine SOURCES tst_qaspectengine.cpp diff --git a/tests/auto/core/qaspectengine/qaspectengine.pro b/tests/auto/core/qaspectengine/qaspectengine.pro deleted file mode 100644 index 14ba51b3d..000000000 --- a/tests/auto/core/qaspectengine/qaspectengine.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_qaspectengine -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_qaspectengine.cpp - -QT += testlib 3dcore diff --git a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp index b39af5e9d..6ab228c7e 100644 --- a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp +++ b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QTimer> diff --git a/tests/auto/core/qaspectfactory/CMakeLists.txt b/tests/auto/core/qaspectfactory/CMakeLists.txt index f8482a595..91e2bad86 100644 --- a/tests/auto/core/qaspectfactory/CMakeLists.txt +++ b/tests/auto/core/qaspectfactory/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qaspectfactory Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qaspectfactory LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qaspectfactory SOURCES tst_qaspectfactory.cpp diff --git a/tests/auto/core/qaspectfactory/qaspectfactory.pro b/tests/auto/core/qaspectfactory/qaspectfactory.pro deleted file mode 100644 index b5b5dd5fe..000000000 --- a/tests/auto/core/qaspectfactory/qaspectfactory.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_qaspectfactory -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_qaspectfactory.cpp - -QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp b/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp index 1452fb9dd..8f2efa859 100644 --- a/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp +++ b/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/qaspectfactory_p.h> diff --git a/tests/auto/core/qaspectjob/CMakeLists.txt b/tests/auto/core/qaspectjob/CMakeLists.txt index 183fd8a89..2b27f3075 100644 --- a/tests/auto/core/qaspectjob/CMakeLists.txt +++ b/tests/auto/core/qaspectjob/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qaspectjob Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qaspectjob LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qaspectjob SOURCES tst_qaspectjob.cpp diff --git a/tests/auto/core/qaspectjob/qaspectjob.pro b/tests/auto/core/qaspectjob/qaspectjob.pro deleted file mode 100644 index 0a7a94f6d..000000000 --- a/tests/auto/core/qaspectjob/qaspectjob.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_qaspectjob -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_qaspectjob.cpp - -QT += testlib 3dcore diff --git a/tests/auto/core/qaspectjob/tst_qaspectjob.cpp b/tests/auto/core/qaspectjob/tst_qaspectjob.cpp index 9e8011acf..1ca13ee16 100644 --- a/tests/auto/core/qaspectjob/tst_qaspectjob.cpp +++ b/tests/auto/core/qaspectjob/tst_qaspectjob.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qaspectjob.h> diff --git a/tests/auto/core/qchangearbiter/CMakeLists.txt b/tests/auto/core/qchangearbiter/CMakeLists.txt index 1ee8cfb5b..e3ae8bdce 100644 --- a/tests/auto/core/qchangearbiter/CMakeLists.txt +++ b/tests/auto/core/qchangearbiter/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qchangearbiter Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qchangearbiter LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qchangearbiter SOURCES tst_qchangearbiter.cpp diff --git a/tests/auto/core/qchangearbiter/qchangearbiter.pro b/tests/auto/core/qchangearbiter/qchangearbiter.pro deleted file mode 100644 index 4628bf6cd..000000000 --- a/tests/auto/core/qchangearbiter/qchangearbiter.pro +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = tst_qchangearbiter -CONFIG += testcase -TEMPLATE = app - -QT += testlib core core-private 3dcore 3dcore-private - -SOURCES += \ - tst_qchangearbiter.cpp - -include(../common/common.pri) diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp index 4508098c0..8da627fe5 100644 --- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp +++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/qchangearbiter_p.h> diff --git a/tests/auto/core/qentity/CMakeLists.txt b/tests/auto/core/qentity/CMakeLists.txt index 7f308aa67..73cc81b7a 100644 --- a/tests/auto/core/qentity/CMakeLists.txt +++ b/tests/auto/core/qentity/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qentity Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qentity LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qentity SOURCES tst_qentity.cpp diff --git a/tests/auto/core/qentity/qentity.pro b/tests/auto/core/qentity/qentity.pro deleted file mode 100644 index 175c6d3c8..000000000 --- a/tests/auto/core/qentity/qentity.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_qentity -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_qentity.cpp - -QT += testlib 3dcore 3dcore-private core-private diff --git a/tests/auto/core/qentity/tst_qentity.cpp b/tests/auto/core/qentity/tst_qentity.cpp index 7f5bddea2..eb1b03f43 100644 --- a/tests/auto/core/qentity/tst_qentity.cpp +++ b/tests/auto/core/qentity/tst_qentity.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qentity.h> @@ -586,7 +586,7 @@ void tst_Entity::checkComponentBookkeeping() // WHEN int sigCount = 0; QObject *sigSender = comp.data(); - connect(comp.data(), &QComponent::removedFromEntity, [&sigCount, sigSender](QEntity *) { + connect(comp.data(), &QComponent::removedFromEntity, this, [&sigCount, sigSender](QEntity *) { QComponent *c = qobject_cast<QComponent *>(sigSender); if (sigSender && c) sigCount++; // test the sender is still a QComponent when signal is emitted diff --git a/tests/auto/core/qjoint/CMakeLists.txt b/tests/auto/core/qjoint/CMakeLists.txt index a879741b9..fdd3749d5 100644 --- a/tests/auto/core/qjoint/CMakeLists.txt +++ b/tests/auto/core/qjoint/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qjoint Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qjoint LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qjoint SOURCES tst_qjoint.cpp diff --git a/tests/auto/core/qjoint/qjoint.pro b/tests/auto/core/qjoint/qjoint.pro deleted file mode 100644 index e25d57102..000000000 --- a/tests/auto/core/qjoint/qjoint.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qjoint - -QT += 3dcore 3dcore-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_qjoint.cpp - -include(../common/common.pri) diff --git a/tests/auto/core/qjoint/tst_qjoint.cpp b/tests/auto/core/qjoint/tst_qjoint.cpp index 6c632dfab..8444b1511 100644 --- a/tests/auto/core/qjoint/tst_qjoint.cpp +++ b/tests/auto/core/qjoint/tst_qjoint.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qjoint.h> diff --git a/tests/auto/core/qresourcemanager/CMakeLists.txt b/tests/auto/core/qresourcemanager/CMakeLists.txt index ed2567ab7..51b6d271d 100644 --- a/tests/auto/core/qresourcemanager/CMakeLists.txt +++ b/tests/auto/core/qresourcemanager/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qresourcemanager Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qresourcemanager LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qresourcemanager SOURCES tst_qresourcemanager.cpp diff --git a/tests/auto/core/qresourcemanager/qresourcemanager.pro b/tests/auto/core/qresourcemanager/qresourcemanager.pro deleted file mode 100644 index 8fdf9b569..000000000 --- a/tests/auto/core/qresourcemanager/qresourcemanager.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_qresourcemanager -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_qresourcemanager.cpp - -QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp index 474874fa2..027eeaa32 100644 --- a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp +++ b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QList> diff --git a/tests/auto/core/qscene/CMakeLists.txt b/tests/auto/core/qscene/CMakeLists.txt index 57f65e0d8..56d6debdc 100644 --- a/tests/auto/core/qscene/CMakeLists.txt +++ b/tests/auto/core/qscene/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qscene Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qscene LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qscene SOURCES tst_qscene.cpp diff --git a/tests/auto/core/qscene/qscene.pro b/tests/auto/core/qscene/qscene.pro deleted file mode 100644 index 150b86f71..000000000 --- a/tests/auto/core/qscene/qscene.pro +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = tst_qscene -CONFIG += testcase -TEMPLATE = app - -QT += testlib core-private 3dcore 3dcore-private - -SOURCES += \ - tst_qscene.cpp - -include(../common/common.pri) diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp index ce20eb364..1ac4c959c 100644 --- a/tests/auto/core/qscene/tst_qscene.cpp +++ b/tests/auto/core/qscene/tst_qscene.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/qscene_p.h> diff --git a/tests/auto/core/qscheduler/CMakeLists.txt b/tests/auto/core/qscheduler/CMakeLists.txt index 90b2c6a9a..c5be7716d 100644 --- a/tests/auto/core/qscheduler/CMakeLists.txt +++ b/tests/auto/core/qscheduler/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qscheduler Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qscheduler LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qscheduler SOURCES tst_qscheduler.cpp diff --git a/tests/auto/core/qscheduler/qscheduler.pro b/tests/auto/core/qscheduler/qscheduler.pro deleted file mode 100644 index 078716116..000000000 --- a/tests/auto/core/qscheduler/qscheduler.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_qscheduler -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_qscheduler.cpp - -QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/qscheduler/tst_qscheduler.cpp b/tests/auto/core/qscheduler/tst_qscheduler.cpp index c86ea8f54..2489818ba 100644 --- a/tests/auto/core/qscheduler/tst_qscheduler.cpp +++ b/tests/auto/core/qscheduler/tst_qscheduler.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <Qt3DCore/qaspectjob.h> diff --git a/tests/auto/core/qservicelocator/CMakeLists.txt b/tests/auto/core/qservicelocator/CMakeLists.txt index 0b3139485..6d477cfb4 100644 --- a/tests/auto/core/qservicelocator/CMakeLists.txt +++ b/tests/auto/core/qservicelocator/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qservicelocator Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qservicelocator LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qservicelocator SOURCES tst_qservicelocator.cpp diff --git a/tests/auto/core/qservicelocator/qservicelocator.pro b/tests/auto/core/qservicelocator/qservicelocator.pro deleted file mode 100644 index 9ea02b56d..000000000 --- a/tests/auto/core/qservicelocator/qservicelocator.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_qservicelocator -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_qservicelocator.cpp - -QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/qservicelocator/tst_qservicelocator.cpp b/tests/auto/core/qservicelocator/tst_qservicelocator.cpp index 71f737a8d..dca53a5ef 100644 --- a/tests/auto/core/qservicelocator/tst_qservicelocator.cpp +++ b/tests/auto/core/qservicelocator/tst_qservicelocator.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/qservicelocator_p.h> diff --git a/tests/auto/core/qskeleton/CMakeLists.txt b/tests/auto/core/qskeleton/CMakeLists.txt index 398ca7d1b..de6f924b4 100644 --- a/tests/auto/core/qskeleton/CMakeLists.txt +++ b/tests/auto/core/qskeleton/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qskeleton Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qskeleton LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qskeleton SOURCES tst_qskeleton.cpp diff --git a/tests/auto/core/qskeleton/qskeleton.pro b/tests/auto/core/qskeleton/qskeleton.pro deleted file mode 100644 index 3bbb48a3c..000000000 --- a/tests/auto/core/qskeleton/qskeleton.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qskeleton - -QT += core-private 3dcore 3dcore-private testlib - -CONFIG += testcase - -SOURCES += tst_qskeleton.cpp - -include(../common/common.pri) diff --git a/tests/auto/core/qskeleton/tst_qskeleton.cpp b/tests/auto/core/qskeleton/tst_qskeleton.cpp index cdfb672a4..d5ce41b11 100644 --- a/tests/auto/core/qskeleton/tst_qskeleton.cpp +++ b/tests/auto/core/qskeleton/tst_qskeleton.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/qskeleton.h> diff --git a/tests/auto/core/qskeletonloader/CMakeLists.txt b/tests/auto/core/qskeletonloader/CMakeLists.txt index 798d86253..11fa75053 100644 --- a/tests/auto/core/qskeletonloader/CMakeLists.txt +++ b/tests/auto/core/qskeletonloader/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qskeletonloader Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qskeletonloader LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qskeletonloader SOURCES tst_qskeletonloader.cpp diff --git a/tests/auto/core/qskeletonloader/qskeletonloader.pro b/tests/auto/core/qskeletonloader/qskeletonloader.pro deleted file mode 100644 index 6172906c2..000000000 --- a/tests/auto/core/qskeletonloader/qskeletonloader.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qskeletonloader - -QT += 3dcore 3dcore-private testlib - -CONFIG += testcase - -SOURCES += \ - tst_qskeletonloader.cpp - -include(../common/common.pri) diff --git a/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp b/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp index 9324de2f4..b5f7ce17c 100644 --- a/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp +++ b/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> diff --git a/tests/auto/core/qtransform/CMakeLists.txt b/tests/auto/core/qtransform/CMakeLists.txt index 1d453ef9b..daa93ac75 100644 --- a/tests/auto/core/qtransform/CMakeLists.txt +++ b/tests/auto/core/qtransform/CMakeLists.txt @@ -9,6 +9,12 @@ ## tst_qtransform Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qt3d_qtransform LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qt3d_qtransform SOURCES tst_qtransform.cpp diff --git a/tests/auto/core/qtransform/qtransform.pro b/tests/auto/core/qtransform/qtransform.pro deleted file mode 100644 index 190eab5c5..000000000 --- a/tests/auto/core/qtransform/qtransform.pro +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = tst_qtransform -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_qtransform.cpp - -QT += testlib 3dcore - -include(../../core/common/common.pri) diff --git a/tests/auto/core/qtransform/tst_qtransform.cpp b/tests/auto/core/qtransform/tst_qtransform.cpp index c7a5aa594..3b6fe93e0 100644 --- a/tests/auto/core/qtransform/tst_qtransform.cpp +++ b/tests/auto/core/qtransform/tst_qtransform.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QtTest/QSignalSpy> @@ -113,14 +113,14 @@ private Q_SLOTS: int scale3DChangedCount = 0; int translationChangedCount = 0; - QObject::connect(transform.data(), &Qt3DCore::QTransform::rotationChanged, [&] { ++rotationChangedCount; }); - QObject::connect(transform.data(), &Qt3DCore::QTransform::rotationXChanged, [&] { ++rotationXChangedCount; }); - QObject::connect(transform.data(), &Qt3DCore::QTransform::rotationYChanged, [&] { ++rotationYChangedCount; }); - QObject::connect(transform.data(), &Qt3DCore::QTransform::rotationZChanged, [&] { ++rotationZChangedCount; }); - QObject::connect(transform.data(), &Qt3DCore::QTransform::matrixChanged, [&] { ++matrixChangedCount; }); - QObject::connect(transform.data(), &Qt3DCore::QTransform::scale3DChanged, [&] { ++scale3DChangedCount; }); - QObject::connect(transform.data(), &Qt3DCore::QTransform::scaleChanged, [&] { ++scaleChangedCount; }); - QObject::connect(transform.data(), &Qt3DCore::QTransform::translationChanged, [&] { ++translationChangedCount; }); + QObject::connect(transform.data(), &Qt3DCore::QTransform::rotationChanged, this, [&] { ++rotationChangedCount; }); + QObject::connect(transform.data(), &Qt3DCore::QTransform::rotationXChanged, this, [&] { ++rotationXChangedCount; }); + QObject::connect(transform.data(), &Qt3DCore::QTransform::rotationYChanged, this, [&] { ++rotationYChangedCount; }); + QObject::connect(transform.data(), &Qt3DCore::QTransform::rotationZChanged, this, [&] { ++rotationZChangedCount; }); + QObject::connect(transform.data(), &Qt3DCore::QTransform::matrixChanged, this, [&] { ++matrixChangedCount; }); + QObject::connect(transform.data(), &Qt3DCore::QTransform::scale3DChanged, this, [&] { ++scale3DChangedCount; }); + QObject::connect(transform.data(), &Qt3DCore::QTransform::scaleChanged, this, [&] { ++scaleChangedCount; }); + QObject::connect(transform.data(), &Qt3DCore::QTransform::translationChanged, this, [&] { ++translationChangedCount; }); // WHEN transform->setRotationX(180.0f); diff --git a/tests/auto/core/threadpooler/CMakeLists.txt b/tests/auto/core/threadpooler/CMakeLists.txt index 2bc055175..faeb75ec4 100644 --- a/tests/auto/core/threadpooler/CMakeLists.txt +++ b/tests/auto/core/threadpooler/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_threadpooler Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_threadpooler LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_threadpooler SOURCES tst_threadpooler.cpp diff --git a/tests/auto/core/threadpooler/threadpooler.pro b/tests/auto/core/threadpooler/threadpooler.pro deleted file mode 100644 index 5a1115bbf..000000000 --- a/tests/auto/core/threadpooler/threadpooler.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_threadpooler -CONFIG += testcase -TEMPLATE = app - -SOURCES += tst_threadpooler.cpp - -QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/threadpooler/tst_threadpooler.cpp b/tests/auto/core/threadpooler/tst_threadpooler.cpp index a020affbf..d7b6063d6 100644 --- a/tests/auto/core/threadpooler/tst_threadpooler.cpp +++ b/tests/auto/core/threadpooler/tst_threadpooler.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QtCore/QThread> diff --git a/tests/auto/core/vector3d_base/CMakeLists.txt b/tests/auto/core/vector3d_base/CMakeLists.txt index 861d17a27..4dda57707 100644 --- a/tests/auto/core/vector3d_base/CMakeLists.txt +++ b/tests/auto/core/vector3d_base/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_vector3d_base Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_vector3d_base LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_vector3d_base SOURCES tst_vector3d_base.cpp diff --git a/tests/auto/core/vector3d_base/tst_vector3d_base.cpp b/tests/auto/core/vector3d_base/tst_vector3d_base.cpp index 492b1d85e..5969ed804 100644 --- a/tests/auto/core/vector3d_base/tst_vector3d_base.cpp +++ b/tests/auto/core/vector3d_base/tst_vector3d_base.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/vector3d_p.h> diff --git a/tests/auto/core/vector3d_base/vector3d_base.pro b/tests/auto/core/vector3d_base/vector3d_base.pro deleted file mode 100644 index fa1ee87df..000000000 --- a/tests/auto/core/vector3d_base/vector3d_base.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_vector3d_base -CONFIG += testcase -QT += testlib 3dcore 3dcore-private - -SOURCES += \ - tst_vector3d_base.cpp - diff --git a/tests/auto/core/vector3d_sse/CMakeLists.txt b/tests/auto/core/vector3d_sse/CMakeLists.txt index d024b031e..aba74e959 100644 --- a/tests/auto/core/vector3d_sse/CMakeLists.txt +++ b/tests/auto/core/vector3d_sse/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_vector3d_sse Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_vector3d_sse LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_vector3d_sse SOURCES tst_vector3d_sse.cpp diff --git a/tests/auto/core/vector3d_sse/tst_vector3d_sse.cpp b/tests/auto/core/vector3d_sse/tst_vector3d_sse.cpp index 8e0bd856d..37964730f 100644 --- a/tests/auto/core/vector3d_sse/tst_vector3d_sse.cpp +++ b/tests/auto/core/vector3d_sse/tst_vector3d_sse.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/vector3d_sse_p.h> diff --git a/tests/auto/core/vector3d_sse/vector3d_sse.pro b/tests/auto/core/vector3d_sse/vector3d_sse.pro deleted file mode 100644 index 6afc4a863..000000000 --- a/tests/auto/core/vector3d_sse/vector3d_sse.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_vector3d_sse -CONFIG += testcase simd -QT += testlib 3dcore 3dcore-private - -SOURCES += \ - tst_vector3d_sse.cpp - -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2 diff --git a/tests/auto/core/vector4d_base/CMakeLists.txt b/tests/auto/core/vector4d_base/CMakeLists.txt index 1c7fb65bd..57f4cb774 100644 --- a/tests/auto/core/vector4d_base/CMakeLists.txt +++ b/tests/auto/core/vector4d_base/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_vector4d_base Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_vector4d_base LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_vector4d_base SOURCES tst_vector4d_base.cpp diff --git a/tests/auto/core/vector4d_base/tst_vector4d_base.cpp b/tests/auto/core/vector4d_base/tst_vector4d_base.cpp index 64eb5c58d..92a5f7c6c 100644 --- a/tests/auto/core/vector4d_base/tst_vector4d_base.cpp +++ b/tests/auto/core/vector4d_base/tst_vector4d_base.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/vector4d_p.h> diff --git a/tests/auto/core/vector4d_base/vector4d_base.pro b/tests/auto/core/vector4d_base/vector4d_base.pro deleted file mode 100644 index 9afaff092..000000000 --- a/tests/auto/core/vector4d_base/vector4d_base.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_vector4d_base -CONFIG += testcase - -SOURCES += \ - tst_vector4d_base.cpp - -QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/vector4d_sse/CMakeLists.txt b/tests/auto/core/vector4d_sse/CMakeLists.txt index 9d6060974..00f0dedbd 100644 --- a/tests/auto/core/vector4d_sse/CMakeLists.txt +++ b/tests/auto/core/vector4d_sse/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_vector4d_sse Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_vector4d_sse LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_vector4d_sse SOURCES tst_vector4d_sse.cpp diff --git a/tests/auto/core/vector4d_sse/tst_vector4d_sse.cpp b/tests/auto/core/vector4d_sse/tst_vector4d_sse.cpp index 2cce8d141..a0239b2ed 100644 --- a/tests/auto/core/vector4d_sse/tst_vector4d_sse.cpp +++ b/tests/auto/core/vector4d_sse/tst_vector4d_sse.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com> -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DCore/private/vector4d_sse_p.h> diff --git a/tests/auto/core/vector4d_sse/vector4d_sse.pro b/tests/auto/core/vector4d_sse/vector4d_sse.pro deleted file mode 100644 index 76c425548..000000000 --- a/tests/auto/core/vector4d_sse/vector4d_sse.pro +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = tst_vector4d_sse -CONFIG += testcase simd - -SOURCES += \ - tst_vector4d_sse.cpp - -QT += testlib 3dcore 3dcore-private - -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2 |