summaryrefslogtreecommitdiffstats
path: root/tests/manual/transforms-qml
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual/transforms-qml')
-rw-r--r--tests/manual/transforms-qml/CMakeLists.txt12
-rw-r--r--tests/manual/transforms-qml/RenderableEntity.qml2
-rw-r--r--tests/manual/transforms-qml/TemporaryCamera.qml2
-rw-r--r--tests/manual/transforms-qml/TrefoilKnot.qml2
-rw-r--r--tests/manual/transforms-qml/main.cpp2
-rw-r--r--tests/manual/transforms-qml/main.qml2
-rw-r--r--tests/manual/transforms-qml/transforms-qml.pro18
7 files changed, 11 insertions, 29 deletions
diff --git a/tests/manual/transforms-qml/CMakeLists.txt b/tests/manual/transforms-qml/CMakeLists.txt
index 32fae7e0e..3aed0476b 100644
--- a/tests/manual/transforms-qml/CMakeLists.txt
+++ b/tests/manual/transforms-qml/CMakeLists.txt
@@ -37,18 +37,18 @@ qt_internal_add_resource(transforms-qml "transforms-qml"
${transforms-qml_resource_files}
)
set(obj_resource_files
- "../../../examples/qt3d/exampleresources/assets/obj/ball.obj"
- "../../../examples/qt3d/exampleresources/assets/obj/material-sphere.obj"
- "../../../examples/qt3d/exampleresources/assets/obj/plane-10x10.obj"
- "../../../examples/qt3d/exampleresources/assets/obj/toyplane.obj"
- "../../../examples/qt3d/exampleresources/assets/obj/trefoil.obj"
+ "../exampleresources/assets/obj/ball.obj"
+ "../exampleresources/assets/obj/material-sphere.obj"
+ "../exampleresources/assets/obj/plane-10x10.obj"
+ "../exampleresources/assets/obj/toyplane.obj"
+ "../exampleresources/assets/obj/trefoil.obj"
)
qt_internal_add_resource(transforms-qml "obj"
PREFIX
"/"
BASE
- "../../../examples/qt3d/exampleresources"
+ "../exampleresources"
FILES
${obj_resource_files}
)
diff --git a/tests/manual/transforms-qml/RenderableEntity.qml b/tests/manual/transforms-qml/RenderableEntity.qml
index 5934c3cb9..fd112bfe6 100644
--- a/tests/manual/transforms-qml/RenderableEntity.qml
+++ b/tests/manual/transforms-qml/RenderableEntity.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/transforms-qml/TemporaryCamera.qml b/tests/manual/transforms-qml/TemporaryCamera.qml
index 3ae5aeb2f..f77292bb5 100644
--- a/tests/manual/transforms-qml/TemporaryCamera.qml
+++ b/tests/manual/transforms-qml/TemporaryCamera.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/transforms-qml/TrefoilKnot.qml b/tests/manual/transforms-qml/TrefoilKnot.qml
index 378ef59f6..a7367febe 100644
--- a/tests/manual/transforms-qml/TrefoilKnot.qml
+++ b/tests/manual/transforms-qml/TrefoilKnot.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/transforms-qml/main.cpp b/tests/manual/transforms-qml/main.cpp
index 773154ad3..722b0a647 100644
--- a/tests/manual/transforms-qml/main.cpp
+++ b/tests/manual/transforms-qml/main.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2014 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 <Qt3DQuick/QQmlAspectEngine>
diff --git a/tests/manual/transforms-qml/main.qml b/tests/manual/transforms-qml/main.qml
index 5dbeb2f8b..c5a384ed2 100644
--- a/tests/manual/transforms-qml/main.qml
+++ b/tests/manual/transforms-qml/main.qml
@@ -1,5 +1,5 @@
// Copyright (C) 2014 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/transforms-qml/transforms-qml.pro b/tests/manual/transforms-qml/transforms-qml.pro
deleted file mode 100644
index b3067db5a..000000000
--- a/tests/manual/transforms-qml/transforms-qml.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-!include( ../manual.pri ) {
- error( "Couldn't find the manual.pri file!" )
-}
-
-QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras
-
-SOURCES += \
- main.cpp
-
-OTHER_FILES += \
- main.qml \
- RenderableEntity.qml \
- TemporaryCamera.qml \
- TrefoilKnot.qml
-
-RESOURCES += \
- transforms-qml.qrc \
- ../../../examples/qt3d/exampleresources/obj.qrc