diff options
| author | Tarja Sundqvist <[email protected]> | 2024-12-16 20:44:49 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2024-12-16 20:44:49 +0200 |
| commit | 4438c164f1e5591bd193f2eeae674207e1743948 (patch) | |
| tree | 81a2334044cccd56c8db9a620a4712744cab7ae1 | |
| parent | ccabef0ec519db567e382540aef94dc1c21053c7 (diff) | |
| parent | d33482eeb7cc7170886aaab612c932eb28710cd3 (diff) | |
Merge tag 'v6.2.11-lts' into tqtc/lts-6.2-opensourcev6.2.11-lts-lgpl
Qt 6.2.11-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I6970ecaac010a61b71a96dcf135e11ce62065152
43 files changed, 122 insertions, 51 deletions
diff --git a/.cmake.conf b/.cmake.conf index 31a36e3b..842b347c 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.10") +set(QT_REPO_MODULE_VERSION "6.2.11") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index fd9d6e45..d4ec79f9 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.10 +MODULE_VERSION = 6.2.11 diff --git a/examples/quick3d/customeffect/effect2.vert b/examples/quick3d/customeffect/effect2.vert index 53dd2bdb..724b6740 100644 --- a/examples/quick3d/customeffect/effect2.vert +++ b/examples/quick3d/customeffect/effect2.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec2 center_vec; void MAIN() diff --git a/examples/quick3d/custominstancing/cubeMaterial.vert b/examples/quick3d/custominstancing/cubeMaterial.vert index 602befd9..94dec8be 100644 --- a/examples/quick3d/custominstancing/cubeMaterial.vert +++ b/examples/quick3d/custominstancing/cubeMaterial.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec4 vCustomData; VARYING vec3 vGlobalPosition; void MAIN() diff --git a/examples/quick3d/custommaterial/material_distortion.vert b/examples/quick3d/custommaterial/material_distortion.vert index acd0ed60..95b1cc7f 100644 --- a/examples/quick3d/custommaterial/material_distortion.vert +++ b/examples/quick3d/custommaterial/material_distortion.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.y += sin(uTime + VERTEX.x*10.0) * uAmplitude; diff --git a/examples/quick3d/customshaders/example.vert b/examples/quick3d/customshaders/example.vert index 96f8c4da..840c1e54 100644 --- a/examples/quick3d/customshaders/example.vert +++ b/examples/quick3d/customshaders/example.vert @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause VARYING vec3 pos; VARYING vec2 coord; diff --git a/examples/quick3d/lights/custom.vert b/examples/quick3d/lights/custom.vert index ba1d35b0..8d39e32d 100644 --- a/examples/quick3d/lights/custom.vert +++ b/examples/quick3d/lights/custom.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += sin(uTime * 4.0 + VERTEX.y) * uAmplitude; diff --git a/src/quick3d/doc/qtquick3d.qdocconf b/src/quick3d/doc/qtquick3d.qdocconf index d11c2a83..f10df5d7 100644 --- a/src/quick3d/doc/qtquick3d.qdocconf +++ b/src/quick3d/doc/qtquick3d.qdocconf @@ -50,6 +50,7 @@ sources += ../../helpers/gridgeometry.cpp \ ../../assetutils/qquick3druntimeloader.cpp exampledirs += ../../../examples/quick3d +examples.fileextensions += "*.frag *.geom *.vert *.tesc *.tese *.comp" imagedirs += images diff --git a/tests/baseline/data/customgeometry/pointstopology.vert b/tests/baseline/data/customgeometry/pointstopology.vert index 683694dc..81a5f17f 100644 --- a/tests/baseline/data/customgeometry/pointstopology.vert +++ b/tests/baseline/data/customgeometry/pointstopology.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { POINT_SIZE = 5.0; diff --git a/tests/baseline/data/custommaterial/custom_ssao.vert b/tests/baseline/data/custommaterial/custom_ssao.vert index ba1d35b0..8d39e32d 100644 --- a/tests/baseline/data/custommaterial/custom_ssao.vert +++ b/tests/baseline/data/custommaterial/custom_ssao.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += sin(uTime * 4.0 + VERTEX.y) * uAmplitude; diff --git a/tests/baseline/data/custommaterial/custom_unshaded_depth.vert b/tests/baseline/data/custommaterial/custom_unshaded_depth.vert index f96f7995..be2c25a9 100644 --- a/tests/baseline/data/custommaterial/custom_unshaded_depth.vert +++ b/tests/baseline/data/custommaterial/custom_unshaded_depth.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { POSITION = MODELVIEWPROJECTION_MATRIX * vec4(VERTEX, 1.0); diff --git a/tests/baseline/data/custommaterial/custom_unshaded_ssao.vert b/tests/baseline/data/custommaterial/custom_unshaded_ssao.vert index 98e21e8a..36191570 100644 --- a/tests/baseline/data/custommaterial/custom_unshaded_ssao.vert +++ b/tests/baseline/data/custommaterial/custom_unshaded_ssao.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec3 vNormal; void MAIN() diff --git a/tests/baseline/data/custommaterial/customcolor2.vert b/tests/baseline/data/custommaterial/customcolor2.vert index abb42da6..f80b2c51 100644 --- a/tests/baseline/data/custommaterial/customcolor2.vert +++ b/tests/baseline/data/custommaterial/customcolor2.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { COLOR = vec4(1.0, 0.0, 0.0, 1.0); diff --git a/tests/baseline/data/custommaterial/customdiffusespecular.vert b/tests/baseline/data/custommaterial/customdiffusespecular.vert index 5bd893c8..965e3828 100644 --- a/tests/baseline/data/custommaterial/customdiffusespecular.vert +++ b/tests/baseline/data/custommaterial/customdiffusespecular.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec3 vNormal; VARYING vec3 vViewVec; diff --git a/tests/baseline/data/custommaterial/customdiffusespecular_builtins.vert b/tests/baseline/data/custommaterial/customdiffusespecular_builtins.vert index ba1d35b0..8d39e32d 100644 --- a/tests/baseline/data/custommaterial/customdiffusespecular_builtins.vert +++ b/tests/baseline/data/custommaterial/customdiffusespecular_builtins.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += sin(uTime * 4.0 + VERTEX.y) * uAmplitude; diff --git a/tests/baseline/data/custommaterial/custommaterial_normals.vert b/tests/baseline/data/custommaterial/custommaterial_normals.vert index 63d7f064..ca28932e 100644 --- a/tests/baseline/data/custommaterial/custommaterial_normals.vert +++ b/tests/baseline/data/custommaterial/custommaterial_normals.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + float getHeight(vec2 pos) { return textureLod(heightMap, pos, 0).r; } diff --git a/tests/baseline/data/custommaterial/custommaterial_notexcoordmesh.vert b/tests/baseline/data/custommaterial/custommaterial_notexcoordmesh.vert index e9f158c2..5acc4703 100644 --- a/tests/baseline/data/custommaterial/custommaterial_notexcoordmesh.vert +++ b/tests/baseline/data/custommaterial/custommaterial_notexcoordmesh.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec2 texcoord; void MAIN() diff --git a/tests/baseline/data/custommaterial/custommaterial_uvs.vert b/tests/baseline/data/custommaterial/custommaterial_uvs.vert index 5cabc90b..396321e4 100644 --- a/tests/baseline/data/custommaterial/custommaterial_uvs.vert +++ b/tests/baseline/data/custommaterial/custommaterial_uvs.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { UV0 += offset0; diff --git a/tests/baseline/data/custommaterial/customshaded_builtins.vert b/tests/baseline/data/custommaterial/customshaded_builtins.vert index 424ac646..30d2b284 100644 --- a/tests/baseline/data/custommaterial/customshaded_builtins.vert +++ b/tests/baseline/data/custommaterial/customshaded_builtins.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += sin(uTime * 4.0 + VERTEX.y) * uAmplitude; diff --git a/tests/baseline/data/custommaterial/customsimple.vert b/tests/baseline/data/custommaterial/customsimple.vert index 3a71ba6d..a9030063 100644 --- a/tests/baseline/data/custommaterial/customsimple.vert +++ b/tests/baseline/data/custommaterial/customsimple.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += sin(time * 4.0 + VERTEX.y) * amplitude; diff --git a/tests/baseline/data/custommaterial/customsimple_no_position.vert b/tests/baseline/data/custommaterial/customsimple_no_position.vert index 8f1746a7..7e09d4f3 100644 --- a/tests/baseline/data/custommaterial/customsimple_no_position.vert +++ b/tests/baseline/data/custommaterial/customsimple_no_position.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += sin(time * 4.0 + VERTEX.y) * amplitude; diff --git a/tests/baseline/data/custommaterial/customsimpletexture.vert b/tests/baseline/data/custommaterial/customsimpletexture.vert index 27c20e27..eae04399 100644 --- a/tests/baseline/data/custommaterial/customsimpletexture.vert +++ b/tests/baseline/data/custommaterial/customsimpletexture.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec2 texcoord; void MAIN() diff --git a/tests/baseline/data/custommaterial/customunshaded.vert b/tests/baseline/data/custommaterial/customunshaded.vert index de73973b..840c1e54 100644 --- a/tests/baseline/data/custommaterial/customunshaded.vert +++ b/tests/baseline/data/custommaterial/customunshaded.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec3 pos; VARYING vec2 coord; diff --git a/tests/baseline/data/custommaterial/customunshaded_no_uniforms.vert b/tests/baseline/data/custommaterial/customunshaded_no_uniforms.vert index d84d669f..015ff86c 100644 --- a/tests/baseline/data/custommaterial/customunshaded_no_uniforms.vert +++ b/tests/baseline/data/custommaterial/customunshaded_no_uniforms.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec2 coord; void MAIN() diff --git a/tests/baseline/data/custommaterial/customunshadedtexture.vert b/tests/baseline/data/custommaterial/customunshadedtexture.vert index 56342446..7c143f19 100644 --- a/tests/baseline/data/custommaterial/customunshadedtexture.vert +++ b/tests/baseline/data/custommaterial/customunshadedtexture.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec2 texcoord; VARYING vec3 normal; diff --git a/tests/baseline/data/custommaterial/lightmapgen.vert b/tests/baseline/data/custommaterial/lightmapgen.vert index 71a3838d..0d028e90 100644 --- a/tests/baseline/data/custommaterial/lightmapgen.vert +++ b/tests/baseline/data/custommaterial/lightmapgen.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { float u = UV1.x * 2.0 - 1.0; diff --git a/tests/baseline/data/custommaterial/lightmapgen_use.vert b/tests/baseline/data/custommaterial/lightmapgen_use.vert index 4cff450e..fc67b68e 100644 --- a/tests/baseline/data/custommaterial/lightmapgen_use.vert +++ b/tests/baseline/data/custommaterial/lightmapgen_use.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec2 uv1; void MAIN() diff --git a/tests/baseline/data/custommaterial/lightmapgen_use_inline.vert b/tests/baseline/data/custommaterial/lightmapgen_use_inline.vert index 5f018954..8ea8803f 100644 --- a/tests/baseline/data/custommaterial/lightmapgen_use_inline.vert +++ b/tests/baseline/data/custommaterial/lightmapgen_use_inline.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec2 uv1; void MAIN() diff --git a/tests/baseline/data/custommaterial/lightmapgen_use_layer.vert b/tests/baseline/data/custommaterial/lightmapgen_use_layer.vert index 86c5d88c..2a56380f 100644 --- a/tests/baseline/data/custommaterial/lightmapgen_use_layer.vert +++ b/tests/baseline/data/custommaterial/lightmapgen_use_layer.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec2 uv1; void MAIN() diff --git a/tests/baseline/data/effects/custom_effect_simple_1.vert b/tests/baseline/data/effects/custom_effect_simple_1.vert index 53dd2bdb..724b6740 100644 --- a/tests/baseline/data/effects/custom_effect_simple_1.vert +++ b/tests/baseline/data/effects/custom_effect_simple_1.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec2 center_vec; void MAIN() diff --git a/tests/baseline/data/effects/custom_effect_simple_2.vert b/tests/baseline/data/effects/custom_effect_simple_2.vert index d1f21806..4987a019 100644 --- a/tests/baseline/data/effects/custom_effect_simple_2.vert +++ b/tests/baseline/data/effects/custom_effect_simple_2.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += 0.5; diff --git a/tests/baseline/data/instancing/customdata.vert b/tests/baseline/data/instancing/customdata.vert index 1742786e..31619e88 100644 --- a/tests/baseline/data/instancing/customdata.vert +++ b/tests/baseline/data/instancing/customdata.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += sin(INSTANCE_DATA.x * 4.0 + VERTEX.y) * INSTANCE_DATA.y; diff --git a/tests/baseline/data/instancing/customsimple.vert b/tests/baseline/data/instancing/customsimple.vert index b5d961f5..7c535f65 100644 --- a/tests/baseline/data/instancing/customsimple.vert +++ b/tests/baseline/data/instancing/customsimple.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += sin(time * 4.0 + VERTEX.y) * amplitude; diff --git a/tests/baseline/data/instancing/customsimple_no_position.vert b/tests/baseline/data/instancing/customsimple_no_position.vert index 8f1746a7..7e09d4f3 100644 --- a/tests/baseline/data/instancing/customsimple_no_position.vert +++ b/tests/baseline/data/instancing/customsimple_no_position.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += sin(time * 4.0 + VERTEX.y) * amplitude; diff --git a/tests/baseline/data/instancing/customunshaded.vert b/tests/baseline/data/instancing/customunshaded.vert index 61d5f633..51d26652 100644 --- a/tests/baseline/data/instancing/customunshaded.vert +++ b/tests/baseline/data/instancing/customunshaded.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec3 pos; VARYING vec2 coord; diff --git a/tests/baseline/data/morphanim/custommorph.vert b/tests/baseline/data/morphanim/custommorph.vert index 768c66c2..d96fce67 100644 --- a/tests/baseline/data/morphanim/custommorph.vert +++ b/tests/baseline/data/morphanim/custommorph.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { vec4 tmp = vec4(INSTANCE_MODELVIEWPROJECTION_MATRIX[0][3], diff --git a/tests/baseline/data/skinanim/skinsimple_custom_shaded.vert b/tests/baseline/data/skinanim/skinsimple_custom_shaded.vert index ec39f1a2..80d9c825 100644 --- a/tests/baseline/data/skinanim/skinsimple_custom_shaded.vert +++ b/tests/baseline/data/skinanim/skinsimple_custom_shaded.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { JOINTS.x = 0; diff --git a/tests/baseline/data/skinanim/skinsimple_custom_unshaded.vert b/tests/baseline/data/skinanim/skinsimple_custom_unshaded.vert index e438aac2..c602c958 100644 --- a/tests/baseline/data/skinanim/skinsimple_custom_unshaded.vert +++ b/tests/baseline/data/skinanim/skinsimple_custom_unshaded.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { vec4 pos = (BONE_TRANSFORMS[JOINTS.x] * WEIGHTS.y + BONE_TRANSFORMS[JOINTS.y] * WEIGHTS.x) diff --git a/tests/manual/instancing/material.vert b/tests/manual/instancing/material.vert index 4ea861d2..288f31c6 100644 --- a/tests/manual/instancing/material.vert +++ b/tests/manual/instancing/material.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec4 vCustomData; void MAIN() diff --git a/tests/manual/lightmap_concept/lightmapgen.vert b/tests/manual/lightmap_concept/lightmapgen.vert index bfb9230e..e2eb23db 100644 --- a/tests/manual/lightmap_concept/lightmapgen.vert +++ b/tests/manual/lightmap_concept/lightmapgen.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { vec2 uv = useUV1 ? UV1 : UV0; diff --git a/tests/manual/lightmap_concept/lightmapuse.vert b/tests/manual/lightmap_concept/lightmapuse.vert index 5f018954..8ea8803f 100644 --- a/tests/manual/lightmap_concept/lightmapuse.vert +++ b/tests/manual/lightmap_concept/lightmapuse.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec2 uv1; void MAIN() diff --git a/tests/manual/ssao/custom.vert b/tests/manual/ssao/custom.vert index ba1d35b0..8d39e32d 100644 --- a/tests/manual/ssao/custom.vert +++ b/tests/manual/ssao/custom.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + void MAIN() { VERTEX.x += sin(uTime * 4.0 + VERTEX.y) * uAmplitude; diff --git a/tests/manual/ssao/custom_unshaded.vert b/tests/manual/ssao/custom_unshaded.vert index 98e21e8a..36191570 100644 --- a/tests/manual/ssao/custom_unshaded.vert +++ b/tests/manual/ssao/custom_unshaded.vert @@ -1,3 +1,6 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + VARYING vec3 vNormal; void MAIN() |
