diff options
Diffstat (limited to 'tests/manual/skybox')
-rw-r--r-- | tests/manual/skybox/CMakeLists.txt | 18 | ||||
-rw-r--r-- | tests/manual/skybox/Skybox.qml | 2 | ||||
-rw-r--r-- | tests/manual/skybox/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/skybox/main.qml | 2 | ||||
-rw-r--r-- | tests/manual/skybox/skybox.pro | 12 |
5 files changed, 12 insertions, 24 deletions
diff --git a/tests/manual/skybox/CMakeLists.txt b/tests/manual/skybox/CMakeLists.txt index d7223b499..3d3e259a1 100644 --- a/tests/manual/skybox/CMakeLists.txt +++ b/tests/manual/skybox/CMakeLists.txt @@ -35,21 +35,21 @@ qt_internal_add_resource(skybox "skybox" ${skybox_resource_files} ) set(cubemaps_resource_files - "../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds" - "../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds" - "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp" - "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp" - "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp" - "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp" - "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp" - "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp" + "../exampleresources/assets/cubemaps/default/default_irradiance.dds" + "../exampleresources/assets/cubemaps/default/default_specular.dds" + "../exampleresources/assets/cubemaps/miramar/miramar_negx.webp" + "../exampleresources/assets/cubemaps/miramar/miramar_negy.webp" + "../exampleresources/assets/cubemaps/miramar/miramar_negz.webp" + "../exampleresources/assets/cubemaps/miramar/miramar_posx.webp" + "../exampleresources/assets/cubemaps/miramar/miramar_posy.webp" + "../exampleresources/assets/cubemaps/miramar/miramar_posz.webp" ) qt_internal_add_resource(skybox "cubemaps" PREFIX "/" BASE - "../../../examples/qt3d/exampleresources" + "../exampleresources" FILES ${cubemaps_resource_files} ) diff --git a/tests/manual/skybox/Skybox.qml b/tests/manual/skybox/Skybox.qml index 11c4355dc..81a21a27b 100644 --- a/tests/manual/skybox/Skybox.qml +++ b/tests/manual/skybox/Skybox.qml @@ -1,5 +1,5 @@ // Copyright (C) 2015 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/manual/skybox/main.cpp b/tests/manual/skybox/main.cpp index 2747bb9b4..26c20469b 100644 --- a/tests/manual/skybox/main.cpp +++ b/tests/manual/skybox/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 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 #include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> diff --git a/tests/manual/skybox/main.qml b/tests/manual/skybox/main.qml index 1d67d3602..2a6c9c017 100644 --- a/tests/manual/skybox/main.qml +++ b/tests/manual/skybox/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2015 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/manual/skybox/skybox.pro b/tests/manual/skybox/skybox.pro deleted file mode 100644 index 7c40af0e5..000000000 --- a/tests/manual/skybox/skybox.pro +++ /dev/null @@ -1,12 +0,0 @@ -!include( ../manual.pri ) { - error( "Couldn't find the manual.pri file!" ) -} - -QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras - -RESOURCES += \ - skybox.qrc \ - ../../../examples/qt3d/exampleresources/cubemaps.qrc - -SOURCES += \ - main.cpp |