summaryrefslogtreecommitdiffstats
path: root/tests/manual/tessellation-modes
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual/tessellation-modes')
-rw-r--r--tests/manual/tessellation-modes/BasicCamera.qml2
-rw-r--r--tests/manual/tessellation-modes/TessellatedQuad.qml2
-rw-r--r--tests/manual/tessellation-modes/TessellatedWireframeEffect.qml2
-rw-r--r--tests/manual/tessellation-modes/TessellatedWireframeMaterial.qml2
-rw-r--r--tests/manual/tessellation-modes/main.cpp2
-rw-r--r--tests/manual/tessellation-modes/main.qml2
-rw-r--r--tests/manual/tessellation-modes/tessellatedquadmesh.cpp2
-rw-r--r--tests/manual/tessellation-modes/tessellatedquadmesh.h2
-rw-r--r--tests/manual/tessellation-modes/tessellation-modes.pro23
9 files changed, 8 insertions, 31 deletions
diff --git a/tests/manual/tessellation-modes/BasicCamera.qml b/tests/manual/tessellation-modes/BasicCamera.qml
index 0ca360f25..cb195663a 100644
--- a/tests/manual/tessellation-modes/BasicCamera.qml
+++ b/tests/manual/tessellation-modes/BasicCamera.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/tessellation-modes/TessellatedQuad.qml b/tests/manual/tessellation-modes/TessellatedQuad.qml
index 71660f9c7..d34981634 100644
--- a/tests/manual/tessellation-modes/TessellatedQuad.qml
+++ b/tests/manual/tessellation-modes/TessellatedQuad.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 QtQuick 2.1 as QQ2
import Qt3D.Core 2.0
diff --git a/tests/manual/tessellation-modes/TessellatedWireframeEffect.qml b/tests/manual/tessellation-modes/TessellatedWireframeEffect.qml
index 03223fe83..94799e9a8 100644
--- a/tests/manual/tessellation-modes/TessellatedWireframeEffect.qml
+++ b/tests/manual/tessellation-modes/TessellatedWireframeEffect.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/tessellation-modes/TessellatedWireframeMaterial.qml b/tests/manual/tessellation-modes/TessellatedWireframeMaterial.qml
index 93f36bd63..fdfd7d990 100644
--- a/tests/manual/tessellation-modes/TessellatedWireframeMaterial.qml
+++ b/tests/manual/tessellation-modes/TessellatedWireframeMaterial.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/tessellation-modes/main.cpp b/tests/manual/tessellation-modes/main.cpp
index 639a4624a..329beb8ac 100644
--- a/tests/manual/tessellation-modes/main.cpp
+++ b/tests/manual/tessellation-modes/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 "tessellatedquadmesh.h"
#include <Qt3DQuickExtras/qt3dquickwindow.h>
diff --git a/tests/manual/tessellation-modes/main.qml b/tests/manual/tessellation-modes/main.qml
index e1ed51d78..2c6d3ff9f 100644
--- a/tests/manual/tessellation-modes/main.qml
+++ b/tests/manual/tessellation-modes/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 QtQuick 2.1 as QQ2
import Qt3D.Core 2.0
diff --git a/tests/manual/tessellation-modes/tessellatedquadmesh.cpp b/tests/manual/tessellation-modes/tessellatedquadmesh.cpp
index c733fd6ba..dce746328 100644
--- a/tests/manual/tessellation-modes/tessellatedquadmesh.cpp
+++ b/tests/manual/tessellation-modes/tessellatedquadmesh.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 "tessellatedquadmesh.h"
diff --git a/tests/manual/tessellation-modes/tessellatedquadmesh.h b/tests/manual/tessellation-modes/tessellatedquadmesh.h
index 64380421f..c21d9f413 100644
--- a/tests/manual/tessellation-modes/tessellatedquadmesh.h
+++ b/tests/manual/tessellation-modes/tessellatedquadmesh.h
@@ -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
#ifndef TESSELLATEDQUAD_H
#define TESSELLATEDQUAD_H
diff --git a/tests/manual/tessellation-modes/tessellation-modes.pro b/tests/manual/tessellation-modes/tessellation-modes.pro
deleted file mode 100644
index 5d3e1fae8..000000000
--- a/tests/manual/tessellation-modes/tessellation-modes.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-!include( ../manual.pri ) {
- error( "Couldn't find the manual.pri file!" )
-}
-
-QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras
-
-HEADERS += \
- tessellatedquadmesh.h
-
-SOURCES += \
- main.cpp \
- tessellatedquadmesh.cpp
-
-OTHER_FILES += \
- main.qml \
- BasicCamera.qml \
- TessellatedWireframeEffect.qml \
- TessellatedWireframeMaterial.qml \
- TessellatedQuad.qml \
- shaders/*
-
-RESOURCES += \
- tessellation-modes.qrc