diff options
Diffstat (limited to 'tests/auto/render')
448 files changed, 941 insertions, 2212 deletions
diff --git a/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt b/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt index 1963449d9..95c8371a6 100644 --- a/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt +++ b/tests/auto/render/alignedresourcesmanagers-sse/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 04ccd904d..8653b37f6 100644 --- a/tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp +++ b/tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/qnodeid.h> diff --git a/tests/auto/render/armature/CMakeLists.txt b/tests/auto/render/armature/CMakeLists.txt index 898a2856b..91533b003 100644 --- a/tests/auto/render/armature/CMakeLists.txt +++ b/tests/auto/render/armature/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 1c7826dd5..baa0d1ef9 100644 --- a/tests/auto/render/armature/tst_armature.cpp +++ b/tests/auto/render/armature/tst_armature.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 <Qt3DRender/private/armature_p.h> diff --git a/tests/auto/render/aspect/CMakeLists.txt b/tests/auto/render/aspect/CMakeLists.txt index 785659226..8fde33fdd 100644 --- a/tests/auto/render/aspect/CMakeLists.txt +++ b/tests/auto/render/aspect/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 7f4b151ae..fcb22ed47 100644 --- a/tests/auto/render/aspect/tst_aspect.cpp +++ b/tests/auto/render/aspect/tst_aspect.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/QTest> #include <QMutex> diff --git a/tests/auto/render/attribute/CMakeLists.txt b/tests/auto/render/attribute/CMakeLists.txt index d83a48b72..089b19f15 100644 --- a/tests/auto/render/attribute/CMakeLists.txt +++ b/tests/auto/render/attribute/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 aca1b59dc..4cc76ee65 100644 --- a/tests/auto/render/attribute/tst_attribute.cpp +++ b/tests/auto/render/attribute/tst_attribute.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 <qbackendnodetester.h> diff --git a/tests/auto/render/blitframebuffer/CMakeLists.txt b/tests/auto/render/blitframebuffer/CMakeLists.txt index 5f980bba4..60a262865 100644 --- a/tests/auto/render/blitframebuffer/CMakeLists.txt +++ b/tests/auto/render/blitframebuffer/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 81a130f8e..7e02f9ba3 100644 --- a/tests/auto/render/blitframebuffer/tst_blitframebuffer.cpp +++ b/tests/auto/render/blitframebuffer/tst_blitframebuffer.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/render/boundingsphere/CMakeLists.txt b/tests/auto/render/boundingsphere/CMakeLists.txt index d818816d7..1360252f7 100644 --- a/tests/auto/render/boundingsphere/CMakeLists.txt +++ b/tests/auto/render/boundingsphere/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_boundingsphere Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_boundingsphere LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_boundingsphere SOURCES ../qmlscenereader/qmlscenereader.cpp ../qmlscenereader/qmlscenereader.h diff --git a/tests/auto/render/boundingsphere/boundingsphere.pro b/tests/auto/render/boundingsphere/boundingsphere.pro deleted file mode 100644 index cebba17e7..000000000 --- a/tests/auto/render/boundingsphere/boundingsphere.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app - -TARGET = tst_boundingsphere -QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras testlib - -CONFIG += testcase - -SOURCES += tst_boundingsphere.cpp - -include(../commons/commons.pri) -include(../../core/common/common.pri) -include(../qmlscenereader/qmlscenereader.pri) -# Extra dependencies to build test scenes needed by the tests -QT += quick 3dquick 3dquick-private 3dextras 3dquickextras - -RESOURCES += \ - boundingsphere.qrc diff --git a/tests/auto/render/boundingsphere/cube.qml b/tests/auto/render/boundingsphere/cube.qml index b023ccf0a..24eb6f96f 100644 --- a/tests/auto/render/boundingsphere/cube.qml +++ b/tests/auto/render/boundingsphere/cube.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/boundingsphere/sphere.qml b/tests/auto/render/boundingsphere/sphere.qml index e7fa9f5cc..2c69dfb5c 100644 --- a/tests/auto/render/boundingsphere/sphere.qml +++ b/tests/auto/render/boundingsphere/sphere.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp index 689bffc8f..a3ffb206c 100644 --- a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp +++ b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qmlscenereader.h" #include "testarbiter.h" diff --git a/tests/auto/render/boundingvolumedebug/CMakeLists.txt b/tests/auto/render/boundingvolumedebug/CMakeLists.txt index c62e84c20..d2e85c939 100644 --- a/tests/auto/render/boundingvolumedebug/CMakeLists.txt +++ b/tests/auto/render/boundingvolumedebug/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 8d7cd68a9..ec7bcdb68 100644 --- a/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp +++ b/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 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 <Qt3DRender/private/boundingvolumedebug_p.h> diff --git a/tests/auto/render/buffer/CMakeLists.txt b/tests/auto/render/buffer/CMakeLists.txt index f699cc977..3a0bf427c 100644 --- a/tests/auto/render/buffer/CMakeLists.txt +++ b/tests/auto/render/buffer/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 1b140209a..559da642e 100644 --- a/tests/auto/render/buffer/tst_buffer.cpp +++ b/tests/auto/render/buffer/tst_buffer.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 <qbackendnodetester.h> 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 d326d7a82..aa2fa8017 100644 --- a/tests/auto/render/commons/testaspect.cpp +++ b/tests/auto/render/commons/testaspect.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 "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 4c09962bc..44220194a 100644 --- a/tests/auto/render/commons/testaspect.h +++ b/tests/auto/render/commons/testaspect.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 TESTRENDERASPECT_H #define TESTRENDERASPECT_H diff --git a/tests/auto/render/commons/testrenderer.cpp b/tests/auto/render/commons/testrenderer.cpp index c3f600b4d..4751170cc 100644 --- a/tests/auto/render/commons/testrenderer.cpp +++ b/tests/auto/render/commons/testrenderer.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 "testrenderer.h" diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h index d2796bd5b..a5b42313d 100644 --- a/tests/auto/render/commons/testrenderer.h +++ b/tests/auto/render/commons/testrenderer.h @@ -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 #ifndef TESTRENDERER_H #define TESTRENDERER_H diff --git a/tests/auto/render/computecommand/CMakeLists.txt b/tests/auto/render/computecommand/CMakeLists.txt index c37e640c2..58aea8b44 100644 --- a/tests/auto/render/computecommand/CMakeLists.txt +++ b/tests/auto/render/computecommand/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 19a61d43b..f2c7984b8 100644 --- a/tests/auto/render/computecommand/tst_computecommand.cpp +++ b/tests/auto/render/computecommand/tst_computecommand.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> diff --git a/tests/auto/render/coordinatereader/CMakeLists.txt b/tests/auto/render/coordinatereader/CMakeLists.txt index 752be5c72..a0f037676 100644 --- a/tests/auto/render/coordinatereader/CMakeLists.txt +++ b/tests/auto/render/coordinatereader/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 ddd635ca6..b34c92955 100644 --- a/tests/auto/render/coordinatereader/tst_coordinatereader.cpp +++ b/tests/auto/render/coordinatereader/tst_coordinatereader.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <qbackendnodetester.h> diff --git a/tests/auto/render/ddstextures/CMakeLists.txt b/tests/auto/render/ddstextures/CMakeLists.txt index 41edc93be..7f6510aa5 100644 --- a/tests/auto/render/ddstextures/CMakeLists.txt +++ b/tests/auto/render/ddstextures/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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} 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 d689c13e0..884eb6e7b 100644 --- a/tests/auto/render/ddstextures/tst_ddstextures.cpp +++ b/tests/auto/render/ddstextures/tst_ddstextures.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 // 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 69d2f863f..7c4f4ad6c 100644 --- a/tests/auto/render/effect/CMakeLists.txt +++ b/tests/auto/render/effect/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 e788488b2..5a8e17ffa 100644 --- a/tests/auto/render/effect/tst_effect.cpp +++ b/tests/auto/render/effect/tst_effect.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> diff --git a/tests/auto/render/entity/CMakeLists.txt b/tests/auto/render/entity/CMakeLists.txt index 015bb91d6..0a7a24d6e 100644 --- a/tests/auto/render/entity/CMakeLists.txt +++ b/tests/auto/render/entity/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 1b18923db..81424b4d2 100644 --- a/tests/auto/render/entity/tst_entity.cpp +++ b/tests/auto/render/entity/tst_entity.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 <Qt3DRender/private/entity_p.h> diff --git a/tests/auto/render/filterentitybycomponent/CMakeLists.txt b/tests/auto/render/filterentitybycomponent/CMakeLists.txt index 01437da62..dc60bbb99 100644 --- a/tests/auto/render/filterentitybycomponent/CMakeLists.txt +++ b/tests/auto/render/filterentitybycomponent/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 28b1bf47f..3b3902620 100644 --- a/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp +++ b/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Paul Lemire -// 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> diff --git a/tests/auto/render/filterkey/CMakeLists.txt b/tests/auto/render/filterkey/CMakeLists.txt index 82c51be67..d29c92a38 100644 --- a/tests/auto/render/filterkey/CMakeLists.txt +++ b/tests/auto/render/filterkey/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 d3d7c4f3c..db4666203 100644 --- a/tests/auto/render/filterkey/tst_filterkey.cpp +++ b/tests/auto/render/filterkey/tst_filterkey.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> diff --git a/tests/auto/render/framegraphnode/CMakeLists.txt b/tests/auto/render/framegraphnode/CMakeLists.txt index 04a8a07bb..32a68652f 100644 --- a/tests/auto/render/framegraphnode/CMakeLists.txt +++ b/tests/auto/render/framegraphnode/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 d99627de1..269a7aee4 100644 --- a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp +++ b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 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 <Qt3DRender/private/framegraphnode_p.h> #include <QtTest/QTest> diff --git a/tests/auto/render/framegraphvisitor/CMakeLists.txt b/tests/auto/render/framegraphvisitor/CMakeLists.txt index a2cefc108..55e6a1268 100644 --- a/tests/auto/render/framegraphvisitor/CMakeLists.txt +++ b/tests/auto/render/framegraphvisitor/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 48708aef7..3e046646e 100644 --- a/tests/auto/render/framegraphvisitor/tst_framegraphvisitor.cpp +++ b/tests/auto/render/framegraphvisitor/tst_framegraphvisitor.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <QtTest/QTest> diff --git a/tests/auto/render/genericlambdajob/CMakeLists.txt b/tests/auto/render/genericlambdajob/CMakeLists.txt index bffc76263..705254770 100644 --- a/tests/auto/render/genericlambdajob/CMakeLists.txt +++ b/tests/auto/render/genericlambdajob/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 cb113091f..249068de7 100644 --- a/tests/auto/render/genericlambdajob/tst_genericlambdajob.cpp +++ b/tests/auto/render/genericlambdajob/tst_genericlambdajob.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Paul Lemire -// 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 <Qt3DRender/private/genericlambdajob_p.h> diff --git a/tests/auto/render/geometry/CMakeLists.txt b/tests/auto/render/geometry/CMakeLists.txt index dee9ab79e..db9d8cd05 100644 --- a/tests/auto/render/geometry/CMakeLists.txt +++ b/tests/auto/render/geometry/CMakeLists.txt @@ -9,6 +9,12 @@ ## 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 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 1e4d933fa..515b0e65f 100644 --- a/tests/auto/render/geometry/tst_geometry.cpp +++ b/tests/auto/render/geometry/tst_geometry.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 // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> diff --git a/tests/auto/render/geometryloaders/CMakeLists.txt b/tests/auto/render/geometryloaders/CMakeLists.txt index ad2c2ab6a..29414d64e 100644 --- a/tests/auto/render/geometryloaders/CMakeLists.txt +++ b/tests/auto/render/geometryloaders/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 a012e62a7..1bc80b290 100644 --- a/tests/auto/render/geometryloaders/tst_geometryloaders.cpp +++ b/tests/auto/render/geometryloaders/tst_geometryloaders.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd and/or its subsidiary(-ies). -// 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 <QtTest/qtest.h> diff --git a/tests/auto/render/geometryrenderer/CMakeLists.txt b/tests/auto/render/geometryrenderer/CMakeLists.txt index 6f5329780..71bfb59b8 100644 --- a/tests/auto/render/geometryrenderer/CMakeLists.txt +++ b/tests/auto/render/geometryrenderer/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 3c08fec5c..1e16ac41c 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.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 <qbackendnodetester.h> diff --git a/tests/auto/render/gltexture/CMakeLists.txt b/tests/auto/render/gltexture/CMakeLists.txt index 2bc4acb87..16f1dbee3 100644 --- a/tests/auto/render/gltexture/CMakeLists.txt +++ b/tests/auto/render/gltexture/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 564e80bf7..f8434d18b 100644 --- a/tests/auto/render/gltexture/tst_gltexture.cpp +++ b/tests/auto/render/gltexture/tst_gltexture.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 // 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 504d6fa61..79e5b354a 100644 --- a/tests/auto/render/gltfplugins/CMakeLists.txt +++ b/tests/auto/render/gltfplugins/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 4cb0cdb81..0ed38311f 100644 --- a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp +++ b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// 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 <QtTest/qtest.h> #include <QtCore/qtemporarydir.h> @@ -753,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) { @@ -766,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())); } } @@ -852,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 0a0e1daed..0d75de761 100644 --- a/tests/auto/render/joint/CMakeLists.txt +++ b/tests/auto/render/joint/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 7787b9d69..1fb068443 100644 --- a/tests/auto/render/joint/tst_joint.cpp +++ b/tests/auto/render/joint/tst_joint.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 <Qt3DRender/private/joint_p.h> diff --git a/tests/auto/render/ktxtextures/CMakeLists.txt b/tests/auto/render/ktxtextures/CMakeLists.txt index 511c8a582..0b86b625b 100644 --- a/tests/auto/render/ktxtextures/CMakeLists.txt +++ b/tests/auto/render/ktxtextures/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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} 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 91cc9586e..fc47651a4 100644 --- a/tests/auto/render/ktxtextures/tst_ktxtextures.cpp +++ b/tests/auto/render/ktxtextures/tst_ktxtextures.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 // 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 49ddb1af2..3f2b62d95 100644 --- a/tests/auto/render/layerfiltering/CMakeLists.txt +++ b/tests/auto/render/layerfiltering/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 92705c8dc..f3907d9a2 100644 --- a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp +++ b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Paul Lemire -// 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> diff --git a/tests/auto/render/levelofdetail/CMakeLists.txt b/tests/auto/render/levelofdetail/CMakeLists.txt index f32b8b813..1117f99de 100644 --- a/tests/auto/render/levelofdetail/CMakeLists.txt +++ b/tests/auto/render/levelofdetail/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 14905f0f3..c2bf83460 100644 --- a/tests/auto/render/levelofdetail/tst_levelofdetail.cpp +++ b/tests/auto/render/levelofdetail/tst_levelofdetail.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 <qbackendnodetester.h> diff --git a/tests/auto/render/loadscenejob/CMakeLists.txt b/tests/auto/render/loadscenejob/CMakeLists.txt index c0ee96e33..8858bbbff 100644 --- a/tests/auto/render/loadscenejob/CMakeLists.txt +++ b/tests/auto/render/loadscenejob/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 a77983f4b..cb0235749 100644 --- a/tests/auto/render/loadscenejob/tst_loadscenejob.cpp +++ b/tests/auto/render/loadscenejob/tst_loadscenejob.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 <Qt3DRender/private/scene_p.h> diff --git a/tests/auto/render/material/CMakeLists.txt b/tests/auto/render/material/CMakeLists.txt index 1dffa3c5e..ed64cf7f8 100644 --- a/tests/auto/render/material/CMakeLists.txt +++ b/tests/auto/render/material/CMakeLists.txt @@ -9,6 +9,12 @@ ## 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 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 33c6cb487..d406acf59 100644 --- a/tests/auto/render/material/tst_material.cpp +++ b/tests/auto/render/material/tst_material.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 <qbackendnodetester.h> diff --git a/tests/auto/render/memorybarrier/CMakeLists.txt b/tests/auto/render/memorybarrier/CMakeLists.txt index db1bbc8c4..d1ee544a8 100644 --- a/tests/auto/render/memorybarrier/CMakeLists.txt +++ b/tests/auto/render/memorybarrier/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 4323dace6..cc24e8da6 100644 --- a/tests/auto/render/memorybarrier/tst_memorybarrier.cpp +++ b/tests/auto/render/memorybarrier/tst_memorybarrier.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> diff --git a/tests/auto/render/meshfunctors/CMakeLists.txt b/tests/auto/render/meshfunctors/CMakeLists.txt index 35c991bf0..80d662309 100644 --- a/tests/auto/render/meshfunctors/CMakeLists.txt +++ b/tests/auto/render/meshfunctors/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 941385762..3aa43040f 100644 --- a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp +++ b/tests/auto/render/meshfunctors/tst_meshfunctors.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/qcomponent.h> diff --git a/tests/auto/render/objectpicker/CMakeLists.txt b/tests/auto/render/objectpicker/CMakeLists.txt index d317e7f35..4bdafcede 100644 --- a/tests/auto/render/objectpicker/CMakeLists.txt +++ b/tests/auto/render/objectpicker/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 a26e0b13a..70938faf1 100644 --- a/tests/auto/render/objectpicker/tst_objectpicker.cpp +++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 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 <qbackendnodetester.h> diff --git a/tests/auto/render/opengl/CMakeLists.txt b/tests/auto/render/opengl/CMakeLists.txt index 696d97bc0..778319a1d 100644 --- a/tests/auto/render/opengl/CMakeLists.txt +++ b/tests/auto/render/opengl/CMakeLists.txt @@ -5,9 +5,11 @@ 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) @@ -21,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/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 5b626f9f1..b9ccece1a 100644 --- a/tests/auto/render/opengl/computecommand/tst_computecommand.cpp +++ b/tests/auto/render/opengl/computecommand/tst_computecommand.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> 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 4a24ad34e..bac5512c3 100644 --- a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp +++ b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.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> 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 d0f09b2eb..44a273f1b 100644 --- a/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp +++ b/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.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 <glresourcemanagers_p.h> 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 806e4580f..27be8be3c 100644 --- a/tests/auto/render/opengl/gltexturemanager/tst_gltexturemanager.cpp +++ b/tests/auto/render/opengl/gltexturemanager/tst_gltexturemanager.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/QTest> #include <Qt3DRender/QTextureImageDataGenerator> 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 3c60f6e89..5299e3a46 100644 --- a/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp +++ b/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.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 <Qt3DRender/qrendertargetoutput.h> @@ -7,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> @@ -131,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; 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 70330a223..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,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 <Qt3DRender/qrendertargetoutput.h> @@ -7,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> @@ -185,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; } 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 18d3aa803..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,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 <Qt3DRender/qrendertargetoutput.h> @@ -7,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> @@ -185,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; } 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 cb7bcbaa8..d706f7e8a 100644 --- a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp +++ b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.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 <Qt3DRender/qrendertargetoutput.h> @@ -11,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) @@ -234,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; } @@ -906,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(); 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 a5cb05e43..f8d2ecdb6 100644 --- a/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp +++ b/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.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/qentity.h> 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/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 96b88f15e..b7af84ba6 100644 --- a/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp +++ b/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.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 <qgraphicsutils_p.h> 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 778b6060f..46c909a1e 100644 --- a/tests/auto/render/opengl/renderer/tst_renderer.cpp +++ b/tests/auto/render/opengl/renderer/tst_renderer.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 <QMutex> 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 26af34488..f6abfdf36 100644 --- a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp +++ b/tests/auto/render/opengl/renderqueue/tst_renderqueue.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 <QMutex> 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 058b99e7e..53848c340 100644 --- a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp +++ b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.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/qaspectjobmanager_p.h> 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 2aea1a5e2..f73a9e7db 100644 --- a/tests/auto/render/opengl/renderviews/tst_renderviews.cpp +++ b/tests/auto/render/opengl/renderviews/tst_renderviews.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 <qbackendnodetester.h> 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 ea97071b1..d6f3ce220 100644 --- a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp +++ b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.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 <qbackendnodetester.h> @@ -811,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/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 d5c38fd0c..72c09a342 100644 --- a/tests/auto/render/opengl/textures/tst_textures.cpp +++ b/tests/auto/render/opengl/textures/tst_textures.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 // 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 952ea9841..3d7a7c1b1 100644 --- a/tests/auto/render/parameter/CMakeLists.txt +++ b/tests/auto/render/parameter/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 ecceb84c5..77ad44515 100644 --- a/tests/auto/render/parameter/tst_parameter.cpp +++ b/tests/auto/render/parameter/tst_parameter.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 <Qt3DRender/qparameter.h> diff --git a/tests/auto/render/pickboundingvolumejob/CMakeLists.txt b/tests/auto/render/pickboundingvolumejob/CMakeLists.txt index 326e9438c..01f9b5d79 100644 --- a/tests/auto/render/pickboundingvolumejob/CMakeLists.txt +++ b/tests/auto/render/pickboundingvolumejob/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 acb31fbb4..03cd0ab13 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml b/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml index 485c3ad5c..ac9a712a2 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml index f8c9259b4..170057769 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml index 147e0b315..1b8e031b9 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml index 634d1e301..2294be884 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml index 879594e87..344e14f93 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml b/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml index 3b4b3ad2c..70ac60921 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_layerfilter.qml b/tests/auto/render/pickboundingvolumejob/testscene_layerfilter.qml index 86bc4ce4b..23b3e17e2 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_layerfilter.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_layerfilter.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_nested_layerfilter.qml b/tests/auto/render/pickboundingvolumejob/testscene_nested_layerfilter.qml index c5b28fc72..806586d15 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_nested_layerfilter.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_nested_layerfilter.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml b/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml index 2557a19ff..c3b27a7fd 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.14 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml b/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml index 5e1be6811..9fc0c1cc8 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml index f31d2de3b..540fa34db 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml b/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml index cb76c6513..d72c66cb6 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.13 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml b/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml index 56adbca92..3d7526711 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.0 diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp index 743af3264..ed748b8c7 100644 --- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp +++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qmlscenereader.h" #include "testarbiter.h" diff --git a/tests/auto/render/picking/CMakeLists.txt b/tests/auto/render/picking/CMakeLists.txt index ad53a1864..0c031aba1 100644 --- a/tests/auto/render/picking/CMakeLists.txt +++ b/tests/auto/render/picking/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 cae541078..268a06bb4 100644 --- a/tests/auto/render/picking/tst_picking.cpp +++ b/tests/auto/render/picking/tst_picking.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/qentity.h> diff --git a/tests/auto/render/proximityfilter/CMakeLists.txt b/tests/auto/render/proximityfilter/CMakeLists.txt index 42316703b..5cc440911 100644 --- a/tests/auto/render/proximityfilter/CMakeLists.txt +++ b/tests/auto/render/proximityfilter/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 9d759f331..4a71af946 100644 --- a/tests/auto/render/proximityfilter/tst_proximityfilter.cpp +++ b/tests/auto/render/proximityfilter/tst_proximityfilter.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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> diff --git a/tests/auto/render/proximityfiltering/CMakeLists.txt b/tests/auto/render/proximityfiltering/CMakeLists.txt index dc6302057..39f1fcc55 100644 --- a/tests/auto/render/proximityfiltering/CMakeLists.txt +++ b/tests/auto/render/proximityfiltering/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 3447c8b84..45dcf3049 100644 --- a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp +++ b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Paul Lemire -// 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> diff --git a/tests/auto/render/qabstractlight/CMakeLists.txt b/tests/auto/render/qabstractlight/CMakeLists.txt index 385a8619f..4bab67818 100644 --- a/tests/auto/render/qabstractlight/CMakeLists.txt +++ b/tests/auto/render/qabstractlight/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 b1870539e..1efb83711 100644 --- a/tests/auto/render/qabstractlight/tst_qabstractlight.cpp +++ b/tests/auto/render/qabstractlight/tst_qabstractlight.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 <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qabstracttexture/CMakeLists.txt b/tests/auto/render/qabstracttexture/CMakeLists.txt index 8779a4436..9b7f3d960 100644 --- a/tests/auto/render/qabstracttexture/CMakeLists.txt +++ b/tests/auto/render/qabstracttexture/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 d72f72031..f4398f5fb 100644 --- a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp +++ b/tests/auto/render/qabstracttexture/tst_qabstracttexture.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 <Qt3DRender/qabstracttexture.h> diff --git a/tests/auto/render/qabstracttextureimage/CMakeLists.txt b/tests/auto/render/qabstracttextureimage/CMakeLists.txt index 4dc8e57f6..20e78bbfa 100644 --- a/tests/auto/render/qabstracttextureimage/CMakeLists.txt +++ b/tests/auto/render/qabstracttextureimage/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 c8373962c..2e479330d 100644 --- a/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp +++ b/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.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> diff --git a/tests/auto/render/qattribute/CMakeLists.txt b/tests/auto/render/qattribute/CMakeLists.txt index a68cfef50..3a09ed89d 100644 --- a/tests/auto/render/qattribute/CMakeLists.txt +++ b/tests/auto/render/qattribute/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 dea5e3bda..3e9ed3381 100644 --- a/tests/auto/render/qattribute/tst_qattribute.cpp +++ b/tests/auto/render/qattribute/tst_qattribute.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/qnode_p.h> diff --git a/tests/auto/render/qblitframebuffer/CMakeLists.txt b/tests/auto/render/qblitframebuffer/CMakeLists.txt index 2f94dccce..4d92fceb0 100644 --- a/tests/auto/render/qblitframebuffer/CMakeLists.txt +++ b/tests/auto/render/qblitframebuffer/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 247b4c92b..38845f809 100644 --- a/tests/auto/render/qblitframebuffer/tst_qblitframebuffer.cpp +++ b/tests/auto/render/qblitframebuffer/tst_qblitframebuffer.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/qnode_p.h> diff --git a/tests/auto/render/qboundingvolumedebug/CMakeLists.txt b/tests/auto/render/qboundingvolumedebug/CMakeLists.txt index ea7db343d..07eb9c7aa 100644 --- a/tests/auto/render/qboundingvolumedebug/CMakeLists.txt +++ b/tests/auto/render/qboundingvolumedebug/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 f367525cb..499c83368 100644 --- a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp +++ b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.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/QEntity> diff --git a/tests/auto/render/qbuffer/CMakeLists.txt b/tests/auto/render/qbuffer/CMakeLists.txt index 1ac351080..4138145fd 100644 --- a/tests/auto/render/qbuffer/CMakeLists.txt +++ b/tests/auto/render/qbuffer/CMakeLists.txt @@ -9,6 +9,12 @@ ## 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 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 46e1f9090..235f01ea1 100644 --- a/tests/auto/render/qbuffer/tst_qbuffer.cpp +++ b/tests/auto/render/qbuffer/tst_qbuffer.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/qnode_p.h> diff --git a/tests/auto/render/qcamera/CMakeLists.txt b/tests/auto/render/qcamera/CMakeLists.txt index b399f8eab..fa1c86a4b 100644 --- a/tests/auto/render/qcamera/CMakeLists.txt +++ b/tests/auto/render/qcamera/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 1fa65817c..a8486ad06 100644 --- a/tests/auto/render/qcamera/tst_qcamera.cpp +++ b/tests/auto/render/qcamera/tst_qcamera.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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> diff --git a/tests/auto/render/qcameralens/CMakeLists.txt b/tests/auto/render/qcameralens/CMakeLists.txt index 55fc5b8ad..75be5baea 100644 --- a/tests/auto/render/qcameralens/CMakeLists.txt +++ b/tests/auto/render/qcameralens/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 2779284c8..d429c72a8 100644 --- a/tests/auto/render/qcameralens/tst_qcameralens.cpp +++ b/tests/auto/render/qcameralens/tst_qcameralens.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> diff --git a/tests/auto/render/qcameraselector/CMakeLists.txt b/tests/auto/render/qcameraselector/CMakeLists.txt index 32f18c545..3d4931347 100644 --- a/tests/auto/render/qcameraselector/CMakeLists.txt +++ b/tests/auto/render/qcameraselector/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 5321621ec..a439be92c 100644 --- a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp +++ b/tests/auto/render/qcameraselector/tst_qcameraselector.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/qnode_p.h> diff --git a/tests/auto/render/qclearbuffers/CMakeLists.txt b/tests/auto/render/qclearbuffers/CMakeLists.txt index 38567757b..1a22194c8 100644 --- a/tests/auto/render/qclearbuffers/CMakeLists.txt +++ b/tests/auto/render/qclearbuffers/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 0327508f4..96f2c0bac 100644 --- a/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp +++ b/tests/auto/render/qclearbuffers/tst_qclearbuffers.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/qnode_p.h> diff --git a/tests/auto/render/qcomputecommand/CMakeLists.txt b/tests/auto/render/qcomputecommand/CMakeLists.txt index ee0d97320..1e131f825 100644 --- a/tests/auto/render/qcomputecommand/CMakeLists.txt +++ b/tests/auto/render/qcomputecommand/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 cd752932c..cb47f7c2f 100644 --- a/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp +++ b/tests/auto/render/qcomputecommand/tst_qcomputecommand.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> diff --git a/tests/auto/render/qdispatchcompute/CMakeLists.txt b/tests/auto/render/qdispatchcompute/CMakeLists.txt index 26f388aa1..2bef1a9ea 100644 --- a/tests/auto/render/qdispatchcompute/CMakeLists.txt +++ b/tests/auto/render/qdispatchcompute/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 21165f370..cbb323d5b 100644 --- a/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp +++ b/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.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> diff --git a/tests/auto/render/qeffect/CMakeLists.txt b/tests/auto/render/qeffect/CMakeLists.txt index 1fe454b8f..967dabb3e 100644 --- a/tests/auto/render/qeffect/CMakeLists.txt +++ b/tests/auto/render/qeffect/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 3b7d7ca15..4e9feb671 100644 --- a/tests/auto/render/qeffect/tst_qeffect.cpp +++ b/tests/auto/render/qeffect/tst_qeffect.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> diff --git a/tests/auto/render/qenvironmentlight/CMakeLists.txt b/tests/auto/render/qenvironmentlight/CMakeLists.txt index a2c79b7a7..2aa7ce352 100644 --- a/tests/auto/render/qenvironmentlight/CMakeLists.txt +++ b/tests/auto/render/qenvironmentlight/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 88b1ac104..a350f42d7 100644 --- a/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp +++ b/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.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 <QSignalSpy> diff --git a/tests/auto/render/qfilterkey/CMakeLists.txt b/tests/auto/render/qfilterkey/CMakeLists.txt index f1745aa02..d011adf8f 100644 --- a/tests/auto/render/qfilterkey/CMakeLists.txt +++ b/tests/auto/render/qfilterkey/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 2c9f7b36f..3f66682bf 100644 --- a/tests/auto/render/qfilterkey/tst_qfilterkey.cpp +++ b/tests/auto/render/qfilterkey/tst_qfilterkey.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> diff --git a/tests/auto/render/qframegraphnode/CMakeLists.txt b/tests/auto/render/qframegraphnode/CMakeLists.txt index 4604bf41e..b78023810 100644 --- a/tests/auto/render/qframegraphnode/CMakeLists.txt +++ b/tests/auto/render/qframegraphnode/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 f4c419dd4..eb44b3a7d 100644 --- a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp +++ b/tests/auto/render/qframegraphnode/tst_qframegraphnode.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/qnode_p.h> diff --git a/tests/auto/render/qgeometry/CMakeLists.txt b/tests/auto/render/qgeometry/CMakeLists.txt index d4b0e6f97..9d48fbcf7 100644 --- a/tests/auto/render/qgeometry/CMakeLists.txt +++ b/tests/auto/render/qgeometry/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 43aa915d7..798a8e1ea 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.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/qnode_p.h> diff --git a/tests/auto/render/qgeometryrenderer/CMakeLists.txt b/tests/auto/render/qgeometryrenderer/CMakeLists.txt index 6160d7958..82b5c03b9 100644 --- a/tests/auto/render/qgeometryrenderer/CMakeLists.txt +++ b/tests/auto/render/qgeometryrenderer/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 22d287e24..53188f391 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.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/qnode_p.h> diff --git a/tests/auto/render/qgraphicsapifilter/CMakeLists.txt b/tests/auto/render/qgraphicsapifilter/CMakeLists.txt index 7a9f8758e..d980431a9 100644 --- a/tests/auto/render/qgraphicsapifilter/CMakeLists.txt +++ b/tests/auto/render/qgraphicsapifilter/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 f7240eb7f..4a92c9d94 100644 --- a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp +++ b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.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 <QObject> diff --git a/tests/auto/render/qlayerfilter/CMakeLists.txt b/tests/auto/render/qlayerfilter/CMakeLists.txt index fdd85aa01..de1dab7b3 100644 --- a/tests/auto/render/qlayerfilter/CMakeLists.txt +++ b/tests/auto/render/qlayerfilter/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 5731b9fb7..cdf3a1c25 100644 --- a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp +++ b/tests/auto/render/qlayerfilter/tst_qlayerfilter.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/qnode_p.h> diff --git a/tests/auto/render/qlevelofdetail/CMakeLists.txt b/tests/auto/render/qlevelofdetail/CMakeLists.txt index 88f401786..a3c186d61 100644 --- a/tests/auto/render/qlevelofdetail/CMakeLists.txt +++ b/tests/auto/render/qlevelofdetail/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 dc741df43..72645df60 100644 --- a/tests/auto/render/qlevelofdetail/tst_qlevelofdetail.cpp +++ b/tests/auto/render/qlevelofdetail/tst_qlevelofdetail.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/private/qnode_p.h> diff --git a/tests/auto/render/qmaterial/CMakeLists.txt b/tests/auto/render/qmaterial/CMakeLists.txt index fcbee1045..19b0ff61a 100644 --- a/tests/auto/render/qmaterial/CMakeLists.txt +++ b/tests/auto/render/qmaterial/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 65e72f799..ba36f41ba 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.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/qnode_p.h> diff --git a/tests/auto/render/qmemorybarrier/CMakeLists.txt b/tests/auto/render/qmemorybarrier/CMakeLists.txt index f69554b4b..ef9eabd60 100644 --- a/tests/auto/render/qmemorybarrier/CMakeLists.txt +++ b/tests/auto/render/qmemorybarrier/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 71e74d785..edb6d31a9 100644 --- a/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp +++ b/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.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> diff --git a/tests/auto/render/qmesh/CMakeLists.txt b/tests/auto/render/qmesh/CMakeLists.txt index f607df415..0ff1c8bad 100644 --- a/tests/auto/render/qmesh/CMakeLists.txt +++ b/tests/auto/render/qmesh/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 6dad93483..598cb840b 100644 --- a/tests/auto/render/qmesh/tst_qmesh.cpp +++ b/tests/auto/render/qmesh/tst_qmesh.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 // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> @@ -8,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> @@ -88,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*>(0xdeadbeefL); - Qt3DCore::QScene *scene = new Qt3DCore::QScene(engine); + arbiter.setArbiterOnNode(&mesh); Qt3DCore::QNodePrivate *meshd = Qt3DCore::QNodePrivate::get(&mesh); meshd->setScene(scene); QCoreApplication::processEvents(); @@ -125,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*>(0xdeadbeefL); - 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 8855ae146..e6da809c9 100644 --- a/tests/auto/render/qmlscenereader/qmlscenereader.cpp +++ b/tests/auto/render/qmlscenereader/qmlscenereader.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 "qmlscenereader.h" #include <QQmlEngine> diff --git a/tests/auto/render/qmlscenereader/qmlscenereader.h b/tests/auto/render/qmlscenereader/qmlscenereader.h index e53ce0e97..f9b2d79b7 100644 --- a/tests/auto/render/qmlscenereader/qmlscenereader.h +++ b/tests/auto/render/qmlscenereader/qmlscenereader.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 QMLSCENEREADER_H #define QMLSCENEREADER_H 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 03658efcd..2127bd489 100644 --- a/tests/auto/render/qobjectpicker/CMakeLists.txt +++ b/tests/auto/render/qobjectpicker/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 a3774fe13..5f34f9382 100644 --- a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp +++ b/tests/auto/render/qobjectpicker/tst_qobjectpicker.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 <QtTest/QSignalSpy> diff --git a/tests/auto/render/qparameter/CMakeLists.txt b/tests/auto/render/qparameter/CMakeLists.txt index fbf4c4b0f..bc1d98872 100644 --- a/tests/auto/render/qparameter/CMakeLists.txt +++ b/tests/auto/render/qparameter/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 5511cc7ad..38bae4dc0 100644 --- a/tests/auto/render/qparameter/tst_qparameter.cpp +++ b/tests/auto/render/qparameter/tst_qparameter.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 <Qt3DRender/qparameter.h> diff --git a/tests/auto/render/qproximityfilter/CMakeLists.txt b/tests/auto/render/qproximityfilter/CMakeLists.txt index ef71898ef..b453a6eb8 100644 --- a/tests/auto/render/qproximityfilter/CMakeLists.txt +++ b/tests/auto/render/qproximityfilter/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 b47d1de1f..5006efc70 100644 --- a/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp +++ b/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <Qt3DRender/qproximityfilter.h> diff --git a/tests/auto/render/qray3d/CMakeLists.txt b/tests/auto/render/qray3d/CMakeLists.txt index ed2cc6970..21863a119 100644 --- a/tests/auto/render/qray3d/CMakeLists.txt +++ b/tests/auto/render/qray3d/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qray3d Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qray3d LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qray3d SOURCES tst_qray3d.cpp diff --git a/tests/auto/render/qray3d/qray3d.pro b/tests/auto/render/qray3d/qray3d.pro deleted file mode 100644 index 6714b066e..000000000 --- a/tests/auto/render/qray3d/qray3d.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qray3d -CONFIG += testcase -TEMPLATE = app - -SOURCES += \ - tst_qray3d.cpp - -QT += testlib core-private 3dcore 3dcore-private 3drender 3drender-private diff --git a/tests/auto/render/qray3d/tst_qray3d.cpp b/tests/auto/render/qray3d/tst_qray3d.cpp index 874d4c95a..29f0c644b 100644 --- a/tests/auto/render/qray3d/tst_qray3d.cpp +++ b/tests/auto/render/qray3d/tst_qray3d.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <Qt3DRender/private/qray3d_p.h> @@ -492,11 +492,7 @@ void tst_QRay3D::properties() void tst_QRay3D::metaTypes() { int id = qMetaTypeId<Qt3DRender::RayCasting::QRay3D>(); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QVERIFY(QMetaType::fromName("Qt3DRender::RayCasting::QRay3D").id() == id); -#else - QVERIFY(QMetaType::type("Qt3DRender::RayCasting::QRay3D") == id); -#endif QCOMPARE(QByteArray(QMetaType(id).name()), QByteArray("Qt3DRender::RayCasting::QRay3D")); QVERIFY(QMetaType::isRegistered(id)); } diff --git a/tests/auto/render/qraycaster/CMakeLists.txt b/tests/auto/render/qraycaster/CMakeLists.txt index aefebb162..f1d936b54 100644 --- a/tests/auto/render/qraycaster/CMakeLists.txt +++ b/tests/auto/render/qraycaster/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 9cb4521b3..f4a5e3400 100644 --- a/tests/auto/render/qraycaster/tst_qraycaster.cpp +++ b/tests/auto/render/qraycaster/tst_qraycaster.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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> diff --git a/tests/auto/render/qrendercapture/CMakeLists.txt b/tests/auto/render/qrendercapture/CMakeLists.txt index a908f08a7..e22876398 100644 --- a/tests/auto/render/qrendercapture/CMakeLists.txt +++ b/tests/auto/render/qrendercapture/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 12602d875..e4e82921b 100644 --- a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp +++ b/tests/auto/render/qrendercapture/tst_qrendercapture.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 <QtTest/QSignalSpy> diff --git a/tests/auto/render/qrenderpass/CMakeLists.txt b/tests/auto/render/qrenderpass/CMakeLists.txt index f6f46bb00..e7a1773d4 100644 --- a/tests/auto/render/qrenderpass/CMakeLists.txt +++ b/tests/auto/render/qrenderpass/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 65613ec59..2e93ec237 100644 --- a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp +++ b/tests/auto/render/qrenderpass/tst_qrenderpass.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> diff --git a/tests/auto/render/qrenderpassfilter/CMakeLists.txt b/tests/auto/render/qrenderpassfilter/CMakeLists.txt index d9ac4a0b1..9c1bcf2e3 100644 --- a/tests/auto/render/qrenderpassfilter/CMakeLists.txt +++ b/tests/auto/render/qrenderpassfilter/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 e4a6cc600..3cd621bcb 100644 --- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp +++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.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/qnode_p.h> diff --git a/tests/auto/render/qrendersettings/CMakeLists.txt b/tests/auto/render/qrendersettings/CMakeLists.txt index bc34b60b0..5bf8ae811 100644 --- a/tests/auto/render/qrendersettings/CMakeLists.txt +++ b/tests/auto/render/qrendersettings/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 5d2109dd0..748f2fd19 100644 --- a/tests/auto/render/qrendersettings/tst_qrendersettings.cpp +++ b/tests/auto/render/qrendersettings/tst_qrendersettings.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> diff --git a/tests/auto/render/qrenderstate/CMakeLists.txt b/tests/auto/render/qrenderstate/CMakeLists.txt index 4bac23fb4..db5cff150 100644 --- a/tests/auto/render/qrenderstate/CMakeLists.txt +++ b/tests/auto/render/qrenderstate/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 93a6b7f7f..52b4d481a 100644 --- a/tests/auto/render/qrenderstate/tst_qrenderstate.cpp +++ b/tests/auto/render/qrenderstate/tst_qrenderstate.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 <qbackendnodetester.h> diff --git a/tests/auto/render/qrenderstateset/CMakeLists.txt b/tests/auto/render/qrenderstateset/CMakeLists.txt index 57989def6..eb0648378 100644 --- a/tests/auto/render/qrenderstateset/CMakeLists.txt +++ b/tests/auto/render/qrenderstateset/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 63092e17c..25f638136 100644 --- a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp +++ b/tests/auto/render/qrenderstateset/tst_qrenderstateset.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/qnode_p.h> diff --git a/tests/auto/render/qrendersurfaceselector/CMakeLists.txt b/tests/auto/render/qrendersurfaceselector/CMakeLists.txt index 15befdada..140981906 100644 --- a/tests/auto/render/qrendersurfaceselector/CMakeLists.txt +++ b/tests/auto/render/qrendersurfaceselector/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 565c31b86..26309450b 100644 --- a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp +++ b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.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/qentity.h> diff --git a/tests/auto/render/qrendertarget/CMakeLists.txt b/tests/auto/render/qrendertarget/CMakeLists.txt index 29dc85a1f..69f98e8a8 100644 --- a/tests/auto/render/qrendertarget/CMakeLists.txt +++ b/tests/auto/render/qrendertarget/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 32c78fc80..afc9d1973 100644 --- a/tests/auto/render/qrendertarget/tst_qrendertarget.cpp +++ b/tests/auto/render/qrendertarget/tst_qrendertarget.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 <Qt3DRender/qrendertarget.h> diff --git a/tests/auto/render/qrendertargetoutput/CMakeLists.txt b/tests/auto/render/qrendertargetoutput/CMakeLists.txt index b4af0c858..ad555b718 100644 --- a/tests/auto/render/qrendertargetoutput/CMakeLists.txt +++ b/tests/auto/render/qrendertargetoutput/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 c54ef1a6c..e70382dfa 100644 --- a/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp +++ b/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.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 <QObject> diff --git a/tests/auto/render/qrendertargetselector/CMakeLists.txt b/tests/auto/render/qrendertargetselector/CMakeLists.txt index e3f836419..74d759d48 100644 --- a/tests/auto/render/qrendertargetselector/CMakeLists.txt +++ b/tests/auto/render/qrendertargetselector/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 34a6355d0..645cda011 100644 --- a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp +++ b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.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/qnode_p.h> diff --git a/tests/auto/render/qscene2d/CMakeLists.txt b/tests/auto/render/qscene2d/CMakeLists.txt index 3c50b2563..d84583007 100644 --- a/tests/auto/render/qscene2d/CMakeLists.txt +++ b/tests/auto/render/qscene2d/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 f39f1e983..6a48d596f 100644 --- a/tests/auto/render/qscene2d/tst_qscene2d.cpp +++ b/tests/auto/render/qscene2d/tst_qscene2d.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <Qt3DQuickScene2D/qscene2d.h> diff --git a/tests/auto/render/qsceneloader/CMakeLists.txt b/tests/auto/render/qsceneloader/CMakeLists.txt index 4a1957b01..345976078 100644 --- a/tests/auto/render/qsceneloader/CMakeLists.txt +++ b/tests/auto/render/qsceneloader/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 f4f138268..8a3d23563 100644 --- a/tests/auto/render/qsceneloader/tst_qsceneloader.cpp +++ b/tests/auto/render/qsceneloader/tst_qsceneloader.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/qentity.h> diff --git a/tests/auto/render/qscreenraycaster/CMakeLists.txt b/tests/auto/render/qscreenraycaster/CMakeLists.txt index 9dc9946e2..317552c53 100644 --- a/tests/auto/render/qscreenraycaster/CMakeLists.txt +++ b/tests/auto/render/qscreenraycaster/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 fd868abf8..f54ff2344 100644 --- a/tests/auto/render/qscreenraycaster/tst_qscreenraycaster.cpp +++ b/tests/auto/render/qscreenraycaster/tst_qscreenraycaster.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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> diff --git a/tests/auto/render/qsetfence/CMakeLists.txt b/tests/auto/render/qsetfence/CMakeLists.txt index aa8fe6d4e..849c80e4c 100644 --- a/tests/auto/render/qsetfence/CMakeLists.txt +++ b/tests/auto/render/qsetfence/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 7160478b6..392b34f81 100644 --- a/tests/auto/render/qsetfence/tst_qsetfence.cpp +++ b/tests/auto/render/qsetfence/tst_qsetfence.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 <QtTest/QTest> #include <Qt3DRender/qsetfence.h> diff --git a/tests/auto/render/qshaderimage/CMakeLists.txt b/tests/auto/render/qshaderimage/CMakeLists.txt index 8530e09ca..5275b5daf 100644 --- a/tests/auto/render/qshaderimage/CMakeLists.txt +++ b/tests/auto/render/qshaderimage/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 3b19aa588..2b5295ac4 100644 --- a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp +++ b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 <QtTest/QTest> #include <Qt3DRender/qshaderimage.h> diff --git a/tests/auto/render/qshaderprogram/CMakeLists.txt b/tests/auto/render/qshaderprogram/CMakeLists.txt index 87c890d0e..3c0b013f0 100644 --- a/tests/auto/render/qshaderprogram/CMakeLists.txt +++ b/tests/auto/render/qshaderprogram/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 1db1b51e5..cf096bf9a 100644 --- a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp +++ b/tests/auto/render/qshaderprogram/tst_qshaderprogram.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 <Qt3DRender/qshaderprogram.h> diff --git a/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt b/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt index 2d970ea01..1e682b37c 100644 --- a/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt +++ b/tests/auto/render/qshaderprogrambuilder/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 eef50d510..eddb56b52 100644 --- a/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp +++ b/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.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/render/qsharedgltexture/CMakeLists.txt b/tests/auto/render/qsharedgltexture/CMakeLists.txt index 44a448dd5..cfda90503 100644 --- a/tests/auto/render/qsharedgltexture/CMakeLists.txt +++ b/tests/auto/render/qsharedgltexture/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 153f7d32d..f95988f0b 100644 --- a/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp +++ b/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> diff --git a/tests/auto/render/qsortpolicy/CMakeLists.txt b/tests/auto/render/qsortpolicy/CMakeLists.txt index 92984ec57..af6701103 100644 --- a/tests/auto/render/qsortpolicy/CMakeLists.txt +++ b/tests/auto/render/qsortpolicy/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 6a0e59047..72a8c1cf1 100644 --- a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp +++ b/tests/auto/render/qsortpolicy/tst_qsortpolicy.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/qnode_p.h> diff --git a/tests/auto/render/qtechnique/CMakeLists.txt b/tests/auto/render/qtechnique/CMakeLists.txt index 23efefb1e..527c599c4 100644 --- a/tests/auto/render/qtechnique/CMakeLists.txt +++ b/tests/auto/render/qtechnique/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 0b04e668e..819a27b2d 100644 --- a/tests/auto/render/qtechnique/tst_qtechnique.cpp +++ b/tests/auto/render/qtechnique/tst_qtechnique.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> diff --git a/tests/auto/render/qtechniquefilter/CMakeLists.txt b/tests/auto/render/qtechniquefilter/CMakeLists.txt index 731c8cf94..f4722e093 100644 --- a/tests/auto/render/qtechniquefilter/CMakeLists.txt +++ b/tests/auto/render/qtechniquefilter/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 fd6d5ebb9..035ecb428 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.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/qnode_p.h> diff --git a/tests/auto/render/qtexturedataupdate/CMakeLists.txt b/tests/auto/render/qtexturedataupdate/CMakeLists.txt index 63e281089..455cf8a3c 100644 --- a/tests/auto/render/qtexturedataupdate/CMakeLists.txt +++ b/tests/auto/render/qtexturedataupdate/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 08354aca5..be978dd8b 100644 --- a/tests/auto/render/qtexturedataupdate/tst_qtexturedataupdate.cpp +++ b/tests/auto/render/qtexturedataupdate/tst_qtexturedataupdate.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 <Qt3DRender/qtexturedataupdate.h> diff --git a/tests/auto/render/qtextureimage/CMakeLists.txt b/tests/auto/render/qtextureimage/CMakeLists.txt index d14d05470..f7a6995e2 100644 --- a/tests/auto/render/qtextureimage/CMakeLists.txt +++ b/tests/auto/render/qtextureimage/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 76705de6f..e10587a40 100644 --- a/tests/auto/render/qtextureimage/tst_qtextureimage.cpp +++ b/tests/auto/render/qtextureimage/tst_qtextureimage.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 // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> diff --git a/tests/auto/render/qtextureimagedata/CMakeLists.txt b/tests/auto/render/qtextureimagedata/CMakeLists.txt index ebbf7d9b3..32bfe1402 100644 --- a/tests/auto/render/qtextureimagedata/CMakeLists.txt +++ b/tests/auto/render/qtextureimagedata/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 9056f9fdf..d21b8ceb7 100644 --- a/tests/auto/render/qtextureimagedata/tst_qtextureimagedata.cpp +++ b/tests/auto/render/qtextureimagedata/tst_qtextureimagedata.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> diff --git a/tests/auto/render/qtextureloader/CMakeLists.txt b/tests/auto/render/qtextureloader/CMakeLists.txt index a62f4f199..35f4ebfc5 100644 --- a/tests/auto/render/qtextureloader/CMakeLists.txt +++ b/tests/auto/render/qtextureloader/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 6d41a0e0c..a2c58debc 100644 --- a/tests/auto/render/qtextureloader/tst_qtextureloader.cpp +++ b/tests/auto/render/qtextureloader/tst_qtextureloader.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 // TODO Remove in Qt6 #include <QtCore/qcompilerdetection.h> diff --git a/tests/auto/render/qviewport/CMakeLists.txt b/tests/auto/render/qviewport/CMakeLists.txt index 4465f9423..40609c7c3 100644 --- a/tests/auto/render/qviewport/CMakeLists.txt +++ b/tests/auto/render/qviewport/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 4879bb01e..13cb4c91b 100644 --- a/tests/auto/render/qviewport/tst_qviewport.cpp +++ b/tests/auto/render/qviewport/tst_qviewport.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/qnode_p.h> diff --git a/tests/auto/render/qwaitfence/CMakeLists.txt b/tests/auto/render/qwaitfence/CMakeLists.txt index 24cefeb27..bff569c93 100644 --- a/tests/auto/render/qwaitfence/CMakeLists.txt +++ b/tests/auto/render/qwaitfence/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 f52141626..535513f57 100644 --- a/tests/auto/render/qwaitfence/tst_qwaitfence.cpp +++ b/tests/auto/render/qwaitfence/tst_qwaitfence.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 <QtTest/QTest> diff --git a/tests/auto/render/raycaster/CMakeLists.txt b/tests/auto/render/raycaster/CMakeLists.txt index 9cc84d765..16a30fad5 100644 --- a/tests/auto/render/raycaster/CMakeLists.txt +++ b/tests/auto/render/raycaster/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 3e120a695..c0a057216 100644 --- a/tests/auto/render/raycaster/tst_raycaster.cpp +++ b/tests/auto/render/raycaster/tst_raycaster.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 <qbackendnodetester.h> diff --git a/tests/auto/render/raycasting/CMakeLists.txt b/tests/auto/render/raycasting/CMakeLists.txt index f63c8a94d..fbde0ee9d 100644 --- a/tests/auto/render/raycasting/CMakeLists.txt +++ b/tests/auto/render/raycasting/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 359404817..30f2ef61e 100644 --- a/tests/auto/render/raycasting/tst_raycasting.cpp +++ b/tests/auto/render/raycasting/tst_raycasting.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 <Qt3DRender/private/entity_p.h> diff --git a/tests/auto/render/raycastingjob/CMakeLists.txt b/tests/auto/render/raycastingjob/CMakeLists.txt index 0cc2c304b..5bbd5e326 100644 --- a/tests/auto/render/raycastingjob/CMakeLists.txt +++ b/tests/auto/render/raycastingjob/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 bf464eb3e..1aa2f3254 100644 --- a/tests/auto/render/raycastingjob/testscene_screenraycasting.qml +++ b/tests/auto/render/raycastingjob/testscene_screenraycasting.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import 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 23ac01394..dc5bf9a55 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycasting.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycasting.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import 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 ef4f06729..22a3e1337 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import 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 29e8194da..3fb376200 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import 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 b636ec68e..402044821 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import 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 db41614a9..37d415299 100644 --- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp +++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qmlscenereader.h" #include "testarbiter.h" 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 0766a5cf8..71a3346ed 100644 --- a/tests/auto/render/rendercapture/CMakeLists.txt +++ b/tests/auto/render/rendercapture/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 497fce8fc..550aae03f 100644 --- a/tests/auto/render/rendercapture/tst_rendercapture.cpp +++ b/tests/auto/render/rendercapture/tst_rendercapture.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 <qbackendnodetester.h> diff --git a/tests/auto/render/renderpass/CMakeLists.txt b/tests/auto/render/renderpass/CMakeLists.txt index 8a1d5731a..b0f785015 100644 --- a/tests/auto/render/renderpass/CMakeLists.txt +++ b/tests/auto/render/renderpass/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 b447fdce1..3c3f29fe3 100644 --- a/tests/auto/render/renderpass/tst_renderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.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 <qbackendnodetester.h> diff --git a/tests/auto/render/rendertarget/CMakeLists.txt b/tests/auto/render/rendertarget/CMakeLists.txt index 0ba286d3a..6f9856ece 100644 --- a/tests/auto/render/rendertarget/CMakeLists.txt +++ b/tests/auto/render/rendertarget/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 36d67d975..16bb10b66 100644 --- a/tests/auto/render/rendertarget/tst_rendertarget.cpp +++ b/tests/auto/render/rendertarget/tst_rendertarget.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> 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 b9c27a8a5..a9fb75aba 100644 --- a/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 66bc48f3b..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,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/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 586814525..6a4a424c4 100644 --- a/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 1dda4411d..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,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/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 d17f0260d..e6d2e8f72 100644 --- a/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 6ea5781bf..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,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/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/scene2d/CMakeLists.txt b/tests/auto/render/scene2d/CMakeLists.txt index 291f23bd5..0dd1058b6 100644 --- a/tests/auto/render/scene2d/CMakeLists.txt +++ b/tests/auto/render/scene2d/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 997b96d0d..95f30ad9a 100644 --- a/tests/auto/render/scene2d/tst_scene2d.cpp +++ b/tests/auto/render/scene2d/tst_scene2d.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <Qt3DQuickScene2D/qscene2d.h> @@ -42,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 fc741eb57..5605978bb 100644 --- a/tests/auto/render/sceneloader/CMakeLists.txt +++ b/tests/auto/render/sceneloader/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 8598b563f..3ff477520 100644 --- a/tests/auto/render/sceneloader/tst_sceneloader.cpp +++ b/tests/auto/render/sceneloader/tst_sceneloader.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 <qbackendnodetester.h> diff --git a/tests/auto/render/segmentvisitor/CMakeLists.txt b/tests/auto/render/segmentvisitor/CMakeLists.txt index e25b7b015..19c4f3c0f 100644 --- a/tests/auto/render/segmentvisitor/CMakeLists.txt +++ b/tests/auto/render/segmentvisitor/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 c742828f9..c10f4657d 100644 --- a/tests/auto/render/segmentvisitor/tst_segmentvisitor.cpp +++ b/tests/auto/render/segmentvisitor/tst_segmentvisitor.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 <qbackendnodetester.h> diff --git a/tests/auto/render/setfence/CMakeLists.txt b/tests/auto/render/setfence/CMakeLists.txt index dce0a9a49..04f3f3f2c 100644 --- a/tests/auto/render/setfence/CMakeLists.txt +++ b/tests/auto/render/setfence/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 8a91d23d5..786edb566 100644 --- a/tests/auto/render/setfence/tst_setfence.cpp +++ b/tests/auto/render/setfence/tst_setfence.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 <QtTest/QTest> #include <Qt3DRender/qsetfence.h> diff --git a/tests/auto/render/shader/CMakeLists.txt b/tests/auto/render/shader/CMakeLists.txt index fb5231807..45f7bb828 100644 --- a/tests/auto/render/shader/CMakeLists.txt +++ b/tests/auto/render/shader/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 f074e37da..e2a9dc4d5 100644 --- a/tests/auto/render/shader/tst_shader.cpp +++ b/tests/auto/render/shader/tst_shader.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 <qbackendnodetester.h> diff --git a/tests/auto/render/shaderbuilder/CMakeLists.txt b/tests/auto/render/shaderbuilder/CMakeLists.txt index 9100205fe..1e51143d0 100644 --- a/tests/auto/render/shaderbuilder/CMakeLists.txt +++ b/tests/auto/render/shaderbuilder/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 6c03fcb62..40c0ff5b8 100644 --- a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp +++ b/tests/auto/render/shaderbuilder/tst_shaderbuilder.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 <qbackendnodetester.h> diff --git a/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt index d90c08b6c..c3d1e1897 100644 --- a/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 ddc98786a..aae4066a3 100644 --- a/tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.cpp +++ b/tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.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/render/shadergraph/qshadergraph/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt index 117d4866d..dd0d13872 100644 --- a/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 07284885f..6cb1a9fdd 100644 --- a/tests/auto/render/shadergraph/qshadergraph/tst_qshadergraph.cpp +++ b/tests/auto/render/shadergraph/qshadergraph/tst_qshadergraph.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/render/shadergraph/qshadergraphloader/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt index a45d6be88..780da9794 100644 --- a/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 50825af1f..2545226c3 100644 --- a/tests/auto/render/shadergraph/qshadergraphloader/tst_qshadergraphloader.cpp +++ b/tests/auto/render/shadergraph/qshadergraphloader/tst_qshadergraphloader.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/render/shadergraph/qshadernodes/CMakeLists.txt b/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt index cf1013b45..42ad45ee7 100644 --- a/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 3dd3d86d1..28ecde1e1 100644 --- a/tests/auto/render/shadergraph/qshadernodes/tst_qshadernodes.cpp +++ b/tests/auto/render/shadergraph/qshadernodes/tst_qshadernodes.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/render/shadergraph/qshadernodesloader/CMakeLists.txt b/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt index 67caa4fdb..87634a423 100644 --- a/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt +++ b/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 8fc036fea..4d61c9c6e 100644 --- a/tests/auto/render/shadergraph/qshadernodesloader/tst_qshadernodesloader.cpp +++ b/tests/auto/render/shadergraph/qshadernodesloader/tst_qshadernodesloader.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/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 bb75d6d24..1cc618520 100644 --- a/tests/auto/render/shaderimage/CMakeLists.txt +++ b/tests/auto/render/shaderimage/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 b2cbd8e1c..bae978c1f 100644 --- a/tests/auto/render/shaderimage/tst_shaderimage.cpp +++ b/tests/auto/render/shaderimage/tst_shaderimage.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 <QtTest/QTest> #include <Qt3DRender/qshaderimage.h> diff --git a/tests/auto/render/skeleton/CMakeLists.txt b/tests/auto/render/skeleton/CMakeLists.txt index 88ce10982..a5c0bbe37 100644 --- a/tests/auto/render/skeleton/CMakeLists.txt +++ b/tests/auto/render/skeleton/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 77eef0902..9f47f6c01 100644 --- a/tests/auto/render/skeleton/tst_skeleton.cpp +++ b/tests/auto/render/skeleton/tst_skeleton.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 <Qt3DRender/private/skeleton_p.h> diff --git a/tests/auto/render/sortpolicy/CMakeLists.txt b/tests/auto/render/sortpolicy/CMakeLists.txt index 70045aa19..c9b8f61cf 100644 --- a/tests/auto/render/sortpolicy/CMakeLists.txt +++ b/tests/auto/render/sortpolicy/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 31ca91ded..8d22673fc 100644 --- a/tests/auto/render/sortpolicy/tst_sortpolicy.cpp +++ b/tests/auto/render/sortpolicy/tst_sortpolicy.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 <qbackendnodetester.h> diff --git a/tests/auto/render/technique/CMakeLists.txt b/tests/auto/render/technique/CMakeLists.txt index d838997af..96a2356c3 100644 --- a/tests/auto/render/technique/CMakeLists.txt +++ b/tests/auto/render/technique/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 aa6956ae6..bb2b07697 100644 --- a/tests/auto/render/technique/tst_technique.cpp +++ b/tests/auto/render/technique/tst_technique.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> diff --git a/tests/auto/render/texture/CMakeLists.txt b/tests/auto/render/texture/CMakeLists.txt index 9ac2387cb..92fd24a8d 100644 --- a/tests/auto/render/texture/CMakeLists.txt +++ b/tests/auto/render/texture/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 f77bd6dfe..4d1ad4d1e 100644 --- a/tests/auto/render/texture/tst_texture.cpp +++ b/tests/auto/render/texture/tst_texture.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 <qbackendnodetester.h> diff --git a/tests/auto/render/transform/CMakeLists.txt b/tests/auto/render/transform/CMakeLists.txt index 12eb6aa75..012bfcc28 100644 --- a/tests/auto/render/transform/CMakeLists.txt +++ b/tests/auto/render/transform/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 15cc2a877..56dad0347 100644 --- a/tests/auto/render/transform/tst_transform.cpp +++ b/tests/auto/render/transform/tst_transform.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> diff --git a/tests/auto/render/triangleboundingvolume/CMakeLists.txt b/tests/auto/render/triangleboundingvolume/CMakeLists.txt index 2bbdc1aae..d7809d08e 100644 --- a/tests/auto/render/triangleboundingvolume/CMakeLists.txt +++ b/tests/auto/render/triangleboundingvolume/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 e8d8fa96c..f669d7482 100644 --- a/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp +++ b/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.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 <Qt3DRender/private/entity_p.h> diff --git a/tests/auto/render/trianglevisitor/CMakeLists.txt b/tests/auto/render/trianglevisitor/CMakeLists.txt index b57840972..267d226da 100644 --- a/tests/auto/render/trianglevisitor/CMakeLists.txt +++ b/tests/auto/render/trianglevisitor/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 982db0ed6..4f6972367 100644 --- a/tests/auto/render/trianglevisitor/tst_trianglevisitor.cpp +++ b/tests/auto/render/trianglevisitor/tst_trianglevisitor.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 <qbackendnodetester.h> diff --git a/tests/auto/render/uniform/CMakeLists.txt b/tests/auto/render/uniform/CMakeLists.txt index 56c2eac9b..573ffeb16 100644 --- a/tests/auto/render/uniform/CMakeLists.txt +++ b/tests/auto/render/uniform/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 diff --git a/tests/auto/render/uniform/tst_uniform.cpp b/tests/auto/render/uniform/tst_uniform.cpp index 41545a8c3..132352bee 100644 --- a/tests/auto/render/uniform/tst_uniform.cpp +++ b/tests/auto/render/uniform/tst_uniform.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 <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 549ffa70e..3e24c9020 100644 --- a/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt +++ b/tests/auto/render/updateshaderdatatransformjob/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 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 0b4761fd0..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,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.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 d1191af25..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,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.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 661bfb738..415f51d35 100644 --- a/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp +++ b/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.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 <Qt3DRender/private/updateshaderdatatransformjob_p.h> @@ -197,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 ac20511c1..4806e2fe8 100644 --- a/tests/auto/render/vsyncframeadvanceservice/CMakeLists.txt +++ b/tests/auto/render/vsyncframeadvanceservice/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 diff --git a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp index 3948ac035..23cfefd8d 100644 --- a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp +++ b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Paul Lemire -// 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 <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 03d246394..e8bd3c58f 100644 --- a/tests/auto/render/waitfence/CMakeLists.txt +++ b/tests/auto/render/waitfence/CMakeLists.txt @@ -7,6 +7,12 @@ ## 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 diff --git a/tests/auto/render/waitfence/tst_waitfence.cpp b/tests/auto/render/waitfence/tst_waitfence.cpp index 06b47c766..7d718a0a2 100644 --- a/tests/auto/render/waitfence/tst_waitfence.cpp +++ b/tests/auto/render/waitfence/tst_waitfence.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 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) |