diff options
Diffstat (limited to 'tests/auto/extras')
22 files changed, 45 insertions, 95 deletions
diff --git a/tests/auto/extras/common/common.pri b/tests/auto/extras/common/common.pri deleted file mode 100644 index 4f73c65b5..000000000 --- a/tests/auto/extras/common/common.pri +++ /dev/null @@ -1,6 +0,0 @@ -HEADERS += \ - $$PWD/geometrytesthelper.h - -INCLUDEPATH += $$PWD - -QT += core-private 3drender diff --git a/tests/auto/extras/common/geometrytesthelper.h b/tests/auto/extras/common/geometrytesthelper.h index f4f363b61..36597927c 100644 --- a/tests/auto/extras/common/geometrytesthelper.h +++ b/tests/auto/extras/common/geometrytesthelper.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 GEOMETRYTESTHELPER_H #define GEOMETRYTESTHELPER_H diff --git a/tests/auto/extras/extras.pro b/tests/auto/extras/extras.pro deleted file mode 100644 index a9fd78369..000000000 --- a/tests/auto/extras/extras.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = subdirs - -contains(QT_CONFIG, private_tests) { - SUBDIRS += \ - qcuboidgeometry \ - qtorusgeometry \ - qforwardrenderer \ - qfirstpersoncameracontroller \ - qorbitcameracontroller -} - -qtHaveModule(quick) { - SUBDIRS += \ - qtext2dentity -} diff --git a/tests/auto/extras/qcuboidgeometry/CMakeLists.txt b/tests/auto/extras/qcuboidgeometry/CMakeLists.txt index bb52ea7ff..4241d4610 100644 --- a/tests/auto/extras/qcuboidgeometry/CMakeLists.txt +++ b/tests/auto/extras/qcuboidgeometry/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qcuboidgeometry Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qcuboidgeometry LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qcuboidgeometry SOURCES ../common/geometrytesthelper.h diff --git a/tests/auto/extras/qcuboidgeometry/qcuboidgeometry.pro b/tests/auto/extras/qcuboidgeometry/qcuboidgeometry.pro deleted file mode 100644 index 1e55fffad..000000000 --- a/tests/auto/extras/qcuboidgeometry/qcuboidgeometry.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qcuboidgeometry - -QT += 3dextras testlib - -CONFIG += testcase - -SOURCES += \ - tst_qcuboidgeometry.cpp - -include(../common/common.pri) diff --git a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp index 591caa95a..09365eb5a 100644 --- a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp +++ b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.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/extras/qfirstpersoncameracontroller/CMakeLists.txt b/tests/auto/extras/qfirstpersoncameracontroller/CMakeLists.txt index d92161b60..fb014da39 100644 --- a/tests/auto/extras/qfirstpersoncameracontroller/CMakeLists.txt +++ b/tests/auto/extras/qfirstpersoncameracontroller/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qfirstpersoncameracontroller Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qfirstpersoncameracontroller LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qfirstpersoncameracontroller SOURCES tst_qfirstpersoncameracontroller.cpp diff --git a/tests/auto/extras/qfirstpersoncameracontroller/qfirstpersoncameracontroller.pro b/tests/auto/extras/qfirstpersoncameracontroller/qfirstpersoncameracontroller.pro deleted file mode 100644 index 4952cc07d..000000000 --- a/tests/auto/extras/qfirstpersoncameracontroller/qfirstpersoncameracontroller.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qfirstpersoncameracontroller - -QT += 3dcore 3dcore-private 3drender 3drender-private 3dextras testlib - -CONFIG += testcase - -SOURCES += tst_qfirstpersoncameracontroller.cpp diff --git a/tests/auto/extras/qfirstpersoncameracontroller/tst_qfirstpersoncameracontroller.cpp b/tests/auto/extras/qfirstpersoncameracontroller/tst_qfirstpersoncameracontroller.cpp index a553e3571..96fd5450a 100644 --- a/tests/auto/extras/qfirstpersoncameracontroller/tst_qfirstpersoncameracontroller.cpp +++ b/tests/auto/extras/qfirstpersoncameracontroller/tst_qfirstpersoncameracontroller.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/extras/qforwardrenderer/CMakeLists.txt b/tests/auto/extras/qforwardrenderer/CMakeLists.txt index 9b59520b9..cc59de8dc 100644 --- a/tests/auto/extras/qforwardrenderer/CMakeLists.txt +++ b/tests/auto/extras/qforwardrenderer/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qforwardrenderer Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qforwardrenderer LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qforwardrenderer SOURCES tst_qforwardrenderer.cpp diff --git a/tests/auto/extras/qforwardrenderer/qforwardrenderer.pro b/tests/auto/extras/qforwardrenderer/qforwardrenderer.pro deleted file mode 100644 index 6dc853f5a..000000000 --- a/tests/auto/extras/qforwardrenderer/qforwardrenderer.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qforwardrenderer - -QT += 3dcore 3dcore-private 3drender 3drender-private 3dextras testlib - -CONFIG += testcase - -SOURCES += tst_qforwardrenderer.cpp diff --git a/tests/auto/extras/qforwardrenderer/tst_qforwardrenderer.cpp b/tests/auto/extras/qforwardrenderer/tst_qforwardrenderer.cpp index bc4f3a170..73694c4b3 100644 --- a/tests/auto/extras/qforwardrenderer/tst_qforwardrenderer.cpp +++ b/tests/auto/extras/qforwardrenderer/tst_qforwardrenderer.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/extras/qorbitcameracontroller/CMakeLists.txt b/tests/auto/extras/qorbitcameracontroller/CMakeLists.txt index afde732ec..88eb461d6 100644 --- a/tests/auto/extras/qorbitcameracontroller/CMakeLists.txt +++ b/tests/auto/extras/qorbitcameracontroller/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qorbitcameracontroller Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qorbitcameracontroller LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qorbitcameracontroller SOURCES tst_qorbitcameracontroller.cpp diff --git a/tests/auto/extras/qorbitcameracontroller/qorbitcameracontroller.pro b/tests/auto/extras/qorbitcameracontroller/qorbitcameracontroller.pro deleted file mode 100644 index 5a6b68503..000000000 --- a/tests/auto/extras/qorbitcameracontroller/qorbitcameracontroller.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qorbitcameracontroller - -QT += 3dcore 3dcore-private 3drender 3drender-private 3dextras testlib - -CONFIG += testcase - -SOURCES += tst_qorbitcameracontroller.cpp - diff --git a/tests/auto/extras/qorbitcameracontroller/tst_qorbitcameracontroller.cpp b/tests/auto/extras/qorbitcameracontroller/tst_qorbitcameracontroller.cpp index 53c3b3458..f10d6e8b3 100644 --- a/tests/auto/extras/qorbitcameracontroller/tst_qorbitcameracontroller.cpp +++ b/tests/auto/extras/qorbitcameracontroller/tst_qorbitcameracontroller.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/extras/qtext2dentity/CMakeLists.txt b/tests/auto/extras/qtext2dentity/CMakeLists.txt index 86f37b049..c76dba857 100644 --- a/tests/auto/extras/qtext2dentity/CMakeLists.txt +++ b/tests/auto/extras/qtext2dentity/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qtext2dentity Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qtext2dentity LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qtext2dentity SOURCES tst_qtext2dentity.cpp diff --git a/tests/auto/extras/qtext2dentity/qtext2dentity.pro b/tests/auto/extras/qtext2dentity/qtext2dentity.pro deleted file mode 100644 index 1b8bd0c6f..000000000 --- a/tests/auto/extras/qtext2dentity/qtext2dentity.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qtext2dentity - -QT += 3dcore 3dcore-private 3dextras 3dquickextras qml testlib - -CONFIG += testcase - -SOURCES += \ - tst_qtext2dentity.cpp - -RESOURCES += qtext2dentity.qrc - diff --git a/tests/auto/extras/qtext2dentity/qtext2dentity.qml b/tests/auto/extras/qtext2dentity/qtext2dentity.qml index de620a96c..c8b35f8db 100644 --- a/tests/auto/extras/qtext2dentity/qtext2dentity.qml +++ b/tests/auto/extras/qtext2dentity/qtext2dentity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// 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/extras/qtext2dentity/tst_qtext2dentity.cpp b/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp index aec1e9315..6242f6547 100644 --- a/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp +++ b/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DExtras/QText2DEntity> @@ -44,7 +44,7 @@ void tst_qtext2dentity::checkChangeArbiter() auto atlases = lookupNodeByClassName(rootEntity.data(), "Qt3DExtras::QTextureAtlas"); QVERIFY(atlases.size() == 1); auto atlas = atlases[0]; - QTRY_VERIFY(Qt3DCore::QNodePrivate::get(atlas)->m_changeArbiter); + QVERIFY(Qt3DCore::QNodePrivate::get(atlas)->m_changeArbiter); } QTEST_MAIN(tst_qtext2dentity) diff --git a/tests/auto/extras/qtorusgeometry/CMakeLists.txt b/tests/auto/extras/qtorusgeometry/CMakeLists.txt index 4018c6626..a8ee099cd 100644 --- a/tests/auto/extras/qtorusgeometry/CMakeLists.txt +++ b/tests/auto/extras/qtorusgeometry/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qtorusgeometry Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qtorusgeometry LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qtorusgeometry SOURCES ../common/geometrytesthelper.h diff --git a/tests/auto/extras/qtorusgeometry/qtorusgeometry.pro b/tests/auto/extras/qtorusgeometry/qtorusgeometry.pro deleted file mode 100644 index e20e447dc..000000000 --- a/tests/auto/extras/qtorusgeometry/qtorusgeometry.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app - -TARGET = tst_qtorusgeometry - -QT += 3dextras testlib - -CONFIG += testcase - -SOURCES += \ - tst_qtorusgeometry.cpp - -include(../common/common.pri) diff --git a/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp b/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp index 5c57357ec..f4d46e715 100644 --- a/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp +++ b/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.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> |