diff options
Diffstat (limited to 'tests/manual')
396 files changed, 438 insertions, 467 deletions
diff --git a/tests/manual/additional-attributes-qml/main.cpp b/tests/manual/additional-attributes-qml/main.cpp index a48f99e72..74ace2b19 100644 --- a/tests/manual/additional-attributes-qml/main.cpp +++ b/tests/manual/additional-attributes-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 <QGuiApplication> diff --git a/tests/manual/additional-attributes-qml/main.qml b/tests/manual/additional-attributes-qml/main.qml index e251d63a0..24261f162 100644 --- a/tests/manual/additional-attributes-qml/main.qml +++ b/tests/manual/additional-attributes-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/advancedcustommaterial/SceneRoot.qml b/tests/manual/advancedcustommaterial/SceneRoot.qml index 22818fbd1..5e6d0e6fb 100644 --- a/tests/manual/advancedcustommaterial/SceneRoot.qml +++ b/tests/manual/advancedcustommaterial/SceneRoot.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/manual/advancedcustommaterial/Water.qml b/tests/manual/advancedcustommaterial/Water.qml index f70575c55..323c1c96e 100644 --- a/tests/manual/advancedcustommaterial/Water.qml +++ b/tests/manual/advancedcustommaterial/Water.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/manual/advancedcustommaterial/WaterMaterial.qml b/tests/manual/advancedcustommaterial/WaterMaterial.qml index cb0573d0f..f72c70d2e 100644 --- a/tests/manual/advancedcustommaterial/WaterMaterial.qml +++ b/tests/manual/advancedcustommaterial/WaterMaterial.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/manual/advancedcustommaterial/main.cpp b/tests/manual/advancedcustommaterial/main.cpp index afa7fd3cd..c1bc52163 100644 --- a/tests/manual/advancedcustommaterial/main.cpp +++ b/tests/manual/advancedcustommaterial/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/advancedcustommaterial/main.qml b/tests/manual/advancedcustommaterial/main.qml index 4c2b3d3c2..7f5b90e6e 100644 --- a/tests/manual/advancedcustommaterial/main.qml +++ b/tests/manual/advancedcustommaterial/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 QtQuick 2.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/anaglyph-rendering/StereoCamera.qml b/tests/manual/anaglyph-rendering/StereoCamera.qml index 9e820dab4..d4bff326e 100644 --- a/tests/manual/anaglyph-rendering/StereoCamera.qml +++ b/tests/manual/anaglyph-rendering/StereoCamera.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/anaglyph-rendering/StereoFrameGraph.qml b/tests/manual/anaglyph-rendering/StereoFrameGraph.qml index 740db4d41..ee22e49c6 100644 --- a/tests/manual/anaglyph-rendering/StereoFrameGraph.qml +++ b/tests/manual/anaglyph-rendering/StereoFrameGraph.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/anaglyph-rendering/main.cpp b/tests/manual/anaglyph-rendering/main.cpp index bc3c72cbf..2ce25f5e7 100644 --- a/tests/manual/anaglyph-rendering/main.cpp +++ b/tests/manual/anaglyph-rendering/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 <Qt3DQuick/QQmlAspectEngine> diff --git a/tests/manual/anaglyph-rendering/main.qml b/tests/manual/anaglyph-rendering/main.qml index d2814b179..55bca1d98 100644 --- a/tests/manual/anaglyph-rendering/main.qml +++ b/tests/manual/anaglyph-rendering/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 QtQuick 2.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/anim-viewer/main.cpp b/tests/manual/anim-viewer/main.cpp index 33e4b9504..db41fbafe 100644 --- a/tests/manual/anim-viewer/main.cpp +++ b/tests/manual/anim-viewer/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <Qt3DQuickExtras/qt3dquickwindow.h> diff --git a/tests/manual/anim-viewer/main.qml b/tests/manual/anim-viewer/main.qml index f020dee6a..140c0fd55 100644 --- a/tests/manual/anim-viewer/main.qml +++ b/tests/manual/anim-viewer/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.0 as Quick import QtQuick.Layouts 1.3 diff --git a/tests/manual/animation-keyframe-blendtree/DefaultSceneEntity.qml b/tests/manual/animation-keyframe-blendtree/DefaultSceneEntity.qml index e3510a1ef..aa7a274ef 100644 --- a/tests/manual/animation-keyframe-blendtree/DefaultSceneEntity.qml +++ b/tests/manual/animation-keyframe-blendtree/DefaultSceneEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/animation-keyframe-blendtree/main.cpp b/tests/manual/animation-keyframe-blendtree/main.cpp index 567d9bf53..72d2e4a3b 100644 --- a/tests/manual/animation-keyframe-blendtree/main.cpp +++ b/tests/manual/animation-keyframe-blendtree/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <QGuiApplication> #include <Qt3DAnimation/QAnimationAspect> diff --git a/tests/manual/animation-keyframe-blendtree/main.qml b/tests/manual/animation-keyframe-blendtree/main.qml index acaa41c37..fc636d10e 100644 --- a/tests/manual/animation-keyframe-blendtree/main.qml +++ b/tests/manual/animation-keyframe-blendtree/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/animation-keyframe-programmatic/DefaultSceneEntity.qml b/tests/manual/animation-keyframe-programmatic/DefaultSceneEntity.qml index e3510a1ef..aa7a274ef 100644 --- a/tests/manual/animation-keyframe-programmatic/DefaultSceneEntity.qml +++ b/tests/manual/animation-keyframe-programmatic/DefaultSceneEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/animation-keyframe-programmatic/animationfactory.cpp b/tests/manual/animation-keyframe-programmatic/animationfactory.cpp index 4c635d224..aeef9f90c 100644 --- a/tests/manual/animation-keyframe-programmatic/animationfactory.cpp +++ b/tests/manual/animation-keyframe-programmatic/animationfactory.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 "animationfactory.h" diff --git a/tests/manual/animation-keyframe-programmatic/animationfactory.h b/tests/manual/animation-keyframe-programmatic/animationfactory.h index 7ae4e3046..5b7766779 100644 --- a/tests/manual/animation-keyframe-programmatic/animationfactory.h +++ b/tests/manual/animation-keyframe-programmatic/animationfactory.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 ANIMATIONFACTORY_H #define ANIMATIONFACTORY_H diff --git a/tests/manual/animation-keyframe-programmatic/main.cpp b/tests/manual/animation-keyframe-programmatic/main.cpp index 0d82b8e73..ca278d4a7 100644 --- a/tests/manual/animation-keyframe-programmatic/main.cpp +++ b/tests/manual/animation-keyframe-programmatic/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <QGuiApplication> #include <Qt3DAnimation/QAnimationAspect> diff --git a/tests/manual/animation-keyframe-programmatic/main.qml b/tests/manual/animation-keyframe-programmatic/main.qml index 9e2ec95ab..36f769e1e 100644 --- a/tests/manual/animation-keyframe-programmatic/main.qml +++ b/tests/manual/animation-keyframe-programmatic/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/animation-keyframe-simple/DefaultSceneEntity.qml b/tests/manual/animation-keyframe-simple/DefaultSceneEntity.qml index e3510a1ef..aa7a274ef 100644 --- a/tests/manual/animation-keyframe-simple/DefaultSceneEntity.qml +++ b/tests/manual/animation-keyframe-simple/DefaultSceneEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/animation-keyframe-simple/main.cpp b/tests/manual/animation-keyframe-simple/main.cpp index 567d9bf53..72d2e4a3b 100644 --- a/tests/manual/animation-keyframe-simple/main.cpp +++ b/tests/manual/animation-keyframe-simple/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <QGuiApplication> #include <Qt3DAnimation/QAnimationAspect> diff --git a/tests/manual/animation-keyframe-simple/main.qml b/tests/manual/animation-keyframe-simple/main.qml index d5655179f..1742a2343 100644 --- a/tests/manual/animation-keyframe-simple/main.qml +++ b/tests/manual/animation-keyframe-simple/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/assimp-cpp/main.cpp b/tests/manual/assimp-cpp/main.cpp index 0a36cf95f..98bb61219 100644 --- a/tests/manual/assimp-cpp/main.cpp +++ b/tests/manual/assimp-cpp/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 <QFileDialog> #include <QApplication> diff --git a/tests/manual/assimp/main.cpp b/tests/manual/assimp/main.cpp index a4f50bcae..73c5f40a5 100644 --- a/tests/manual/assimp/main.cpp +++ b/tests/manual/assimp/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 <Qt3DRender/QSceneLoader> diff --git a/tests/manual/assimp/main.qml b/tests/manual/assimp/main.qml index 6b36385b2..c8af743a2 100644 --- a/tests/manual/assimp/main.qml +++ b/tests/manual/assimp/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.0 as Quick import Qt3D.Core 2.0 diff --git a/tests/manual/audio-visualizer-qml/BarEntity.qml b/tests/manual/audio-visualizer-qml/BarEntity.qml index 303ac0d3f..7bc709f28 100644 --- a/tests/manual/audio-visualizer-qml/BarEntity.qml +++ b/tests/manual/audio-visualizer-qml/BarEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/manual/audio-visualizer-qml/Visualizer.qml b/tests/manual/audio-visualizer-qml/Visualizer.qml index 1b4ccec0e..1846d3bbc 100644 --- a/tests/manual/audio-visualizer-qml/Visualizer.qml +++ b/tests/manual/audio-visualizer-qml/Visualizer.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/manual/audio-visualizer-qml/main.cpp b/tests/manual/audio-visualizer-qml/main.cpp index 6b3237fdd..bdc6ebd53 100644 --- a/tests/manual/audio-visualizer-qml/main.cpp +++ b/tests/manual/audio-visualizer-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 "touchsettings.h" #include <QtGui/QGuiApplication> diff --git a/tests/manual/audio-visualizer-qml/main.qml b/tests/manual/audio-visualizer-qml/main.qml index 49c26106b..f71947cb7 100644 --- a/tests/manual/audio-visualizer-qml/main.qml +++ b/tests/manual/audio-visualizer-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 QtQuick import QtQuick.Scene3D diff --git a/tests/manual/audio-visualizer-qml/touchsettings.cpp b/tests/manual/audio-visualizer-qml/touchsettings.cpp index 83fce6392..733430299 100644 --- a/tests/manual/audio-visualizer-qml/touchsettings.cpp +++ b/tests/manual/audio-visualizer-qml/touchsettings.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 "touchsettings.h" diff --git a/tests/manual/audio-visualizer-qml/touchsettings.h b/tests/manual/audio-visualizer-qml/touchsettings.h index 9320e90c4..23de112d1 100644 --- a/tests/manual/audio-visualizer-qml/touchsettings.h +++ b/tests/manual/audio-visualizer-qml/touchsettings.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 #ifndef TOUCHSETTINGS_H #define TOUCHSETTINGS_H diff --git a/tests/manual/bigmodel-qml/MyEntity.qml b/tests/manual/bigmodel-qml/MyEntity.qml index a39927c0e..7f5e36199 100644 --- a/tests/manual/bigmodel-qml/MyEntity.qml +++ b/tests/manual/bigmodel-qml/MyEntity.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/bigmodel-qml/main.cpp b/tests/manual/bigmodel-qml/main.cpp index b7b7cd2b7..a1602d988 100644 --- a/tests/manual/bigmodel-qml/main.cpp +++ b/tests/manual/bigmodel-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 <QGuiApplication> diff --git a/tests/manual/bigmodel-qml/main.qml b/tests/manual/bigmodel-qml/main.qml index 9b5dc37cd..146c39f7c 100644 --- a/tests/manual/bigmodel-qml/main.qml +++ b/tests/manual/bigmodel-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/bigscene-cpp/entity.cpp b/tests/manual/bigscene-cpp/entity.cpp index ffc6bfebb..d6b9a8f62 100644 --- a/tests/manual/bigscene-cpp/entity.cpp +++ b/tests/manual/bigscene-cpp/entity.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 "entity.h" diff --git a/tests/manual/bigscene-cpp/entity.h b/tests/manual/bigscene-cpp/entity.h index eeba08aa8..449b7f5c1 100644 --- a/tests/manual/bigscene-cpp/entity.h +++ b/tests/manual/bigscene-cpp/entity.h @@ -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 #ifndef ENTITY_H #define ENTITY_H diff --git a/tests/manual/bigscene-cpp/main.cpp b/tests/manual/bigscene-cpp/main.cpp index da44cbec8..0a2d43f00 100644 --- a/tests/manual/bigscene-cpp/main.cpp +++ b/tests/manual/bigscene-cpp/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 "entity.h" diff --git a/tests/manual/bigscene-instanced-qml/main.cpp b/tests/manual/bigscene-instanced-qml/main.cpp index cc61e611a..a6ecbc4ae 100644 --- a/tests/manual/bigscene-instanced-qml/main.cpp +++ b/tests/manual/bigscene-instanced-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 <QGuiApplication> diff --git a/tests/manual/bigscene-instanced-qml/main.qml b/tests/manual/bigscene-instanced-qml/main.qml index ef29d711d..04140c188 100644 --- a/tests/manual/bigscene-instanced-qml/main.qml +++ b/tests/manual/bigscene-instanced-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/blitframebuffer-qml/main.cpp b/tests/manual/blitframebuffer-qml/main.cpp index 680efd0b5..d1347a39c 100644 --- a/tests/manual/blitframebuffer-qml/main.cpp +++ b/tests/manual/blitframebuffer-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/blitframebuffer-qml/main.qml b/tests/manual/blitframebuffer-qml/main.qml index bf96ed51d..c6cf5763c 100644 --- a/tests/manual/blitframebuffer-qml/main.qml +++ b/tests/manual/blitframebuffer-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/boundingvolumes/AnimatedEntity.qml b/tests/manual/boundingvolumes/AnimatedEntity.qml index 75f135dc7..f965c13b8 100644 --- a/tests/manual/boundingvolumes/AnimatedEntity.qml +++ b/tests/manual/boundingvolumes/AnimatedEntity.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.16 import Qt3D.Render 2.16 diff --git a/tests/manual/boundingvolumes/main.cpp b/tests/manual/boundingvolumes/main.cpp index 8354415ce..a82830bd7 100644 --- a/tests/manual/boundingvolumes/main.cpp +++ b/tests/manual/boundingvolumes/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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/boundingvolumes/main.qml b/tests/manual/boundingvolumes/main.qml index 7bf5770f4..ed15022ba 100644 --- a/tests/manual/boundingvolumes/main.qml +++ b/tests/manual/boundingvolumes/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 QtQuick 2.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/buffercapture-qml/BufferSetterScene.qml b/tests/manual/buffercapture-qml/BufferSetterScene.qml index 3a94378c1..2ae875bf3 100644 --- a/tests/manual/buffercapture-qml/BufferSetterScene.qml +++ b/tests/manual/buffercapture-qml/BufferSetterScene.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 Juan José Casafranca. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.2 as QQ2 import Qt3D.Core 2.9 diff --git a/tests/manual/buffercapture-qml/ComputeFrameGraph.qml b/tests/manual/buffercapture-qml/ComputeFrameGraph.qml index dea065708..b69b0ba02 100644 --- a/tests/manual/buffercapture-qml/ComputeFrameGraph.qml +++ b/tests/manual/buffercapture-qml/ComputeFrameGraph.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 Juan José Casafranca. -// 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.9 diff --git a/tests/manual/buffercapture-qml/ComputeMaterial.qml b/tests/manual/buffercapture-qml/ComputeMaterial.qml index a8fcaddaf..d9da2a73a 100644 --- a/tests/manual/buffercapture-qml/ComputeMaterial.qml +++ b/tests/manual/buffercapture-qml/ComputeMaterial.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 Juan José Casafranca. -// 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.9 import Qt3D.Render 2.9 diff --git a/tests/manual/buffercapture-qml/gl43/bufferSetter.comp b/tests/manual/buffercapture-qml/gl43/bufferSetter.comp index 279a7c295..1e43ac7ce 100644 --- a/tests/manual/buffercapture-qml/gl43/bufferSetter.comp +++ b/tests/manual/buffercapture-qml/gl43/bufferSetter.comp @@ -1,5 +1,5 @@ // Copyright (C) 2017 Juan José Casafranca. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #version 430 core diff --git a/tests/manual/buffercapture-qml/gl45/bufferSetter.comp b/tests/manual/buffercapture-qml/gl45/bufferSetter.comp index cb9b80af1..c5a516da7 100644 --- a/tests/manual/buffercapture-qml/gl45/bufferSetter.comp +++ b/tests/manual/buffercapture-qml/gl45/bufferSetter.comp @@ -1,5 +1,5 @@ // Copyright (C) 2017 Juan José Casafranca. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #version 450 core diff --git a/tests/manual/buffercapture-qml/main.cpp b/tests/manual/buffercapture-qml/main.cpp index 2819e1410..f86a6ef71 100644 --- a/tests/manual/buffercapture-qml/main.cpp +++ b/tests/manual/buffercapture-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 Juan José Casafranca. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QQuickItem> #include <QQuickView> @@ -23,14 +23,13 @@ int main(int argc, char* argv[]) Qt3DCore::QBuffer *buffer = rootObject->findChild<Qt3DCore::QBuffer*>("buffer"); QObject::connect(buffer, &Qt3DCore::QBuffer::dataChanged, - [=](const QByteArray &bytes) { - //I know I'm receiving int data - const uint *data = reinterpret_cast<const uint*>(bytes.data()); - qDebug() << "Data received"; - for (uint i = 0; i < 1024; ++i) - qDebug() << data[i]; - } - ); + &app, [=](const QByteArray &bytes) { + // I know I'm receiving int data + const uint *data = reinterpret_cast<const uint *>(bytes.data()); + qDebug() << "Data received"; + for (uint i = 0; i < 1024; ++i) + qDebug() << data[i]; + }); view.show(); diff --git a/tests/manual/buffercapture-qml/main.qml b/tests/manual/buffercapture-qml/main.qml index 83d843117..520e36dbb 100644 --- a/tests/manual/buffercapture-qml/main.qml +++ b/tests/manual/buffercapture-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 Juan José Casafranca. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.0 import Qt3D.Core 2.0 diff --git a/tests/manual/clip-planes-qml/CappingMaterialEffect.qml b/tests/manual/clip-planes-qml/CappingMaterialEffect.qml index 2dd22887a..d3bbab4ef 100644 --- a/tests/manual/clip-planes-qml/CappingMaterialEffect.qml +++ b/tests/manual/clip-planes-qml/CappingMaterialEffect.qml @@ -1,5 +1,5 @@ // Copyright (C) 2015 Paul Lemire -// 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/clip-planes-qml/ClipCappingFrameGraph.qml b/tests/manual/clip-planes-qml/ClipCappingFrameGraph.qml index a1a8f366b..3fe5a6af9 100644 --- a/tests/manual/clip-planes-qml/ClipCappingFrameGraph.qml +++ b/tests/manual/clip-planes-qml/ClipCappingFrameGraph.qml @@ -1,5 +1,5 @@ // Copyright (C) 2015 Paul Lemire -// 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/clip-planes-qml/ClipMaterialEffect.qml b/tests/manual/clip-planes-qml/ClipMaterialEffect.qml index 40ebb1c30..c036f721a 100644 --- a/tests/manual/clip-planes-qml/ClipMaterialEffect.qml +++ b/tests/manual/clip-planes-qml/ClipMaterialEffect.qml @@ -1,5 +1,5 @@ // Copyright (C) 2015 Paul Lemire -// 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/clip-planes-qml/ClipPlaneEntity.qml b/tests/manual/clip-planes-qml/ClipPlaneEntity.qml index 7e3d86002..33dae9ff7 100644 --- a/tests/manual/clip-planes-qml/ClipPlaneEntity.qml +++ b/tests/manual/clip-planes-qml/ClipPlaneEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2015 Paul Lemire -// 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/clip-planes-qml/ClippingPlanes.qml b/tests/manual/clip-planes-qml/ClippingPlanes.qml index c43687af8..ff75e523b 100644 --- a/tests/manual/clip-planes-qml/ClippingPlanes.qml +++ b/tests/manual/clip-planes-qml/ClippingPlanes.qml @@ -1,5 +1,5 @@ // Copyright (C) 2015 Paul Lemire -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/clip-planes-qml/PlaneVisualizationMaterial.qml b/tests/manual/clip-planes-qml/PlaneVisualizationMaterial.qml index aebd69954..aa2043850 100644 --- a/tests/manual/clip-planes-qml/PlaneVisualizationMaterial.qml +++ b/tests/manual/clip-planes-qml/PlaneVisualizationMaterial.qml @@ -1,5 +1,5 @@ // Copyright (C) 2015 Paul Lemire -// 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/clip-planes-qml/default.vert b/tests/manual/clip-planes-qml/default.vert index da0a62371..2b741e6cd 100644 --- a/tests/manual/clip-planes-qml/default.vert +++ b/tests/manual/clip-planes-qml/default.vert @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/clip-planes-qml/main.cpp b/tests/manual/clip-planes-qml/main.cpp index 338208f8d..8185d0239 100644 --- a/tests/manual/clip-planes-qml/main.cpp +++ b/tests/manual/clip-planes-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Paul Lemire -// 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/clip-planes-qml/main.qml b/tests/manual/clip-planes-qml/main.qml index 651bddb51..368be99bc 100644 --- a/tests/manual/clip-planes-qml/main.qml +++ b/tests/manual/clip-planes-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2015 Paul Lemire -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/clip-planes-qml/phongalpha.frag b/tests/manual/clip-planes-qml/phongalpha.frag index c7ee7e1b7..6fd0d947d 100644 --- a/tests/manual/clip-planes-qml/phongalpha.frag +++ b/tests/manual/clip-planes-qml/phongalpha.frag @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/component-changes/main.cpp b/tests/manual/component-changes/main.cpp index 97d405657..d8672f50f 100644 --- a/tests/manual/component-changes/main.cpp +++ b/tests/manual/component-changes/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 <QGuiApplication> diff --git a/tests/manual/compressed_textures/main.cpp b/tests/manual/compressed_textures/main.cpp index 1ccf77e5a..153afc8ca 100644 --- a/tests/manual/compressed_textures/main.cpp +++ b/tests/manual/compressed_textures/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 <QQuickView> #include <QGuiApplication> diff --git a/tests/manual/compressed_textures/main.qml b/tests/manual/compressed_textures/main.qml index 26f3df4ae..750df73f2 100644 --- a/tests/manual/compressed_textures/main.qml +++ b/tests/manual/compressed_textures/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.12 as QQ2 import QtQuick.Scene3D 2.12 diff --git a/tests/manual/compute-manual/ComputeFrameGraph.qml b/tests/manual/compute-manual/ComputeFrameGraph.qml index 91b79ee78..e3b8624d3 100644 --- a/tests/manual/compute-manual/ComputeFrameGraph.qml +++ b/tests/manual/compute-manual/ComputeFrameGraph.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.14 import Qt3D.Render 2.14 diff --git a/tests/manual/compute-manual/ComputeMaterial.qml b/tests/manual/compute-manual/ComputeMaterial.qml index 43b14e1d5..6d6ff2a5c 100644 --- a/tests/manual/compute-manual/ComputeMaterial.qml +++ b/tests/manual/compute-manual/ComputeMaterial.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.14 import Qt3D.Render 2.14 diff --git a/tests/manual/compute-manual/ParticlesScene.qml b/tests/manual/compute-manual/ParticlesScene.qml index 9d51e7945..0901e4b5b 100644 --- a/tests/manual/compute-manual/ParticlesScene.qml +++ b/tests/manual/compute-manual/ParticlesScene.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.14 import Qt3D.Render 2.14 diff --git a/tests/manual/compute-manual/main.cpp b/tests/manual/compute-manual/main.cpp index e1115301f..cc7906053 100644 --- a/tests/manual/compute-manual/main.cpp +++ b/tests/manual/compute-manual/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/compute-manual/main.qml b/tests/manual/compute-manual/main.qml index 875672bd5..8db2a1a41 100644 --- a/tests/manual/compute-manual/main.qml +++ b/tests/manual/compute-manual/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.14 import QtQuick.Scene3D 2.14 diff --git a/tests/manual/compute-particles/ComputeFrameGraph.qml b/tests/manual/compute-particles/ComputeFrameGraph.qml index 066b4fa3c..4ceca993c 100644 --- a/tests/manual/compute-particles/ComputeFrameGraph.qml +++ b/tests/manual/compute-particles/ComputeFrameGraph.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.9 diff --git a/tests/manual/compute-particles/ComputeMaterial.qml b/tests/manual/compute-particles/ComputeMaterial.qml index c1bb5c528..90f9a7c2e 100644 --- a/tests/manual/compute-particles/ComputeMaterial.qml +++ b/tests/manual/compute-particles/ComputeMaterial.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/compute-particles/ParticlesScene.qml b/tests/manual/compute-particles/ParticlesScene.qml index ccb42c2b6..c3b6fa4ae 100644 --- a/tests/manual/compute-particles/ParticlesScene.qml +++ b/tests/manual/compute-particles/ParticlesScene.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/compute-particles/main.cpp b/tests/manual/compute-particles/main.cpp index 3a8452813..035ae2129 100644 --- a/tests/manual/compute-particles/main.cpp +++ b/tests/manual/compute-particles/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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/compute-particles/main.qml b/tests/manual/compute-particles/main.qml index 89094bc1b..380b54ed3 100644 --- a/tests/manual/compute-particles/main.qml +++ b/tests/manual/compute-particles/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 QtQuick 2.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/custom-mesh-cpp-indirect/main.cpp b/tests/manual/custom-mesh-cpp-indirect/main.cpp index 3c51e63f8..a0b999350 100644 --- a/tests/manual/custom-mesh-cpp-indirect/main.cpp +++ b/tests/manual/custom-mesh-cpp-indirect/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 <QGuiApplication> diff --git a/tests/manual/custom-mesh-cpp/main.cpp b/tests/manual/custom-mesh-cpp/main.cpp index 30d815438..2e4fa877a 100644 --- a/tests/manual/custom-mesh-cpp/main.cpp +++ b/tests/manual/custom-mesh-cpp/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 <QGuiApplication> diff --git a/tests/manual/custom-mesh-qml/main.cpp b/tests/manual/custom-mesh-qml/main.cpp index 28c39f694..712a860b8 100644 --- a/tests/manual/custom-mesh-qml/main.cpp +++ b/tests/manual/custom-mesh-qml/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/custom-mesh-qml/main.qml b/tests/manual/custom-mesh-qml/main.qml index 78d29e4f0..4d30f9fac 100644 --- a/tests/manual/custom-mesh-qml/main.qml +++ b/tests/manual/custom-mesh-qml/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 QtQuick 2.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/custom-mesh-update-data-cpp/main.cpp b/tests/manual/custom-mesh-update-data-cpp/main.cpp index 8fa7330be..f85545c4d 100644 --- a/tests/manual/custom-mesh-update-data-cpp/main.cpp +++ b/tests/manual/custom-mesh-update-data-cpp/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 <QGuiApplication> #include <QTimer> diff --git a/tests/manual/custom-mesh-update-data-qml/main.cpp b/tests/manual/custom-mesh-update-data-qml/main.cpp index 28c39f694..712a860b8 100644 --- a/tests/manual/custom-mesh-update-data-qml/main.cpp +++ b/tests/manual/custom-mesh-update-data-qml/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/custom-mesh-update-data-qml/main.qml b/tests/manual/custom-mesh-update-data-qml/main.qml index 348f265e0..ef28d1a10 100644 --- a/tests/manual/custom-mesh-update-data-qml/main.qml +++ b/tests/manual/custom-mesh-update-data-qml/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 QtQuick 2.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/cylinder-cpp/main.cpp b/tests/manual/cylinder-cpp/main.cpp index 0858ded3b..bb84caf96 100644 --- a/tests/manual/cylinder-cpp/main.cpp +++ b/tests/manual/cylinder-cpp/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 <QGuiApplication> diff --git a/tests/manual/cylinder-parent-test/main.cpp b/tests/manual/cylinder-parent-test/main.cpp index 30fc6a193..03760b95a 100644 --- a/tests/manual/cylinder-parent-test/main.cpp +++ b/tests/manual/cylinder-parent-test/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 <QGuiApplication> #include <QTimer> diff --git a/tests/manual/cylinder-qml/main.cpp b/tests/manual/cylinder-qml/main.cpp index cc61e611a..a6ecbc4ae 100644 --- a/tests/manual/cylinder-qml/main.cpp +++ b/tests/manual/cylinder-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 <QGuiApplication> diff --git a/tests/manual/cylinder-qml/main.qml b/tests/manual/cylinder-qml/main.qml index 1eb9d4876..f8f737913 100644 --- a/tests/manual/cylinder-qml/main.qml +++ b/tests/manual/cylinder-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/deferred-renderer-cpp/deferredrenderer.cpp b/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp index bc6dac23d..38ddb85f4 100644 --- a/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp +++ b/tests/manual/deferred-renderer-cpp/deferredrenderer.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 "deferredrenderer.h" #include "gbuffer.h" @@ -74,13 +74,13 @@ void DeferredRenderer::setSurface(QWindow *surface) if (m_window != nullptr) { // Store connections m_widthChangedConnection = QObject::connect(surface, &QWindow::widthChanged, - [this] (int width) { - m_winSize->setValue(QSizeF(float(width), m_winSize->value().toSizeF().height())); - }); + this, [this](int width) { + m_winSize->setValue(QSizeF(float(width), m_winSize->value().toSizeF().height())); + }); m_heightChangedConnection = QObject::connect(surface, &QWindow::heightChanged, - [this] (int height) { - m_winSize->setValue(QSizeF(m_winSize->value().toSizeF().width(), float(height))); - }); + this, [this](int height) { + m_winSize->setValue(QSizeF(m_winSize->value().toSizeF().width(), float(height))); + }); } } } diff --git a/tests/manual/deferred-renderer-cpp/deferredrenderer.h b/tests/manual/deferred-renderer-cpp/deferredrenderer.h index 7528528c5..3d029778a 100644 --- a/tests/manual/deferred-renderer-cpp/deferredrenderer.h +++ b/tests/manual/deferred-renderer-cpp/deferredrenderer.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 DEFERREDRENDERER_H #define DEFERREDRENDERER_H diff --git a/tests/manual/deferred-renderer-cpp/finaleffect.cpp b/tests/manual/deferred-renderer-cpp/finaleffect.cpp index 434b9ef9c..d83fd7417 100644 --- a/tests/manual/deferred-renderer-cpp/finaleffect.cpp +++ b/tests/manual/deferred-renderer-cpp/finaleffect.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 "finaleffect.h" diff --git a/tests/manual/deferred-renderer-cpp/finaleffect.h b/tests/manual/deferred-renderer-cpp/finaleffect.h index 7ea3c433b..48b9d4e12 100644 --- a/tests/manual/deferred-renderer-cpp/finaleffect.h +++ b/tests/manual/deferred-renderer-cpp/finaleffect.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 FINALEFFECT_H #define FINALEFFECT_H diff --git a/tests/manual/deferred-renderer-cpp/gbuffer.cpp b/tests/manual/deferred-renderer-cpp/gbuffer.cpp index 9658e97ac..489b785cd 100644 --- a/tests/manual/deferred-renderer-cpp/gbuffer.cpp +++ b/tests/manual/deferred-renderer-cpp/gbuffer.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 "gbuffer.h" diff --git a/tests/manual/deferred-renderer-cpp/gbuffer.h b/tests/manual/deferred-renderer-cpp/gbuffer.h index 688d624a7..27f694933 100644 --- a/tests/manual/deferred-renderer-cpp/gbuffer.h +++ b/tests/manual/deferred-renderer-cpp/gbuffer.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 GBUFFER_H #define GBUFFER_H diff --git a/tests/manual/deferred-renderer-cpp/main.cpp b/tests/manual/deferred-renderer-cpp/main.cpp index 885d475d3..207d3f998 100644 --- a/tests/manual/deferred-renderer-cpp/main.cpp +++ b/tests/manual/deferred-renderer-cpp/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 <Qt3DCore/QEntity> diff --git a/tests/manual/deferred-renderer-cpp/pointlightblock.cpp b/tests/manual/deferred-renderer-cpp/pointlightblock.cpp index 38b363a3d..caa55818a 100644 --- a/tests/manual/deferred-renderer-cpp/pointlightblock.cpp +++ b/tests/manual/deferred-renderer-cpp/pointlightblock.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 "pointlightblock.h" diff --git a/tests/manual/deferred-renderer-cpp/pointlightblock.h b/tests/manual/deferred-renderer-cpp/pointlightblock.h index d7514ba83..a926123bc 100644 --- a/tests/manual/deferred-renderer-cpp/pointlightblock.h +++ b/tests/manual/deferred-renderer-cpp/pointlightblock.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 POINTLIGHTBLOCK_H #define POINTLIGHTBLOCK_H diff --git a/tests/manual/deferred-renderer-cpp/sceneeffect.cpp b/tests/manual/deferred-renderer-cpp/sceneeffect.cpp index 316f67527..7ce300334 100644 --- a/tests/manual/deferred-renderer-cpp/sceneeffect.cpp +++ b/tests/manual/deferred-renderer-cpp/sceneeffect.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 "sceneeffect.h" diff --git a/tests/manual/deferred-renderer-cpp/sceneeffect.h b/tests/manual/deferred-renderer-cpp/sceneeffect.h index 7a701e295..74ac0561c 100644 --- a/tests/manual/deferred-renderer-cpp/sceneeffect.h +++ b/tests/manual/deferred-renderer-cpp/sceneeffect.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 SCENEEFFECT_H #define SCENEEFFECT_H diff --git a/tests/manual/deferred-renderer-cpp/sceneentity.cpp b/tests/manual/deferred-renderer-cpp/sceneentity.cpp index 3806af378..446ba8b80 100644 --- a/tests/manual/deferred-renderer-cpp/sceneentity.cpp +++ b/tests/manual/deferred-renderer-cpp/sceneentity.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "sceneentity.h" #include "sceneeffect.h" diff --git a/tests/manual/deferred-renderer-cpp/sceneentity.h b/tests/manual/deferred-renderer-cpp/sceneentity.h index fea3123ab..f6e7c00dc 100644 --- a/tests/manual/deferred-renderer-cpp/sceneentity.h +++ b/tests/manual/deferred-renderer-cpp/sceneentity.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef SCENEENTITY_H #define SCENEENTITY_H diff --git a/tests/manual/deferred-renderer-cpp/screenquadentity.cpp b/tests/manual/deferred-renderer-cpp/screenquadentity.cpp index bc8d800cd..42aa9855e 100644 --- a/tests/manual/deferred-renderer-cpp/screenquadentity.cpp +++ b/tests/manual/deferred-renderer-cpp/screenquadentity.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "screenquadentity.h" #include "finaleffect.h" diff --git a/tests/manual/deferred-renderer-cpp/screenquadentity.h b/tests/manual/deferred-renderer-cpp/screenquadentity.h index 01d8a1d1a..959f3d611 100644 --- a/tests/manual/deferred-renderer-cpp/screenquadentity.h +++ b/tests/manual/deferred-renderer-cpp/screenquadentity.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef SCREENQUADENTITY_H #define SCREENQUADENTITY_H diff --git a/tests/manual/deferred-renderer-qml/DeferredRenderer.qml b/tests/manual/deferred-renderer-qml/DeferredRenderer.qml index 9182c91cf..b681337da 100644 --- a/tests/manual/deferred-renderer-qml/DeferredRenderer.qml +++ b/tests/manual/deferred-renderer-qml/DeferredRenderer.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/deferred-renderer-qml/FinalEffect.qml b/tests/manual/deferred-renderer-qml/FinalEffect.qml index 8f5e17bd8..671f4ca4a 100644 --- a/tests/manual/deferred-renderer-qml/FinalEffect.qml +++ b/tests/manual/deferred-renderer-qml/FinalEffect.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/deferred-renderer-qml/GBuffer.qml b/tests/manual/deferred-renderer-qml/GBuffer.qml index 248317a66..b90ab5de6 100644 --- a/tests/manual/deferred-renderer-qml/GBuffer.qml +++ b/tests/manual/deferred-renderer-qml/GBuffer.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/deferred-renderer-qml/GBufferDebugger.qml b/tests/manual/deferred-renderer-qml/GBufferDebugger.qml index 93111e7dd..feb753ced 100644 --- a/tests/manual/deferred-renderer-qml/GBufferDebugger.qml +++ b/tests/manual/deferred-renderer-qml/GBufferDebugger.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// 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/deferred-renderer-qml/SceneEffect.qml b/tests/manual/deferred-renderer-qml/SceneEffect.qml index 5863b9b09..37dd64fbe 100644 --- a/tests/manual/deferred-renderer-qml/SceneEffect.qml +++ b/tests/manual/deferred-renderer-qml/SceneEffect.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/deferred-renderer-qml/SceneEntity.qml b/tests/manual/deferred-renderer-qml/SceneEntity.qml index b2f4d22df..677c7ec56 100644 --- a/tests/manual/deferred-renderer-qml/SceneEntity.qml +++ b/tests/manual/deferred-renderer-qml/SceneEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.0 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/deferred-renderer-qml/ScreenQuadEntity.qml b/tests/manual/deferred-renderer-qml/ScreenQuadEntity.qml index c11eb93b2..1b0226791 100644 --- a/tests/manual/deferred-renderer-qml/ScreenQuadEntity.qml +++ b/tests/manual/deferred-renderer-qml/ScreenQuadEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// 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/deferred-renderer-qml/main.cpp b/tests/manual/deferred-renderer-qml/main.cpp index 95e156c65..69afec386 100644 --- a/tests/manual/deferred-renderer-qml/main.cpp +++ b/tests/manual/deferred-renderer-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 <QGuiApplication> diff --git a/tests/manual/deferred-renderer-qml/main.qml b/tests/manual/deferred-renderer-qml/main.qml index 4b5974583..d4d47dd3b 100644 --- a/tests/manual/deferred-renderer-qml/main.qml +++ b/tests/manual/deferred-renderer-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 QtQuick 2.0 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/distancefieldtext-dynamic/TextScene.qml b/tests/manual/distancefieldtext-dynamic/TextScene.qml index 8ed763085..5e99b934e 100644 --- a/tests/manual/distancefieldtext-dynamic/TextScene.qml +++ b/tests/manual/distancefieldtext-dynamic/TextScene.qml @@ -1,5 +1,5 @@ // Copyright (C) 2023 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/distancefieldtext-dynamic/main.cpp b/tests/manual/distancefieldtext-dynamic/main.cpp index 0450ba2fe..8ef600226 100644 --- a/tests/manual/distancefieldtext-dynamic/main.cpp +++ b/tests/manual/distancefieldtext-dynamic/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2023 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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/distancefieldtext-dynamic/main.qml b/tests/manual/distancefieldtext-dynamic/main.qml index 61d65db97..dcad11a78 100644 --- a/tests/manual/distancefieldtext-dynamic/main.qml +++ b/tests/manual/distancefieldtext-dynamic/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2023 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.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/distancefieldtext/TextScene.qml b/tests/manual/distancefieldtext/TextScene.qml index b59e93543..6026216d1 100644 --- a/tests/manual/distancefieldtext/TextScene.qml +++ b/tests/manual/distancefieldtext/TextScene.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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/distancefieldtext/main.cpp b/tests/manual/distancefieldtext/main.cpp index 37464deaf..872682acc 100644 --- a/tests/manual/distancefieldtext/main.cpp +++ b/tests/manual/distancefieldtext/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/distancefieldtext/main.qml b/tests/manual/distancefieldtext/main.qml index 6f3c6ffbc..599a5d26a 100644 --- a/tests/manual/distancefieldtext/main.qml +++ b/tests/manual/distancefieldtext/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/downloading/main.cpp b/tests/manual/downloading/main.cpp index 9c7ca6548..cd32b4c0b 100644 --- a/tests/manual/downloading/main.cpp +++ b/tests/manual/downloading/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/downloading/main.qml b/tests/manual/downloading/main.qml index 6ac3c3da4..cacec265e 100644 --- a/tests/manual/downloading/main.qml +++ b/tests/manual/downloading/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/dragging/main.cpp b/tests/manual/dragging/main.cpp index 9c7ca6548..cd32b4c0b 100644 --- a/tests/manual/dragging/main.cpp +++ b/tests/manual/dragging/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/dragging/main.qml b/tests/manual/dragging/main.qml index 485c355aa..9ba8d3d96 100644 --- a/tests/manual/dragging/main.qml +++ b/tests/manual/dragging/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/dynamic-model-loader-qml/CuboidEntity.qml b/tests/manual/dynamic-model-loader-qml/CuboidEntity.qml index e7cd364e7..488c5e058 100644 --- a/tests/manual/dynamic-model-loader-qml/CuboidEntity.qml +++ b/tests/manual/dynamic-model-loader-qml/CuboidEntity.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.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/dynamic-model-loader-qml/SphereEntity.qml b/tests/manual/dynamic-model-loader-qml/SphereEntity.qml index 15673eeb4..8b263549f 100644 --- a/tests/manual/dynamic-model-loader-qml/SphereEntity.qml +++ b/tests/manual/dynamic-model-loader-qml/SphereEntity.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.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/dynamic-model-loader-qml/main.cpp b/tests/manual/dynamic-model-loader-qml/main.cpp index b9424f36d..34848a42e 100644 --- a/tests/manual/dynamic-model-loader-qml/main.cpp +++ b/tests/manual/dynamic-model-loader-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 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/dynamic-model-loader-qml/main.qml b/tests/manual/dynamic-model-loader-qml/main.qml index 3f5d7b15f..a7579cc6d 100644 --- a/tests/manual/dynamic-model-loader-qml/main.qml +++ b/tests/manual/dynamic-model-loader-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 QtQuick 2.2 as QQ2 import Qt3D.Core 2.12 diff --git a/tests/manual/dynamicscene-cpp/boxentity.cpp b/tests/manual/dynamicscene-cpp/boxentity.cpp index d304dc5aa..43d5c5a40 100644 --- a/tests/manual/dynamicscene-cpp/boxentity.cpp +++ b/tests/manual/dynamicscene-cpp/boxentity.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 "boxentity.h" #include <Qt3DRender/QGeometryRenderer> diff --git a/tests/manual/dynamicscene-cpp/boxentity.h b/tests/manual/dynamicscene-cpp/boxentity.h index 6201b6311..543f038fb 100644 --- a/tests/manual/dynamicscene-cpp/boxentity.h +++ b/tests/manual/dynamicscene-cpp/boxentity.h @@ -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 #ifndef BOXENTITY_H #define BOXENTITY_H diff --git a/tests/manual/dynamicscene-cpp/examplescene.cpp b/tests/manual/dynamicscene-cpp/examplescene.cpp index 749a8bd45..b9491e9d9 100644 --- a/tests/manual/dynamicscene-cpp/examplescene.cpp +++ b/tests/manual/dynamicscene-cpp/examplescene.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 "examplescene.h" #include "boxentity.h" diff --git a/tests/manual/dynamicscene-cpp/examplescene.h b/tests/manual/dynamicscene-cpp/examplescene.h index 0a8b0c83d..4cafb1492 100644 --- a/tests/manual/dynamicscene-cpp/examplescene.h +++ b/tests/manual/dynamicscene-cpp/examplescene.h @@ -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 #ifndef EXAMPLESCENE_H #define EXAMPLESCENE_H diff --git a/tests/manual/dynamicscene-cpp/main.cpp b/tests/manual/dynamicscene-cpp/main.cpp index dca22c58c..b9fd50f4c 100644 --- a/tests/manual/dynamicscene-cpp/main.cpp +++ b/tests/manual/dynamicscene-cpp/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 <QGuiApplication> diff --git a/tests/manual/enabled-qml/main.cpp b/tests/manual/enabled-qml/main.cpp index c7182b6d5..a5b8a0818 100644 --- a/tests/manual/enabled-qml/main.cpp +++ b/tests/manual/enabled-qml/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 <QGuiApplication> #include <Qt3DQuickExtras/qt3dquickwindow.h> diff --git a/tests/manual/enabled-qml/main.qml b/tests/manual/enabled-qml/main.qml index 10a5fda15..fbd841fb3 100644 --- a/tests/manual/enabled-qml/main.qml +++ b/tests/manual/enabled-qml/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/exampleresources/assets/cubemaps/miramar/qt_attribution.json b/tests/manual/exampleresources/assets/cubemaps/miramar/qt_attribution.json deleted file mode 100644 index c147af447..000000000 --- a/tests/manual/exampleresources/assets/cubemaps/miramar/qt_attribution.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Id": "miramar-sky", - "Name": "Miramar Skybox Textures", - "QDocModule": "qt3d", - "QtUsage": "Used in the anaglyph-rendering example and autotests of Qt 3D.", - - "QtParts": [ "examples", "tests" ] , - "Description": "High res environment map (converted to webgl).", - "Homepage": "http://www.zfight.com/misc/files/textures/envmap_miramar.rar", - "DownloadLocation": "https://opengameart.org/sites/default/files/envmap_miramar.zip", - "License": "Modify however you like, just cred me for my work, maybe link to my page.", - "LicenseId": "LicenseRef-MIRAMAR", - "LicenseFile": "README.TXT", - "Copyright": "Copyright (c) Jockum Skoglund aka hipshot" -} diff --git a/tests/manual/exampleresources/assets/obj/qt_attribution.json b/tests/manual/exampleresources/assets/obj/qt_attribution.json deleted file mode 100644 index 82c57cdea..000000000 --- a/tests/manual/exampleresources/assets/obj/qt_attribution.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "Id": "substance_share", - "Name": "Substance Share", - "QDocModule": "qt3d", - "QtParts": ["examples"], - "Description": "Substance Share provides for free exchange of 3D assets including material-sphere.obj", - "QtUsage": "Used in Qt 3D pbr-materials example.", - - "Homepage": "https://share.allegorithmic.com/libraries/2026", - "License": "Creative Commons Attribution 4.0", - "LicenseId": "CC-BY-4.0", - "Copyright": "Copyright (c) 2016, Allegorithmic" -} diff --git a/tests/manual/gltf/Wine.qml b/tests/manual/gltf/Wine.qml index 187fff8ba..0e53715b4 100644 --- a/tests/manual/gltf/Wine.qml +++ b/tests/manual/gltf/Wine.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// 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/gltf/main.cpp b/tests/manual/gltf/main.cpp index e5737ea7b..8139a8007 100644 --- a/tests/manual/gltf/main.cpp +++ b/tests/manual/gltf/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 <QGuiApplication> diff --git a/tests/manual/gltf/main.qml b/tests/manual/gltf/main.qml index 9ab818ecb..b6ce52e00 100644 --- a/tests/manual/gltf/main.qml +++ b/tests/manual/gltf/main.qml @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// 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/gooch-qml/MyEntity.qml b/tests/manual/gooch-qml/MyEntity.qml index 506e85b08..2b0ac8f3c 100644 --- a/tests/manual/gooch-qml/MyEntity.qml +++ b/tests/manual/gooch-qml/MyEntity.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/gooch-qml/main.cpp b/tests/manual/gooch-qml/main.cpp index 61831e6cf..c7476eec1 100644 --- a/tests/manual/gooch-qml/main.cpp +++ b/tests/manual/gooch-qml/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 <Qt3DQuick/QQmlAspectEngine> diff --git a/tests/manual/gooch-qml/main.qml b/tests/manual/gooch-qml/main.qml index 2caf07147..575f1a130 100644 --- a/tests/manual/gooch-qml/main.qml +++ b/tests/manual/gooch-qml/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/keyboardinput-qml/SphereEntity.qml b/tests/manual/keyboardinput-qml/SphereEntity.qml index ac8601d03..114880982 100644 --- a/tests/manual/keyboardinput-qml/SphereEntity.qml +++ b/tests/manual/keyboardinput-qml/SphereEntity.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/keyboardinput-qml/main.cpp b/tests/manual/keyboardinput-qml/main.cpp index cc61e611a..a6ecbc4ae 100644 --- a/tests/manual/keyboardinput-qml/main.cpp +++ b/tests/manual/keyboardinput-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 <QGuiApplication> diff --git a/tests/manual/keyboardinput-qml/main.qml b/tests/manual/keyboardinput-qml/main.qml index bca18202d..8c58561ca 100644 --- a/tests/manual/keyboardinput-qml/main.qml +++ b/tests/manual/keyboardinput-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/layerfilter-qml/main.cpp b/tests/manual/layerfilter-qml/main.cpp index 9c7ca6548..cd32b4c0b 100644 --- a/tests/manual/layerfilter-qml/main.cpp +++ b/tests/manual/layerfilter-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/layerfilter-qml/main.qml b/tests/manual/layerfilter-qml/main.qml index a4eb4ff63..267a01f46 100644 --- a/tests/manual/layerfilter-qml/main.qml +++ b/tests/manual/layerfilter-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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.10 diff --git a/tests/manual/loader-qml/CuboidEntity.qml b/tests/manual/loader-qml/CuboidEntity.qml index e7cd364e7..488c5e058 100644 --- a/tests/manual/loader-qml/CuboidEntity.qml +++ b/tests/manual/loader-qml/CuboidEntity.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.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/loader-qml/SphereEntity.qml b/tests/manual/loader-qml/SphereEntity.qml index 15673eeb4..8b263549f 100644 --- a/tests/manual/loader-qml/SphereEntity.qml +++ b/tests/manual/loader-qml/SphereEntity.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.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/loader-qml/main.cpp b/tests/manual/loader-qml/main.cpp index cc61e611a..a6ecbc4ae 100644 --- a/tests/manual/loader-qml/main.cpp +++ b/tests/manual/loader-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 <QGuiApplication> diff --git a/tests/manual/loader-qml/main.qml b/tests/manual/loader-qml/main.qml index f45208b80..77d695d09 100644 --- a/tests/manual/loader-qml/main.qml +++ b/tests/manual/loader-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 QtQuick 2.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/lod/ConeEntity.qml b/tests/manual/lod/ConeEntity.qml index b243885fc..c5690dfde 100644 --- a/tests/manual/lod/ConeEntity.qml +++ b/tests/manual/lod/ConeEntity.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.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/lod/CuboidEntity.qml b/tests/manual/lod/CuboidEntity.qml index 89aadd44b..225fc97b0 100644 --- a/tests/manual/lod/CuboidEntity.qml +++ b/tests/manual/lod/CuboidEntity.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.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/lod/CylinderEntity.qml b/tests/manual/lod/CylinderEntity.qml index 23baf4e41..5ded0d010 100644 --- a/tests/manual/lod/CylinderEntity.qml +++ b/tests/manual/lod/CylinderEntity.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.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/lod/SphereEntity.qml b/tests/manual/lod/SphereEntity.qml index ae97b2a02..ae71ef7b8 100644 --- a/tests/manual/lod/SphereEntity.qml +++ b/tests/manual/lod/SphereEntity.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.4 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/lod/main.cpp b/tests/manual/lod/main.cpp index 9c7ca6548..cd32b4c0b 100644 --- a/tests/manual/lod/main.cpp +++ b/tests/manual/lod/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/lod/main.qml b/tests/manual/lod/main.qml index 225b03d29..eee3a9a9b 100644 --- a/tests/manual/lod/main.qml +++ b/tests/manual/lod/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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.9 diff --git a/tests/manual/manual-renderloop/main.cpp b/tests/manual/manual-renderloop/main.cpp index 40b38e936..d5f5240f6 100644 --- a/tests/manual/manual-renderloop/main.cpp +++ b/tests/manual/manual-renderloop/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> #include <QTimer> @@ -171,7 +171,7 @@ int main(int ac, char **av) renderer.initialize(&win, &ctx); QTimer t; - QObject::connect(&t, &QTimer::timeout, [&] { renderer.render(); }); + QObject::connect(&t, &QTimer::timeout, &t, [&] { renderer.render(); }); t.start(16); return app.exec(); diff --git a/tests/manual/mesh-morphing/main.cpp b/tests/manual/mesh-morphing/main.cpp index 11d5f133a..b00f2ca5d 100644 --- a/tests/manual/mesh-morphing/main.cpp +++ b/tests/manual/mesh-morphing/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> #include <QPropertyAnimation> diff --git a/tests/manual/mouseinput-qml/main.cpp b/tests/manual/mouseinput-qml/main.cpp index bf3376b9a..c7a8dcded 100644 --- a/tests/manual/mouseinput-qml/main.cpp +++ b/tests/manual/mouseinput-qml/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/mouseinput-qml/main.qml b/tests/manual/mouseinput-qml/main.qml index 21089070f..b31df8ac6 100644 --- a/tests/manual/mouseinput-qml/main.qml +++ b/tests/manual/mouseinput-qml/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/multi-qquickwidgets-scene3d/main.cpp b/tests/manual/multi-qquickwidgets-scene3d/main.cpp index f7a5f2ad5..8da0f2798 100644 --- a/tests/manual/multi-qquickwidgets-scene3d/main.cpp +++ b/tests/manual/multi-qquickwidgets-scene3d/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 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 <QGuiApplication> diff --git a/tests/manual/multi-qquickwidgets-scene3d/main.qml b/tests/manual/multi-qquickwidgets-scene3d/main.qml index 850c3aedc..2123bc77a 100644 --- a/tests/manual/multi-qquickwidgets-scene3d/main.qml +++ b/tests/manual/multi-qquickwidgets-scene3d/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2022 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 6.0 as QQ2 import Qt3D.Core 2.15 diff --git a/tests/manual/multi-qquickwidgets-scene3d/main2.qml b/tests/manual/multi-qquickwidgets-scene3d/main2.qml index dd94d1f6e..41df2717a 100644 --- a/tests/manual/multi-qquickwidgets-scene3d/main2.qml +++ b/tests/manual/multi-qquickwidgets-scene3d/main2.qml @@ -1,5 +1,5 @@ // Copyright (C) 2022 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 6.0 as QQ2 import Qt3D.Core 2.15 diff --git a/tests/manual/multiplewindows-qml/Scene.qml b/tests/manual/multiplewindows-qml/Scene.qml index a1b5086f5..539ea72e9 100644 --- a/tests/manual/multiplewindows-qml/Scene.qml +++ b/tests/manual/multiplewindows-qml/Scene.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.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/multiplewindows-qml/main.cpp b/tests/manual/multiplewindows-qml/main.cpp index d3c44ae63..f314866a8 100644 --- a/tests/manual/multiplewindows-qml/main.cpp +++ b/tests/manual/multiplewindows-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/tests/manual/multiplewindows-qml/main.qml b/tests/manual/multiplewindows-qml/main.qml index a9e776af4..36e2d7c5f 100644 --- a/tests/manual/multiplewindows-qml/main.qml +++ b/tests/manual/multiplewindows-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 QtQuick 2.7 import QtQuick.Window 2.2 as QQW diff --git a/tests/manual/paintedtexture-cpp/main.cpp b/tests/manual/paintedtexture-cpp/main.cpp index 7deca04c1..08aed2b5a 100644 --- a/tests/manual/paintedtexture-cpp/main.cpp +++ b/tests/manual/paintedtexture-cpp/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 "scene.h" @@ -69,7 +69,7 @@ int main(int argc, char **argv) changeSizeSlider->setOrientation(Qt::Horizontal); changeSizeSlider->setMinimum(0); changeSizeSlider->setMaximum(4); - QObject::connect(changeSizeSlider, &QSlider::valueChanged, [scene, sizeLabel](int value) { + QObject::connect(changeSizeSlider, &QSlider::valueChanged, scene, [scene, sizeLabel](int value) { int sz = 128 << value; scene->setSize(QSize(sz, sz)); sizeLabel->setText(QString("Current Size: %1x%1").arg(sz)); diff --git a/tests/manual/paintedtexture-cpp/scene.cpp b/tests/manual/paintedtexture-cpp/scene.cpp index 2ff0c9146..1ed38a6f3 100644 --- a/tests/manual/paintedtexture-cpp/scene.cpp +++ b/tests/manual/paintedtexture-cpp/scene.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 "scene.h" diff --git a/tests/manual/paintedtexture-cpp/scene.h b/tests/manual/paintedtexture-cpp/scene.h index 526d061ae..d1c5a4aa3 100644 --- a/tests/manual/paintedtexture-cpp/scene.h +++ b/tests/manual/paintedtexture-cpp/scene.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 SCENE_H #define SCENE_H diff --git a/tests/manual/phong-cubes/CubeEntity.qml b/tests/manual/phong-cubes/CubeEntity.qml index 24f360eb9..d47e5d69e 100644 --- a/tests/manual/phong-cubes/CubeEntity.qml +++ b/tests/manual/phong-cubes/CubeEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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.0 as Quick import Qt3D.Core 2.0 diff --git a/tests/manual/phong-cubes/main.cpp b/tests/manual/phong-cubes/main.cpp index 9c7ca6548..cd32b4c0b 100644 --- a/tests/manual/phong-cubes/main.cpp +++ b/tests/manual/phong-cubes/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/phong-cubes/main.qml b/tests/manual/phong-cubes/main.qml index ed56387d4..9789afebe 100644 --- a/tests/manual/phong-cubes/main.qml +++ b/tests/manual/phong-cubes/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/picking-qml/PickableEntity.qml b/tests/manual/picking-qml/PickableEntity.qml index 79e0d7f2c..2bb937542 100644 --- a/tests/manual/picking-qml/PickableEntity.qml +++ b/tests/manual/picking-qml/PickableEntity.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/picking-qml/main.cpp b/tests/manual/picking-qml/main.cpp index e197ce968..4364b4b29 100644 --- a/tests/manual/picking-qml/main.cpp +++ b/tests/manual/picking-qml/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> diff --git a/tests/manual/picking-qml/main.qml b/tests/manual/picking-qml/main.qml index 782ae4e25..838ab90da 100644 --- a/tests/manual/picking-qml/main.qml +++ b/tests/manual/picking-qml/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.16 diff --git a/tests/manual/planets-qml/AppleTVInput.qml b/tests/manual/planets-qml/AppleTVInput.qml index 8926b54f1..6bd1d5a60 100644 --- a/tests/manual/planets-qml/AppleTVInput.qml +++ b/tests/manual/planets-qml/AppleTVInput.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 QtQuick 2.7 import QtQuick.Window 2.2 diff --git a/tests/manual/planets-qml/FpsDisplay.qml b/tests/manual/planets-qml/FpsDisplay.qml index 8f3052189..5579ca5bd 100644 --- a/tests/manual/planets-qml/FpsDisplay.qml +++ b/tests/manual/planets-qml/FpsDisplay.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 QtQuick 2.0 diff --git a/tests/manual/planets-qml/InfoSheet.qml b/tests/manual/planets-qml/InfoSheet.qml index 3f6bd3a34..8f7e4ab5b 100644 --- a/tests/manual/planets-qml/InfoSheet.qml +++ b/tests/manual/planets-qml/InfoSheet.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 QtQuick 2.0 diff --git a/tests/manual/planets-qml/Planet.qml b/tests/manual/planets-qml/Planet.qml index 530ef2ce0..acd5ccdeb 100644 --- a/tests/manual/planets-qml/Planet.qml +++ b/tests/manual/planets-qml/Planet.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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.Render 2.0 import Qt3D.Extras 2.0 diff --git a/tests/manual/planets-qml/PlanetButton.qml b/tests/manual/planets-qml/PlanetButton.qml index a2d8da559..282303f47 100644 --- a/tests/manual/planets-qml/PlanetButton.qml +++ b/tests/manual/planets-qml/PlanetButton.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 QtQuick 2.0 diff --git a/tests/manual/planets-qml/PlanetEffect.qml b/tests/manual/planets-qml/PlanetEffect.qml index 307006048..6d3557941 100644 --- a/tests/manual/planets-qml/PlanetEffect.qml +++ b/tests/manual/planets-qml/PlanetEffect.qml @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 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/manual/planets-qml/PlanetFrameGraph.qml b/tests/manual/planets-qml/PlanetFrameGraph.qml index fac5e2687..450c64b2c 100644 --- a/tests/manual/planets-qml/PlanetFrameGraph.qml +++ b/tests/manual/planets-qml/PlanetFrameGraph.qml @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 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/manual/planets-qml/PlanetMaterial.qml b/tests/manual/planets-qml/PlanetMaterial.qml index 9fcfd09fe..6aed93084 100644 --- a/tests/manual/planets-qml/PlanetMaterial.qml +++ b/tests/manual/planets-qml/PlanetMaterial.qml @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 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/manual/planets-qml/PlanetsLight.qml b/tests/manual/planets-qml/PlanetsLight.qml index 7a76ff53d..506d58037 100644 --- a/tests/manual/planets-qml/PlanetsLight.qml +++ b/tests/manual/planets-qml/PlanetsLight.qml @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 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/manual/planets-qml/PlanetsMain.qml b/tests/manual/planets-qml/PlanetsMain.qml index 4a3ec2545..a98fbc618 100644 --- a/tests/manual/planets-qml/PlanetsMain.qml +++ b/tests/manual/planets-qml/PlanetsMain.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 QtQuick 2.0 import QtQuick.Window 2.2 diff --git a/tests/manual/planets-qml/Ring.qml b/tests/manual/planets-qml/Ring.qml index 441f89ad5..b2c8f3b60 100644 --- a/tests/manual/planets-qml/Ring.qml +++ b/tests/manual/planets-qml/Ring.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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.Render 2.0 diff --git a/tests/manual/planets-qml/ShadowEffect.qml b/tests/manual/planets-qml/ShadowEffect.qml index 4b8992f24..d1fe78a3f 100644 --- a/tests/manual/planets-qml/ShadowEffect.qml +++ b/tests/manual/planets-qml/ShadowEffect.qml @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 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/manual/planets-qml/SolarSystem.qml b/tests/manual/planets-qml/SolarSystem.qml index 7630a4eb5..551bdd90e 100644 --- a/tests/manual/planets-qml/SolarSystem.qml +++ b/tests/manual/planets-qml/SolarSystem.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 QtQuick 2.0 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/planets-qml/StyledSlider.qml b/tests/manual/planets-qml/StyledSlider.qml index e6fff7c1a..6b56e83af 100644 --- a/tests/manual/planets-qml/StyledSlider.qml +++ b/tests/manual/planets-qml/StyledSlider.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 QtQuick 2.0 import QtQuick.Controls 2.0 diff --git a/tests/manual/planets-qml/SunEffect.qml b/tests/manual/planets-qml/SunEffect.qml index 14b9d9f71..9b2f4b574 100644 --- a/tests/manual/planets-qml/SunEffect.qml +++ b/tests/manual/planets-qml/SunEffect.qml @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 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/manual/planets-qml/images/nasa/qt_attribution.json b/tests/manual/planets-qml/images/nasa/qt_attribution.json index 6f47e3837..237580070 100644 --- a/tests/manual/planets-qml/images/nasa/qt_attribution.json +++ b/tests/manual/planets-qml/images/nasa/qt_attribution.json @@ -2,7 +2,7 @@ "Id": "nasa-jpl", "Name": "Jet Propulsion Laboratory Photojournal", "QDocModule": "qt3d", - "QtParts": ["examples"], + "QtParts": ["tests"], "Description": "The NASA/JPL Photojournal provides high quality images related to space research and exploration", "QtUsage": "Used in Qt 3D planets-qml example.", diff --git a/tests/manual/planets-qml/images/solarsystemscope/qt_attribution.json b/tests/manual/planets-qml/images/solarsystemscope/qt_attribution.json index 9d32e541d..c603bbea1 100644 --- a/tests/manual/planets-qml/images/solarsystemscope/qt_attribution.json +++ b/tests/manual/planets-qml/images/solarsystemscope/qt_attribution.json @@ -2,7 +2,7 @@ "Id": "solar_system_scope", "Name": "Solar System Scope Texture Library", "QDocModule": "qt3d", - "QtParts": ["examples"], + "QtParts": ["tests"], "Description": "Solar System Scope provides high quality, free to use textures for objects in the solar system.", "QtUsage": "Used in Qt 3D planets-qml example.", diff --git a/tests/manual/planets-qml/main.cpp b/tests/manual/planets-qml/main.cpp index a410b6486..834cc3c06 100644 --- a/tests/manual/planets-qml/main.cpp +++ b/tests/manual/planets-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/planets-qml/networkcontroller.cpp b/tests/manual/planets-qml/networkcontroller.cpp index ab25bb0a1..6267d8275 100644 --- a/tests/manual/planets-qml/networkcontroller.cpp +++ b/tests/manual/planets-qml/networkcontroller.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 "networkcontroller.h" diff --git a/tests/manual/planets-qml/networkcontroller.h b/tests/manual/planets-qml/networkcontroller.h index 1746f4287..90712025e 100644 --- a/tests/manual/planets-qml/networkcontroller.h +++ b/tests/manual/planets-qml/networkcontroller.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 #ifndef NETWORKCONTROLLER_H #define NETWORKCONTROLLER_H diff --git a/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/ExtensionDelegate.h b/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/ExtensionDelegate.h index ad3ff3efa..dfd9b7fde 100644 --- a/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/ExtensionDelegate.h +++ b/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/ExtensionDelegate.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 <WatchKit/WatchKit.h> diff --git a/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/ExtensionDelegate.m b/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/ExtensionDelegate.m index 2c56d4b19..014c5fa40 100644 --- a/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/ExtensionDelegate.m +++ b/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/ExtensionDelegate.m @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 "ExtensionDelegate.h" diff --git a/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/InterfaceController.h b/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/InterfaceController.h index 1620148fc..0e11fa23d 100644 --- a/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/InterfaceController.h +++ b/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/InterfaceController.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 <WatchKit/WatchKit.h> #import <Foundation/Foundation.h> diff --git a/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/InterfaceController.m b/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/InterfaceController.m index 4d3cb1b70..77f052002 100644 --- a/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/InterfaceController.m +++ b/tests/manual/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/InterfaceController.m @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 "InterfaceController.h" diff --git a/tests/manual/planets-qml/planets-watchos/PlanetsClient/AppDelegate.h b/tests/manual/planets-qml/planets-watchos/PlanetsClient/AppDelegate.h index 489a7861f..8ec37d7ee 100644 --- a/tests/manual/planets-qml/planets-watchos/PlanetsClient/AppDelegate.h +++ b/tests/manual/planets-qml/planets-watchos/PlanetsClient/AppDelegate.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 <UIKit/UIKit.h> diff --git a/tests/manual/planets-qml/planets-watchos/PlanetsClient/AppDelegate.m b/tests/manual/planets-qml/planets-watchos/PlanetsClient/AppDelegate.m index 847df7d69..b44f13fd3 100644 --- a/tests/manual/planets-qml/planets-watchos/PlanetsClient/AppDelegate.m +++ b/tests/manual/planets-qml/planets-watchos/PlanetsClient/AppDelegate.m @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 "AppDelegate.h" diff --git a/tests/manual/planets-qml/planets-watchos/PlanetsClient/ViewController.h b/tests/manual/planets-qml/planets-watchos/PlanetsClient/ViewController.h index ca14ab1bb..63f2b6ec1 100644 --- a/tests/manual/planets-qml/planets-watchos/PlanetsClient/ViewController.h +++ b/tests/manual/planets-qml/planets-watchos/PlanetsClient/ViewController.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 <UIKit/UIKit.h> #import <WatchConnectivity/WatchConnectivity.h> diff --git a/tests/manual/planets-qml/planets-watchos/PlanetsClient/ViewController.m b/tests/manual/planets-qml/planets-watchos/PlanetsClient/ViewController.m index c5b2c943b..985a08a1d 100644 --- a/tests/manual/planets-qml/planets-watchos/PlanetsClient/ViewController.m +++ b/tests/manual/planets-qml/planets-watchos/PlanetsClient/ViewController.m @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 "ViewController.h" diff --git a/tests/manual/planets-qml/planets.js b/tests/manual/planets-qml/planets.js index 50799e059..661f836ea 100644 --- a/tests/manual/planets-qml/planets.js +++ b/tests/manual/planets-qml/planets.js @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 .pragma library diff --git a/tests/manual/planets-qml/shaders/es2/planetD.frag b/tests/manual/planets-qml/shaders/es2/planetD.frag index e680f534d..f34a2a23e 100644 --- a/tests/manual/planets-qml/shaders/es2/planetD.frag +++ b/tests/manual/planets-qml/shaders/es2/planetD.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 uniform highp mat4 viewMatrix; diff --git a/tests/manual/planets-qml/shaders/es2/planetD.vert b/tests/manual/planets-qml/shaders/es2/planetD.vert index ccb004286..a5da1441e 100644 --- a/tests/manual/planets-qml/shaders/es2/planetD.vert +++ b/tests/manual/planets-qml/shaders/es2/planetD.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 attribute vec3 vertexPosition; attribute vec3 vertexNormal; diff --git a/tests/manual/planets-qml/shaders/es2/planetDB.frag b/tests/manual/planets-qml/shaders/es2/planetDB.frag index e21a60ede..376e38939 100644 --- a/tests/manual/planets-qml/shaders/es2/planetDB.frag +++ b/tests/manual/planets-qml/shaders/es2/planetDB.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 uniform highp mat4 viewMatrix; diff --git a/tests/manual/planets-qml/shaders/es2/planetDB.vert b/tests/manual/planets-qml/shaders/es2/planetDB.vert index ef76b4e7e..0a7c08604 100644 --- a/tests/manual/planets-qml/shaders/es2/planetDB.vert +++ b/tests/manual/planets-qml/shaders/es2/planetDB.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 attribute vec3 vertexPosition; attribute vec3 vertexNormal; diff --git a/tests/manual/planets-qml/shaders/es2/planetDS.frag b/tests/manual/planets-qml/shaders/es2/planetDS.frag index 5835a9b3b..d4ee704bf 100644 --- a/tests/manual/planets-qml/shaders/es2/planetDS.frag +++ b/tests/manual/planets-qml/shaders/es2/planetDS.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 uniform highp mat4 viewMatrix; diff --git a/tests/manual/planets-qml/shaders/es2/planetDSB.frag b/tests/manual/planets-qml/shaders/es2/planetDSB.frag index c78c4a3e2..95e60e9ee 100644 --- a/tests/manual/planets-qml/shaders/es2/planetDSB.frag +++ b/tests/manual/planets-qml/shaders/es2/planetDSB.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 uniform highp mat4 viewMatrix; diff --git a/tests/manual/planets-qml/shaders/es2/sun.frag b/tests/manual/planets-qml/shaders/es2/sun.frag index e08850e9a..f9697c8e5 100644 --- a/tests/manual/planets-qml/shaders/es2/sun.frag +++ b/tests/manual/planets-qml/shaders/es2/sun.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 uniform sampler2D diffuseTexture; diff --git a/tests/manual/planets-qml/shaders/es2/sun.vert b/tests/manual/planets-qml/shaders/es2/sun.vert index 231711011..f15074d1f 100644 --- a/tests/manual/planets-qml/shaders/es2/sun.vert +++ b/tests/manual/planets-qml/shaders/es2/sun.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 attribute vec3 vertexPosition; attribute vec2 vertexTexCoord; diff --git a/tests/manual/planets-qml/shaders/gl3/planetD.frag b/tests/manual/planets-qml/shaders/gl3/planetD.frag index 566e74f7a..72f4a030a 100644 --- a/tests/manual/planets-qml/shaders/gl3/planetD.frag +++ b/tests/manual/planets-qml/shaders/gl3/planetD.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/planetD.vert b/tests/manual/planets-qml/shaders/gl3/planetD.vert index c6318f350..9f1b6331a 100644 --- a/tests/manual/planets-qml/shaders/gl3/planetD.vert +++ b/tests/manual/planets-qml/shaders/gl3/planetD.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/planetDB.frag b/tests/manual/planets-qml/shaders/gl3/planetDB.frag index 4f7fd015a..e8bd7296f 100644 --- a/tests/manual/planets-qml/shaders/gl3/planetDB.frag +++ b/tests/manual/planets-qml/shaders/gl3/planetDB.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/planetDB.vert b/tests/manual/planets-qml/shaders/gl3/planetDB.vert index 14b98c814..b6a72058c 100644 --- a/tests/manual/planets-qml/shaders/gl3/planetDB.vert +++ b/tests/manual/planets-qml/shaders/gl3/planetDB.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/planetDS.frag b/tests/manual/planets-qml/shaders/gl3/planetDS.frag index 413816adc..ccf48d6cb 100644 --- a/tests/manual/planets-qml/shaders/gl3/planetDS.frag +++ b/tests/manual/planets-qml/shaders/gl3/planetDS.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/planetDSB.frag b/tests/manual/planets-qml/shaders/gl3/planetDSB.frag index c5ebf9e49..c7206e559 100644 --- a/tests/manual/planets-qml/shaders/gl3/planetDSB.frag +++ b/tests/manual/planets-qml/shaders/gl3/planetDSB.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/planetDShadow.frag b/tests/manual/planets-qml/shaders/gl3/planetDShadow.frag index f236c8f47..02eea673e 100644 --- a/tests/manual/planets-qml/shaders/gl3/planetDShadow.frag +++ b/tests/manual/planets-qml/shaders/gl3/planetDShadow.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/planetDShadow.vert b/tests/manual/planets-qml/shaders/gl3/planetDShadow.vert index 064456ffa..e2dbaa0df 100644 --- a/tests/manual/planets-qml/shaders/gl3/planetDShadow.vert +++ b/tests/manual/planets-qml/shaders/gl3/planetDShadow.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/shadowmap.frag b/tests/manual/planets-qml/shaders/gl3/shadowmap.frag index 96f754e51..31b39e148 100644 --- a/tests/manual/planets-qml/shaders/gl3/shadowmap.frag +++ b/tests/manual/planets-qml/shaders/gl3/shadowmap.frag @@ -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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/shadowmap.vert b/tests/manual/planets-qml/shaders/gl3/shadowmap.vert index 9bfa508cf..d245cd127 100644 --- a/tests/manual/planets-qml/shaders/gl3/shadowmap.vert +++ b/tests/manual/planets-qml/shaders/gl3/shadowmap.vert @@ -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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/sun.frag b/tests/manual/planets-qml/shaders/gl3/sun.frag index 82c5bd035..d62e87954 100644 --- a/tests/manual/planets-qml/shaders/gl3/sun.frag +++ b/tests/manual/planets-qml/shaders/gl3/sun.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/gl3/sun.vert b/tests/manual/planets-qml/shaders/gl3/sun.vert index 527602acb..0734c1c1a 100644 --- a/tests/manual/planets-qml/shaders/gl3/sun.vert +++ b/tests/manual/planets-qml/shaders/gl3/sun.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 150 core diff --git a/tests/manual/planets-qml/shaders/rhi/planetD.frag b/tests/manual/planets-qml/shaders/rhi/planetD.frag index 2823c93f6..9dde7b266 100644 --- a/tests/manual/planets-qml/shaders/rhi/planetD.frag +++ b/tests/manual/planets-qml/shaders/rhi/planetD.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 450 core diff --git a/tests/manual/planets-qml/shaders/rhi/planetD.vert b/tests/manual/planets-qml/shaders/rhi/planetD.vert index 3c9f33bd3..2c5c45176 100644 --- a/tests/manual/planets-qml/shaders/rhi/planetD.vert +++ b/tests/manual/planets-qml/shaders/rhi/planetD.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 450 core diff --git a/tests/manual/planets-qml/shaders/rhi/planetDB.frag b/tests/manual/planets-qml/shaders/rhi/planetDB.frag index 0700b2391..a2977a9a0 100644 --- a/tests/manual/planets-qml/shaders/rhi/planetDB.frag +++ b/tests/manual/planets-qml/shaders/rhi/planetDB.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 450 core diff --git a/tests/manual/planets-qml/shaders/rhi/planetDB.vert b/tests/manual/planets-qml/shaders/rhi/planetDB.vert index 178eac70c..56efa668c 100644 --- a/tests/manual/planets-qml/shaders/rhi/planetDB.vert +++ b/tests/manual/planets-qml/shaders/rhi/planetDB.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 450 core diff --git a/tests/manual/planets-qml/shaders/rhi/planetDS.frag b/tests/manual/planets-qml/shaders/rhi/planetDS.frag index bb673b9ec..f8cd25d0a 100644 --- a/tests/manual/planets-qml/shaders/rhi/planetDS.frag +++ b/tests/manual/planets-qml/shaders/rhi/planetDS.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 450 core diff --git a/tests/manual/planets-qml/shaders/rhi/planetDSB.frag b/tests/manual/planets-qml/shaders/rhi/planetDSB.frag index 6b0ffa06c..875a06185 100644 --- a/tests/manual/planets-qml/shaders/rhi/planetDSB.frag +++ b/tests/manual/planets-qml/shaders/rhi/planetDSB.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 450 core diff --git a/tests/manual/planets-qml/shaders/rhi/planetDShadow.frag b/tests/manual/planets-qml/shaders/rhi/planetDShadow.frag index 857406210..7b1c54210 100644 --- a/tests/manual/planets-qml/shaders/rhi/planetDShadow.frag +++ b/tests/manual/planets-qml/shaders/rhi/planetDShadow.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 450 core layout(std140, binding = 0) uniform qt3d_render_view_uniforms { diff --git a/tests/manual/planets-qml/shaders/rhi/planetDShadow.vert b/tests/manual/planets-qml/shaders/rhi/planetDShadow.vert index 0e675d5ce..5216e9f6b 100644 --- a/tests/manual/planets-qml/shaders/rhi/planetDShadow.vert +++ b/tests/manual/planets-qml/shaders/rhi/planetDShadow.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 450 core diff --git a/tests/manual/planets-qml/shaders/rhi/shadowmap.frag b/tests/manual/planets-qml/shaders/rhi/shadowmap.frag index 912ce125c..7dab1669c 100644 --- a/tests/manual/planets-qml/shaders/rhi/shadowmap.frag +++ b/tests/manual/planets-qml/shaders/rhi/shadowmap.frag @@ -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 #version 450 core diff --git a/tests/manual/planets-qml/shaders/rhi/shadowmap.vert b/tests/manual/planets-qml/shaders/rhi/shadowmap.vert index 4f0167304..c5c3a9da1 100644 --- a/tests/manual/planets-qml/shaders/rhi/shadowmap.vert +++ b/tests/manual/planets-qml/shaders/rhi/shadowmap.vert @@ -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 #version 450 core diff --git a/tests/manual/planets-qml/shaders/rhi/sun.frag b/tests/manual/planets-qml/shaders/rhi/sun.frag index eed939c48..e48b206b4 100644 --- a/tests/manual/planets-qml/shaders/rhi/sun.frag +++ b/tests/manual/planets-qml/shaders/rhi/sun.frag @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 450 core diff --git a/tests/manual/planets-qml/shaders/rhi/sun.vert b/tests/manual/planets-qml/shaders/rhi/sun.vert index f13964449..07bb258e2 100644 --- a/tests/manual/planets-qml/shaders/rhi/sun.vert +++ b/tests/manual/planets-qml/shaders/rhi/sun.vert @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 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 #version 450 core diff --git a/tests/manual/plasma/main.cpp b/tests/manual/plasma/main.cpp index 0ade3002e..d4acf79b3 100644 --- a/tests/manual/plasma/main.cpp +++ b/tests/manual/plasma/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 <Qt3DQuick/QQmlAspectEngine> diff --git a/tests/manual/plasma/main.qml b/tests/manual/plasma/main.qml index 789ba3b4e..5cf641461 100644 --- a/tests/manual/plasma/main.qml +++ b/tests/manual/plasma/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/pointlinesize/Scene.qml b/tests/manual/pointlinesize/Scene.qml index 8b6c9a682..dedf6eeb5 100644 --- a/tests/manual/pointlinesize/Scene.qml +++ b/tests/manual/pointlinesize/Scene.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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.10 diff --git a/tests/manual/pointlinesize/main.cpp b/tests/manual/pointlinesize/main.cpp index b0ab19a64..63701f168 100644 --- a/tests/manual/pointlinesize/main.cpp +++ b/tests/manual/pointlinesize/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/pointlinesize/main.qml b/tests/manual/pointlinesize/main.qml index f6db7a762..6326bfecd 100644 --- a/tests/manual/pointlinesize/main.qml +++ b/tests/manual/pointlinesize/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/proximityfilter/main.cpp b/tests/manual/proximityfilter/main.cpp index 28c39f694..712a860b8 100644 --- a/tests/manual/proximityfilter/main.cpp +++ b/tests/manual/proximityfilter/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/proximityfilter/main.qml b/tests/manual/proximityfilter/main.qml index aaeb87f2e..e07cb8a89 100644 --- a/tests/manual/proximityfilter/main.qml +++ b/tests/manual/proximityfilter/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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.9 import Qt3D.Core 2.10 diff --git a/tests/manual/qardboard/PlacedEntity.qml b/tests/manual/qardboard/PlacedEntity.qml index 1f00bb112..075bfd48d 100644 --- a/tests/manual/qardboard/PlacedEntity.qml +++ b/tests/manual/qardboard/PlacedEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/qardboard/QardboardCamera.qml b/tests/manual/qardboard/QardboardCamera.qml index 45fbbfcc2..f20a18078 100644 --- a/tests/manual/qardboard/QardboardCamera.qml +++ b/tests/manual/qardboard/QardboardCamera.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/qardboard/QardboardFrameGraph.qml b/tests/manual/qardboard/QardboardFrameGraph.qml index 507b90f82..9379b949a 100644 --- a/tests/manual/qardboard/QardboardFrameGraph.qml +++ b/tests/manual/qardboard/QardboardFrameGraph.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/qardboard/QardboardRootEntity.qml b/tests/manual/qardboard/QardboardRootEntity.qml index c8dd6a341..641341073 100644 --- a/tests/manual/qardboard/QardboardRootEntity.qml +++ b/tests/manual/qardboard/QardboardRootEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/qardboard/QardboardScene3D.qml b/tests/manual/qardboard/QardboardScene3D.qml index 35a254fdd..827eb4f88 100644 --- a/tests/manual/qardboard/QardboardScene3D.qml +++ b/tests/manual/qardboard/QardboardScene3D.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/qardboard/abstractdeviceorientation.cpp b/tests/manual/qardboard/abstractdeviceorientation.cpp index 051a83a61..eefeecddb 100644 --- a/tests/manual/qardboard/abstractdeviceorientation.cpp +++ b/tests/manual/qardboard/abstractdeviceorientation.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 "abstractdeviceorientation.h" diff --git a/tests/manual/qardboard/abstractdeviceorientation.h b/tests/manual/qardboard/abstractdeviceorientation.h index 8230e7554..0d1e34063 100644 --- a/tests/manual/qardboard/abstractdeviceorientation.h +++ b/tests/manual/qardboard/abstractdeviceorientation.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 ABSTRACT_DEVICEORIENTATION_H #define ABSTRACT_DEVICEORIENTATION_H diff --git a/tests/manual/qardboard/dummydeviceorientation.cpp b/tests/manual/qardboard/dummydeviceorientation.cpp index 0f8a0b30c..313522f46 100644 --- a/tests/manual/qardboard/dummydeviceorientation.cpp +++ b/tests/manual/qardboard/dummydeviceorientation.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 "dummydeviceorientation.h" diff --git a/tests/manual/qardboard/dummydeviceorientation.h b/tests/manual/qardboard/dummydeviceorientation.h index b5ba441e3..5b8c2bdef 100644 --- a/tests/manual/qardboard/dummydeviceorientation.h +++ b/tests/manual/qardboard/dummydeviceorientation.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 DUMMY_DEVICEORIENTATION_H #define DUMMY_DEVICEORIENTATION_H diff --git a/tests/manual/qardboard/iosdeviceorientation.h b/tests/manual/qardboard/iosdeviceorientation.h index a4e9a3de8..756dfd9e1 100644 --- a/tests/manual/qardboard/iosdeviceorientation.h +++ b/tests/manual/qardboard/iosdeviceorientation.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 IOS_DEVICEORIENTATION_H #define IOS_DEVICEORIENTATION_H diff --git a/tests/manual/qardboard/iosdeviceorientation.mm b/tests/manual/qardboard/iosdeviceorientation.mm index 48f8789a3..0ac4e2489 100644 --- a/tests/manual/qardboard/iosdeviceorientation.mm +++ b/tests/manual/qardboard/iosdeviceorientation.mm @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 "iosdeviceorientation.h" #include "iosdeviceorientation_p.h" diff --git a/tests/manual/qardboard/iosdeviceorientation_p.h b/tests/manual/qardboard/iosdeviceorientation_p.h index 4625bb9ca..44c0b99a6 100644 --- a/tests/manual/qardboard/iosdeviceorientation_p.h +++ b/tests/manual/qardboard/iosdeviceorientation_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <Foundation/Foundation.h> #import <CoreLocation/CoreLocation.h> diff --git a/tests/manual/qardboard/iosdeviceorientation_p.mm b/tests/manual/qardboard/iosdeviceorientation_p.mm index f01ae63cd..5034db4a6 100644 --- a/tests/manual/qardboard/iosdeviceorientation_p.mm +++ b/tests/manual/qardboard/iosdeviceorientation_p.mm @@ -1,6 +1,6 @@ // Copyright (C) 2021 The Qt Company Ltd. // Copyright (C) 2017 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 <Foundation/Foundation.h> #import <UIKit/UIKit.h> diff --git a/tests/manual/qardboard/main.cpp b/tests/manual/qardboard/main.cpp index d6115cee9..7d5ac86c2 100644 --- a/tests/manual/qardboard/main.cpp +++ b/tests/manual/qardboard/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/qardboard/main.qml b/tests/manual/qardboard/main.qml index fa937dbd2..63d2582b1 100644 --- a/tests/manual/qardboard/main.qml +++ b/tests/manual/qardboard/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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/qtbug-72236/main.cpp b/tests/manual/qtbug-72236/main.cpp index 929ca3f51..b859809f8 100644 --- a/tests/manual/qtbug-72236/main.cpp +++ b/tests/manual/qtbug-72236/main.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2018 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 <QGuiApplication> #include <QThread> @@ -74,7 +74,7 @@ int main(int argc, char **argv) cylinder->addComponent(material); QTimer *timer = new QTimer(rootEntity); - QObject::connect(timer, &QTimer::timeout, [=](){ + QObject::connect(timer, &QTimer::timeout, rootEntity, [=]() { for (int i = 0; i < 2; i++) { auto *dummy = new Qt3DCore::QNode(rootEntity); auto *dummy2 = new Qt3DCore::QNode(dummy); @@ -89,7 +89,7 @@ int main(int argc, char **argv) timer->start(1000); QTimer *timer2 = new QTimer(rootEntity); - QObject::connect(timer2, &QTimer::timeout, [](){ + QObject::connect(timer2, &QTimer::timeout, timer2, []() { QThread::msleep(100); }); timer2->start(100); diff --git a/tests/manual/qtbug-76766/FrameGraph.qml b/tests/manual/qtbug-76766/FrameGraph.qml index 7224c7f29..146f39a03 100644 --- a/tests/manual/qtbug-76766/FrameGraph.qml +++ b/tests/manual/qtbug-76766/FrameGraph.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.9 import Qt3D.Render 2.9 diff --git a/tests/manual/qtbug-76766/Material1.qml b/tests/manual/qtbug-76766/Material1.qml index 648891328..5be70a602 100644 --- a/tests/manual/qtbug-76766/Material1.qml +++ b/tests/manual/qtbug-76766/Material1.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// 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/qtbug-76766/Material2.qml b/tests/manual/qtbug-76766/Material2.qml index b4e669e9a..265ffe2c3 100644 --- a/tests/manual/qtbug-76766/Material2.qml +++ b/tests/manual/qtbug-76766/Material2.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// 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/qtbug-76766/PostProcess.qml b/tests/manual/qtbug-76766/PostProcess.qml index 516b39ec1..f360fa35c 100644 --- a/tests/manual/qtbug-76766/PostProcess.qml +++ b/tests/manual/qtbug-76766/PostProcess.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.9 import Qt3D.Render 2.9 diff --git a/tests/manual/qtbug-76766/SceneRoot.qml b/tests/manual/qtbug-76766/SceneRoot.qml index af6d836d2..d0de6bc25 100644 --- a/tests/manual/qtbug-76766/SceneRoot.qml +++ b/tests/manual/qtbug-76766/SceneRoot.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// 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/qtbug-76766/main.cpp b/tests/manual/qtbug-76766/main.cpp index b2026626c..b2e0deb91 100644 --- a/tests/manual/qtbug-76766/main.cpp +++ b/tests/manual/qtbug-76766/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/qtbug-76766/main.qml b/tests/manual/qtbug-76766/main.qml index e346f14b6..b64041f00 100644 --- a/tests/manual/qtbug-76766/main.qml +++ b/tests/manual/qtbug-76766/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.12 import QtQuick.Scene3D 2.12 diff --git a/tests/manual/quickwidget-switch/main.cpp b/tests/manual/quickwidget-switch/main.cpp index 42e6d3466..048514ed9 100644 --- a/tests/manual/quickwidget-switch/main.cpp +++ b/tests/manual/quickwidget-switch/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 The Qt Company. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QScreen> #include <QApplication> @@ -53,22 +53,22 @@ int main(int argc, char* argv[]) subWindow->setWidget(quickWidget); QObject::connect(button1, &QPushButton::clicked, - [mdiArea1, mdiArea2, subWindow, button1, button2]() { - mdiArea2->removeSubWindow(subWindow); - mdiArea1->addSubWindow(subWindow); - subWindow->show(); - button1->setEnabled(false); - button2->setEnabled(true); - }); + &app, [mdiArea1, mdiArea2, subWindow, button1, button2]() { + mdiArea2->removeSubWindow(subWindow); + mdiArea1->addSubWindow(subWindow); + subWindow->show(); + button1->setEnabled(false); + button2->setEnabled(true); + }); QObject::connect(button2, &QPushButton::clicked, - [mdiArea1, mdiArea2, subWindow, button1, button2]() { - mdiArea1->removeSubWindow(subWindow); - mdiArea2->addSubWindow(subWindow); - subWindow->show(); - button1->setEnabled(true); - button2->setEnabled(false); - }); + &app, [mdiArea1, mdiArea2, subWindow, button1, button2]() { + mdiArea1->removeSubWindow(subWindow); + mdiArea2->addSubWindow(subWindow); + subWindow->show(); + button1->setEnabled(true); + button2->setEnabled(false); + }); mdiArea2->addSubWindow(subWindow); button2->setEnabled(false); diff --git a/tests/manual/quickwidget-switch/main.qml b/tests/manual/quickwidget-switch/main.qml index 420f77cb4..720f65d44 100644 --- a/tests/manual/quickwidget-switch/main.qml +++ b/tests/manual/quickwidget-switch/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2020 The Qt Company. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/quickwindow-switch/main.cpp b/tests/manual/quickwindow-switch/main.cpp index 4e7f7088b..e56ab5bb8 100644 --- a/tests/manual/quickwindow-switch/main.cpp +++ b/tests/manual/quickwindow-switch/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 The Qt Company. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> #include <QQmlApplicationEngine> diff --git a/tests/manual/quickwindow-switch/main.qml b/tests/manual/quickwindow-switch/main.qml index a307878f9..89684360c 100644 --- a/tests/manual/quickwindow-switch/main.qml +++ b/tests/manual/quickwindow-switch/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2020 The Qt Company. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.2 import QtQuick.Window 2.12 as Win diff --git a/tests/manual/raster-cpp/main.cpp b/tests/manual/raster-cpp/main.cpp index 8d68e76dd..e4788c0ca 100644 --- a/tests/manual/raster-cpp/main.cpp +++ b/tests/manual/raster-cpp/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 <QGuiApplication> diff --git a/tests/manual/raster-qml/main.cpp b/tests/manual/raster-qml/main.cpp index ce26b5fd8..09a1a43d0 100644 --- a/tests/manual/raster-qml/main.cpp +++ b/tests/manual/raster-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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/raster-qml/main.qml b/tests/manual/raster-qml/main.qml index 57fd7905e..69fcaff36 100644 --- a/tests/manual/raster-qml/main.qml +++ b/tests/manual/raster-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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.13 diff --git a/tests/manual/raycasting-qml/CylinderEntity.qml b/tests/manual/raycasting-qml/CylinderEntity.qml index a37aac54f..4b6269d31 100644 --- a/tests/manual/raycasting-qml/CylinderEntity.qml +++ b/tests/manual/raycasting-qml/CylinderEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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/raycasting-qml/LineEntity.qml b/tests/manual/raycasting-qml/LineEntity.qml index 99bf0d0fd..843933832 100644 --- a/tests/manual/raycasting-qml/LineEntity.qml +++ b/tests/manual/raycasting-qml/LineEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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/raycasting-qml/LineMaterial.qml b/tests/manual/raycasting-qml/LineMaterial.qml index 35d4e381b..55c9c211a 100644 --- a/tests/manual/raycasting-qml/LineMaterial.qml +++ b/tests/manual/raycasting-qml/LineMaterial.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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/raycasting-qml/main.cpp b/tests/manual/raycasting-qml/main.cpp index ce26b5fd8..09a1a43d0 100644 --- a/tests/manual/raycasting-qml/main.cpp +++ b/tests/manual/raycasting-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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/raycasting-qml/main.qml b/tests/manual/raycasting-qml/main.qml index 34cb29c54..4141f762e 100644 --- a/tests/manual/raycasting-qml/main.qml +++ b/tests/manual/raycasting-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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.11 diff --git a/tests/manual/render-qml-to-texture-qml/InteractiveGui.qml b/tests/manual/render-qml-to-texture-qml/InteractiveGui.qml index 6714e1e5f..07a75be48 100644 --- a/tests/manual/render-qml-to-texture-qml/InteractiveGui.qml +++ b/tests/manual/render-qml-to-texture-qml/InteractiveGui.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.0 import QtQuick.Controls 1.2 diff --git a/tests/manual/render-qml-to-texture-qml/main.cpp b/tests/manual/render-qml-to-texture-qml/main.cpp index 3c870c362..5705434d4 100644 --- a/tests/manual/render-qml-to-texture-qml/main.cpp +++ b/tests/manual/render-qml-to-texture-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> diff --git a/tests/manual/render-qml-to-texture-qml/main.qml b/tests/manual/render-qml-to-texture-qml/main.qml index c54f95353..0a6c3ace1 100644 --- a/tests/manual/render-qml-to-texture-qml/main.qml +++ b/tests/manual/render-qml-to-texture-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import Qt3D.Core 2.0 import Qt3D.Render 2.9 diff --git a/tests/manual/render-qml-to-texture/OffscreenGui.qml b/tests/manual/render-qml-to-texture/OffscreenGui.qml index 5e48db516..1a06d79c7 100644 --- a/tests/manual/render-qml-to-texture/OffscreenGui.qml +++ b/tests/manual/render-qml-to-texture/OffscreenGui.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.0 import QtQuick.Controls 1.2 diff --git a/tests/manual/render-qml-to-texture/TextRectangle.qml b/tests/manual/render-qml-to-texture/TextRectangle.qml index a592005bd..e4ddc0317 100644 --- a/tests/manual/render-qml-to-texture/TextRectangle.qml +++ b/tests/manual/render-qml-to-texture/TextRectangle.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.0 diff --git a/tests/manual/render-qml-to-texture/main.cpp b/tests/manual/render-qml-to-texture/main.cpp index 4f14c3b9b..dedd6fa32 100644 --- a/tests/manual/render-qml-to-texture/main.cpp +++ b/tests/manual/render-qml-to-texture/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> #include <QAnimationDriver> diff --git a/tests/manual/render-qml-to-texture/planematerial.cpp b/tests/manual/render-qml-to-texture/planematerial.cpp index 9f989367b..71393496a 100644 --- a/tests/manual/render-qml-to-texture/planematerial.cpp +++ b/tests/manual/render-qml-to-texture/planematerial.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <Qt3DRender/QParameter> #include <Qt3DRender/QEffect> diff --git a/tests/manual/render-qml-to-texture/planematerial.h b/tests/manual/render-qml-to-texture/planematerial.h index f0088fe1c..e3ce92df3 100644 --- a/tests/manual/render-qml-to-texture/planematerial.h +++ b/tests/manual/render-qml-to-texture/planematerial.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef PLANEMATERIAL_H #define PLANEMATERIAL_H diff --git a/tests/manual/rendercapture-cpp/main.cpp b/tests/manual/rendercapture-cpp/main.cpp index 6c529b3e5..5a9ef5c6b 100644 --- a/tests/manual/rendercapture-cpp/main.cpp +++ b/tests/manual/rendercapture-cpp/main.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QApplication> diff --git a/tests/manual/rendercapture-cpp/mycapture.h b/tests/manual/rendercapture-cpp/mycapture.h index 8df852214..7f44bf8a6 100644 --- a/tests/manual/rendercapture-cpp/mycapture.h +++ b/tests/manual/rendercapture-cpp/mycapture.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef MYCAPTURE_H #define MYCAPTURE_H diff --git a/tests/manual/rendercapture-cpp/orbittransformcontroller.cpp b/tests/manual/rendercapture-cpp/orbittransformcontroller.cpp index 6adc322f6..775989602 100644 --- a/tests/manual/rendercapture-cpp/orbittransformcontroller.cpp +++ b/tests/manual/rendercapture-cpp/orbittransformcontroller.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "orbittransformcontroller.h" diff --git a/tests/manual/rendercapture-cpp/orbittransformcontroller.h b/tests/manual/rendercapture-cpp/orbittransformcontroller.h index 78efde2d4..6b4720f32 100644 --- a/tests/manual/rendercapture-cpp/orbittransformcontroller.h +++ b/tests/manual/rendercapture-cpp/orbittransformcontroller.h @@ -1,6 +1,6 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef ORBITTRANSFORMCONTROLLER_H #define ORBITTRANSFORMCONTROLLER_H diff --git a/tests/manual/rendercapture-qml-fbo/CaptureScene.qml b/tests/manual/rendercapture-qml-fbo/CaptureScene.qml index c0a336e87..223c670ee 100644 --- a/tests/manual/rendercapture-qml-fbo/CaptureScene.qml +++ b/tests/manual/rendercapture-qml-fbo/CaptureScene.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.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/rendercapture-qml-fbo/main.cpp b/tests/manual/rendercapture-qml-fbo/main.cpp index 1aa22768b..a10d35e8e 100644 --- a/tests/manual/rendercapture-qml-fbo/main.cpp +++ b/tests/manual/rendercapture-qml-fbo/main.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QQuickItem> #include <QQuickView> diff --git a/tests/manual/rendercapture-qml-fbo/main.qml b/tests/manual/rendercapture-qml-fbo/main.qml index 7a7be3ef6..cd0d6952f 100644 --- a/tests/manual/rendercapture-qml-fbo/main.qml +++ b/tests/manual/rendercapture-qml-fbo/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.2 import QtQuick.Layouts 1.3 diff --git a/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h b/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h index d27f7f928..338674de7 100644 --- a/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h +++ b/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef RENDERCAPTUREPROVIDER_H #define RENDERCAPTUREPROVIDER_H diff --git a/tests/manual/rendercapture-qml/CaptureScene.qml b/tests/manual/rendercapture-qml/CaptureScene.qml index 57d4e0ee3..b666322a4 100644 --- a/tests/manual/rendercapture-qml/CaptureScene.qml +++ b/tests/manual/rendercapture-qml/CaptureScene.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.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/rendercapture-qml/main.cpp b/tests/manual/rendercapture-qml/main.cpp index 6cd976343..449c039e4 100644 --- a/tests/manual/rendercapture-qml/main.cpp +++ b/tests/manual/rendercapture-qml/main.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QQuickItem> #include <QQuickView> diff --git a/tests/manual/rendercapture-qml/main.qml b/tests/manual/rendercapture-qml/main.qml index ee0339afa..dbf268019 100644 --- a/tests/manual/rendercapture-qml/main.qml +++ b/tests/manual/rendercapture-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.2 import QtQuick.Layouts 1.3 diff --git a/tests/manual/rendercapture-qml/rendercaptureprovider.h b/tests/manual/rendercapture-qml/rendercaptureprovider.h index d27f7f928..338674de7 100644 --- a/tests/manual/rendercapture-qml/rendercaptureprovider.h +++ b/tests/manual/rendercapture-qml/rendercaptureprovider.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef RENDERCAPTUREPROVIDER_H #define RENDERCAPTUREPROVIDER_H diff --git a/tests/manual/rendertarget-cpp/main.cpp b/tests/manual/rendertarget-cpp/main.cpp index 603f799b6..6e83ab5ad 100644 --- a/tests/manual/rendertarget-cpp/main.cpp +++ b/tests/manual/rendertarget-cpp/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 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 <QGuiApplication> diff --git a/tests/manual/rendertarget-cpp/orbittransformcontroller.cpp b/tests/manual/rendertarget-cpp/orbittransformcontroller.cpp index 6adc322f6..775989602 100644 --- a/tests/manual/rendertarget-cpp/orbittransformcontroller.cpp +++ b/tests/manual/rendertarget-cpp/orbittransformcontroller.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "orbittransformcontroller.h" diff --git a/tests/manual/rendertarget-cpp/orbittransformcontroller.h b/tests/manual/rendertarget-cpp/orbittransformcontroller.h index 704da425f..e50b53f52 100644 --- a/tests/manual/rendertarget-cpp/orbittransformcontroller.h +++ b/tests/manual/rendertarget-cpp/orbittransformcontroller.h @@ -1,6 +1,6 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef ORBITTRANSFORMCONTROLLER_H #define ORBITTRANSFORMCONTROLLER_H diff --git a/tests/manual/rhi/simple-rhi-cpp/main.cpp b/tests/manual/rhi/simple-rhi-cpp/main.cpp index 324e44d26..576094eec 100644 --- a/tests/manual/rhi/simple-rhi-cpp/main.cpp +++ b/tests/manual/rhi/simple-rhi-cpp/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 <QGuiApplication> @@ -257,13 +257,13 @@ int main(int argc, char* argv[]) QTimer *cameraAnimationTimer = new QTimer(&view); QObject::connect(cameraAnimationTimer, &QTimer::timeout, - [cameraEntity] { - static int angle = 0; - const float radius = 40.0f; - const float anglef = qDegreesToRadians(float(angle)); - cameraEntity->setPosition(QVector3D(qSin(anglef), 0.0f, qCos(anglef)) * radius); - angle += 1; - }); + cameraEntity, [cameraEntity] { + static int angle = 0; + const float radius = 40.0f; + const float anglef = qDegreesToRadians(float(angle)); + cameraEntity->setPosition(QVector3D(qSin(anglef), 0.0f, qCos(anglef)) * radius); + angle += 1; + }); cameraAnimationTimer->start(16); // For camera controls @@ -282,12 +282,12 @@ int main(int argc, char* argv[]) QTimer *parameterAnimationTimer = new QTimer(&view); QObject::connect(parameterAnimationTimer, &QTimer::timeout, - [parameter] { - static int angle = 0; - const float anglef = qDegreesToRadians(float(angle)); - parameter->setValue(QColor::fromRgbF(fabs(qCos(anglef)), fabs(qSin(anglef)), 1.0f)); - angle += 10; - }); + parameter, [parameter] { + static int angle = 0; + const float anglef = qDegreesToRadians(float(angle)); + parameter->setValue(QColor::fromRgbF(fabs(qCos(anglef)), fabs(qSin(anglef)), 1.0f)); + angle += 10; + }); parameterAnimationTimer->start(16); // Torus diff --git a/tests/manual/rhi/ubo/main.cpp b/tests/manual/rhi/ubo/main.cpp index 5b0181037..0bb6f50ec 100644 --- a/tests/manual/rhi/ubo/main.cpp +++ b/tests/manual/rhi/ubo/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 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 <QGuiApplication> #include <Qt3DQuickExtras/qt3dquickwindow.h> diff --git a/tests/manual/rhi/ubo/main.qml b/tests/manual/rhi/ubo/main.qml index a007ba02e..7d54a3f15 100644 --- a/tests/manual/rhi/ubo/main.qml +++ b/tests/manual/rhi/ubo/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2020 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.15 as QQ2 import Qt3D.Core 2.15 diff --git a/tests/manual/rigged-simple/DefaultSceneEntity.qml b/tests/manual/rigged-simple/DefaultSceneEntity.qml index 153c5fc85..0ad6b0b42 100644 --- a/tests/manual/rigged-simple/DefaultSceneEntity.qml +++ b/tests/manual/rigged-simple/DefaultSceneEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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.10 import Qt3D.Render 2.10 diff --git a/tests/manual/rigged-simple/SkinnedEntity.qml b/tests/manual/rigged-simple/SkinnedEntity.qml index 50714270e..cca26115d 100644 --- a/tests/manual/rigged-simple/SkinnedEntity.qml +++ b/tests/manual/rigged-simple/SkinnedEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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.10 import Qt3D.Render 2.10 diff --git a/tests/manual/rigged-simple/SkinnedPbrEffect.qml b/tests/manual/rigged-simple/SkinnedPbrEffect.qml index 544948111..54e6af4cb 100644 --- a/tests/manual/rigged-simple/SkinnedPbrEffect.qml +++ b/tests/manual/rigged-simple/SkinnedPbrEffect.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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.10 import Qt3D.Render 2.10 diff --git a/tests/manual/rigged-simple/main.cpp b/tests/manual/rigged-simple/main.cpp index f33a36f3a..9577c2d81 100644 --- a/tests/manual/rigged-simple/main.cpp +++ b/tests/manual/rigged-simple/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <Qt3DAnimation/QAnimationAspect> diff --git a/tests/manual/rigged-simple/main.qml b/tests/manual/rigged-simple/main.qml index f15da8093..a4ecdbe27 100644 --- a/tests/manual/rigged-simple/main.qml +++ b/tests/manual/rigged-simple/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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.10 import Qt3D.Render 2.10 diff --git a/tests/manual/rigged-simple/skinnedPbr.vert b/tests/manual/rigged-simple/skinnedPbr.vert index 9a8535b2e..add9bbf4f 100644 --- a/tests/manual/rigged-simple/skinnedPbr.vert +++ b/tests/manual/rigged-simple/skinnedPbr.vert @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 #version 150 diff --git a/tests/manual/scene3d-in-sync/main.cpp b/tests/manual/scene3d-in-sync/main.cpp index ef6675679..f54a07cc2 100644 --- a/tests/manual/scene3d-in-sync/main.cpp +++ b/tests/manual/scene3d-in-sync/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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/scene3d-in-sync/main.qml b/tests/manual/scene3d-in-sync/main.qml index 3b52172ad..208d43d1e 100644 --- a/tests/manual/scene3d-in-sync/main.qml +++ b/tests/manual/scene3d-in-sync/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.0 import Qt3D.Core 2.9 diff --git a/tests/manual/scene3d-loader/AnimatedEntity.qml b/tests/manual/scene3d-loader/AnimatedEntity.qml index 13e3ac350..312d8ce0b 100644 --- a/tests/manual/scene3d-loader/AnimatedEntity.qml +++ b/tests/manual/scene3d-loader/AnimatedEntity.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/scene3d-loader/Scene.qml b/tests/manual/scene3d-loader/Scene.qml index 152dfcf95..902b60775 100644 --- a/tests/manual/scene3d-loader/Scene.qml +++ b/tests/manual/scene3d-loader/Scene.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 QtQuick 2.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/scene3d-loader/Scene2.qml b/tests/manual/scene3d-loader/Scene2.qml index 73a1a37a0..e21469950 100644 --- a/tests/manual/scene3d-loader/Scene2.qml +++ b/tests/manual/scene3d-loader/Scene2.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 QtQuick 2.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/scene3d-loader/main.cpp b/tests/manual/scene3d-loader/main.cpp index ef6675679..f54a07cc2 100644 --- a/tests/manual/scene3d-loader/main.cpp +++ b/tests/manual/scene3d-loader/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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/scene3d-loader/main.qml b/tests/manual/scene3d-loader/main.qml index 87dba344a..be0c00dde 100644 --- a/tests/manual/scene3d-loader/main.qml +++ b/tests/manual/scene3d-loader/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 QtQuick 2.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/scene3d-visibility/main.cpp b/tests/manual/scene3d-visibility/main.cpp index ef6675679..f54a07cc2 100644 --- a/tests/manual/scene3d-visibility/main.cpp +++ b/tests/manual/scene3d-visibility/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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/scene3d-visibility/main.qml b/tests/manual/scene3d-visibility/main.qml index d9bee0aaf..e73c14cf0 100644 --- a/tests/manual/scene3d-visibility/main.qml +++ b/tests/manual/scene3d-visibility/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.14 import Qt3D.Core 2.14 diff --git a/tests/manual/scene3d/AnimatedEntity.qml b/tests/manual/scene3d/AnimatedEntity.qml index a23060e4d..42ecd56fb 100644 --- a/tests/manual/scene3d/AnimatedEntity.qml +++ b/tests/manual/scene3d/AnimatedEntity.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.15 import Qt3D.Render 2.15 diff --git a/tests/manual/scene3d/main.cpp b/tests/manual/scene3d/main.cpp index b7836fe80..29d3e0470 100644 --- a/tests/manual/scene3d/main.cpp +++ b/tests/manual/scene3d/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 <QGuiApplication> #include <QQuickView> diff --git a/tests/manual/scene3d/main.qml b/tests/manual/scene3d/main.qml index 9e8531000..5aba73352 100644 --- a/tests/manual/scene3d/main.qml +++ b/tests/manual/scene3d/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 QtQuick 2.0 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/shader-image-qml/main.cpp b/tests/manual/shader-image-qml/main.cpp index 2b747b169..48e1503a1 100644 --- a/tests/manual/shader-image-qml/main.cpp +++ b/tests/manual/shader-image-qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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/shader-image-qml/main.qml b/tests/manual/shader-image-qml/main.qml index 9433a499c..732c24864 100644 --- a/tests/manual/shader-image-qml/main.qml +++ b/tests/manual/shader-image-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.14 import Qt3D.Render 2.14 diff --git a/tests/manual/shadow-map-qml/AdsEffect.qml b/tests/manual/shadow-map-qml/AdsEffect.qml index 07c527fa2..8050ff01c 100644 --- a/tests/manual/shadow-map-qml/AdsEffect.qml +++ b/tests/manual/shadow-map-qml/AdsEffect.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/shadow-map-qml/AdsMaterial.qml b/tests/manual/shadow-map-qml/AdsMaterial.qml index 91bfdb834..2ac53b987 100644 --- a/tests/manual/shadow-map-qml/AdsMaterial.qml +++ b/tests/manual/shadow-map-qml/AdsMaterial.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 import Qt3D.Core 2.0 diff --git a/tests/manual/shadow-map-qml/GroundPlane.qml b/tests/manual/shadow-map-qml/GroundPlane.qml index e42eb0a53..278f50432 100644 --- a/tests/manual/shadow-map-qml/GroundPlane.qml +++ b/tests/manual/shadow-map-qml/GroundPlane.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/shadow-map-qml/ShadowMapFrameGraph.qml b/tests/manual/shadow-map-qml/ShadowMapFrameGraph.qml index ea8266aa9..c534ae7d2 100644 --- a/tests/manual/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/tests/manual/shadow-map-qml/ShadowMapFrameGraph.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.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/shadow-map-qml/ShadowMapLight.qml b/tests/manual/shadow-map-qml/ShadowMapLight.qml index e8bbeaccb..797aeb769 100644 --- a/tests/manual/shadow-map-qml/ShadowMapLight.qml +++ b/tests/manual/shadow-map-qml/ShadowMapLight.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/shadow-map-qml/Toyplane.qml b/tests/manual/shadow-map-qml/Toyplane.qml index 1880a691a..d0ae66a4e 100644 --- a/tests/manual/shadow-map-qml/Toyplane.qml +++ b/tests/manual/shadow-map-qml/Toyplane.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/shadow-map-qml/Trefoil.qml b/tests/manual/shadow-map-qml/Trefoil.qml index 3bf96aa5d..338fa0e48 100644 --- a/tests/manual/shadow-map-qml/Trefoil.qml +++ b/tests/manual/shadow-map-qml/Trefoil.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/shadow-map-qml/main.cpp b/tests/manual/shadow-map-qml/main.cpp index 67707e2f4..dbdf4610d 100644 --- a/tests/manual/shadow-map-qml/main.cpp +++ b/tests/manual/shadow-map-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/shadow-map-qml/main.qml b/tests/manual/shadow-map-qml/main.qml index 4c0e6b0fe..635557b65 100644 --- a/tests/manual/shadow-map-qml/main.qml +++ b/tests/manual/shadow-map-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 QtQuick 2.1 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/shadow-map-qml/shaders/ads.frag b/tests/manual/shadow-map-qml/shaders/ads.frag index f3c060f6b..2d8318282 100644 --- a/tests/manual/shadow-map-qml/shaders/ads.frag +++ b/tests/manual/shadow-map-qml/shaders/ads.frag @@ -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 #version 150 core diff --git a/tests/manual/shadow-map-qml/shaders/ads.vert b/tests/manual/shadow-map-qml/shaders/ads.vert index 1a0442e57..017fa0082 100644 --- a/tests/manual/shadow-map-qml/shaders/ads.vert +++ b/tests/manual/shadow-map-qml/shaders/ads.vert @@ -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 #version 150 core diff --git a/tests/manual/shadow-map-qml/shaders/rhi/ads.frag b/tests/manual/shadow-map-qml/shaders/rhi/ads.frag index 60fda68b3..c30b34a78 100644 --- a/tests/manual/shadow-map-qml/shaders/rhi/ads.frag +++ b/tests/manual/shadow-map-qml/shaders/rhi/ads.frag @@ -1,5 +1,5 @@ // Copyright (C) 2020 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 #version 450 diff --git a/tests/manual/shadow-map-qml/shaders/rhi/ads.vert b/tests/manual/shadow-map-qml/shaders/rhi/ads.vert index 8059a7821..c4e484883 100644 --- a/tests/manual/shadow-map-qml/shaders/rhi/ads.vert +++ b/tests/manual/shadow-map-qml/shaders/rhi/ads.vert @@ -1,5 +1,5 @@ // Copyright (C) 2020 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 #version 450 diff --git a/tests/manual/shadow-map-qml/shaders/rhi/shadowmap.frag b/tests/manual/shadow-map-qml/shaders/rhi/shadowmap.frag index 7226b2b6d..6e0b8a03a 100644 --- a/tests/manual/shadow-map-qml/shaders/rhi/shadowmap.frag +++ b/tests/manual/shadow-map-qml/shaders/rhi/shadowmap.frag @@ -1,5 +1,5 @@ // Copyright (C) 2020 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 #version 450 diff --git a/tests/manual/shadow-map-qml/shaders/rhi/shadowmap.vert b/tests/manual/shadow-map-qml/shaders/rhi/shadowmap.vert index b800e3932..277819aef 100644 --- a/tests/manual/shadow-map-qml/shaders/rhi/shadowmap.vert +++ b/tests/manual/shadow-map-qml/shaders/rhi/shadowmap.vert @@ -1,5 +1,5 @@ // Copyright (C) 2020 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 #version 450 diff --git a/tests/manual/shadow-map-qml/shaders/shadowmap.frag b/tests/manual/shadow-map-qml/shaders/shadowmap.frag index 96f754e51..31b39e148 100644 --- a/tests/manual/shadow-map-qml/shaders/shadowmap.frag +++ b/tests/manual/shadow-map-qml/shaders/shadowmap.frag @@ -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 #version 150 core diff --git a/tests/manual/shadow-map-qml/shaders/shadowmap.vert b/tests/manual/shadow-map-qml/shaders/shadowmap.vert index 9bfa508cf..d245cd127 100644 --- a/tests/manual/shadow-map-qml/shaders/shadowmap.vert +++ b/tests/manual/shadow-map-qml/shaders/shadowmap.vert @@ -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 #version 150 core diff --git a/tests/manual/shared_texture_image/main.cpp b/tests/manual/shared_texture_image/main.cpp index 587adf9f1..249e54297 100644 --- a/tests/manual/shared_texture_image/main.cpp +++ b/tests/manual/shared_texture_image/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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/shared_texture_image/main.qml b/tests/manual/shared_texture_image/main.qml index e0158ed42..4df73c906 100644 --- a/tests/manual/shared_texture_image/main.qml +++ b/tests/manual/shared_texture_image/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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.2 as QQ2 import Qt3D.Core 2.0 diff --git a/tests/manual/sharedtexture/main.cpp b/tests/manual/sharedtexture/main.cpp index 211714a30..d5761f65f 100644 --- a/tests/manual/sharedtexture/main.cpp +++ b/tests/manual/sharedtexture/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 <QApplication> #include <QPropertyAnimation> diff --git a/tests/manual/sharedtexture/videoplayer.cpp b/tests/manual/sharedtexture/videoplayer.cpp index 83a7b21d7..95f61522c 100644 --- a/tests/manual/sharedtexture/videoplayer.cpp +++ b/tests/manual/sharedtexture/videoplayer.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 <QMutexLocker> #include <QtMultimedia/QVideoFrame> diff --git a/tests/manual/sharedtexture/videoplayer.h b/tests/manual/sharedtexture/videoplayer.h index cecb99392..0caebcd33 100644 --- a/tests/manual/sharedtexture/videoplayer.h +++ b/tests/manual/sharedtexture/videoplayer.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 <QtGui/QOpenGLFunctions> diff --git a/tests/manual/sharedtextureqml/main.cpp b/tests/manual/sharedtextureqml/main.cpp index eb7dc10bf..d19c4ec30 100644 --- a/tests/manual/sharedtextureqml/main.cpp +++ b/tests/manual/sharedtextureqml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 <QApplication> #include <QtQml/QQmlContext> diff --git a/tests/manual/sharedtextureqml/main.qml b/tests/manual/sharedtextureqml/main.qml index 503310274..595e9bfd7 100644 --- a/tests/manual/sharedtextureqml/main.qml +++ b/tests/manual/sharedtextureqml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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.10 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/simple-shaders-qml/main.cpp b/tests/manual/simple-shaders-qml/main.cpp index 28c39f694..712a860b8 100644 --- a/tests/manual/simple-shaders-qml/main.cpp +++ b/tests/manual/simple-shaders-qml/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/simple-shaders-qml/main.qml b/tests/manual/simple-shaders-qml/main.qml index 1f3176904..e8a7d7f6d 100644 --- a/tests/manual/simple-shaders-qml/main.qml +++ b/tests/manual/simple-shaders-qml/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 QtQuick 2.2 import Qt3D.Core 2.0 diff --git a/tests/manual/skinned-mesh/DefaultSceneEntity.qml b/tests/manual/skinned-mesh/DefaultSceneEntity.qml index 449a8287f..a5f12ca28 100644 --- a/tests/manual/skinned-mesh/DefaultSceneEntity.qml +++ b/tests/manual/skinned-mesh/DefaultSceneEntity.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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.10 import Qt3D.Render 2.10 diff --git a/tests/manual/skinned-mesh/main.cpp b/tests/manual/skinned-mesh/main.cpp index f33a36f3a..9577c2d81 100644 --- a/tests/manual/skinned-mesh/main.cpp +++ b/tests/manual/skinned-mesh/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <Qt3DAnimation/QAnimationAspect> diff --git a/tests/manual/skinned-mesh/main.qml b/tests/manual/skinned-mesh/main.qml index 7ec3a8a8f..8caf8bdd6 100644 --- a/tests/manual/skinned-mesh/main.qml +++ b/tests/manual/skinned-mesh/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 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.10 import Qt3D.Render 2.10 diff --git a/tests/manual/skinned-mesh/skinnedPbr.vert b/tests/manual/skinned-mesh/skinnedPbr.vert index 9a8535b2e..add9bbf4f 100644 --- a/tests/manual/skinned-mesh/skinnedPbr.vert +++ b/tests/manual/skinned-mesh/skinnedPbr.vert @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 #version 150 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/spritegrid/main.cpp b/tests/manual/spritegrid/main.cpp index cc61e611a..a6ecbc4ae 100644 --- a/tests/manual/spritegrid/main.cpp +++ b/tests/manual/spritegrid/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 <QGuiApplication> diff --git a/tests/manual/spritegrid/main.qml b/tests/manual/spritegrid/main.qml index e0aa2ebf6..69cd1586b 100644 --- a/tests/manual/spritegrid/main.qml +++ b/tests/manual/spritegrid/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/subtree-enabler-qml/FrameGraph.qml b/tests/manual/subtree-enabler-qml/FrameGraph.qml index 93c7cc013..21c8987a8 100644 --- a/tests/manual/subtree-enabler-qml/FrameGraph.qml +++ b/tests/manual/subtree-enabler-qml/FrameGraph.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.14 import Qt3D.Render 2.14 diff --git a/tests/manual/subtree-enabler-qml/SimpleCamera.qml b/tests/manual/subtree-enabler-qml/SimpleCamera.qml index 8f8506cb2..ca58c4da2 100644 --- a/tests/manual/subtree-enabler-qml/SimpleCamera.qml +++ b/tests/manual/subtree-enabler-qml/SimpleCamera.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.14 import Qt3D.Render 2.14 diff --git a/tests/manual/subtree-enabler-qml/main.cpp b/tests/manual/subtree-enabler-qml/main.cpp index 90ba669d2..1f9685257 100644 --- a/tests/manual/subtree-enabler-qml/main.cpp +++ b/tests/manual/subtree-enabler-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 <QGuiApplication> diff --git a/tests/manual/subtree-enabler-qml/main.qml b/tests/manual/subtree-enabler-qml/main.qml index f3959a0a8..f3bd1fe07 100644 --- a/tests/manual/subtree-enabler-qml/main.qml +++ b/tests/manual/subtree-enabler-qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 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.14 import Qt3D.Core 2.14 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/texture-updates-cpp/main.cpp b/tests/manual/texture-updates-cpp/main.cpp index a15cfd7f3..5495394bd 100644 --- a/tests/manual/texture-updates-cpp/main.cpp +++ b/tests/manual/texture-updates-cpp/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 "scene.h" diff --git a/tests/manual/texture-updates-cpp/scene.cpp b/tests/manual/texture-updates-cpp/scene.cpp index 1ccf46b44..9fbe25ac6 100644 --- a/tests/manual/texture-updates-cpp/scene.cpp +++ b/tests/manual/texture-updates-cpp/scene.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 "scene.h" diff --git a/tests/manual/texture-updates-cpp/scene.h b/tests/manual/texture-updates-cpp/scene.h index dfa2b5b6a..b761282b6 100644 --- a/tests/manual/texture-updates-cpp/scene.h +++ b/tests/manual/texture-updates-cpp/scene.h @@ -1,5 +1,5 @@ // Copyright (C) 2019 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 SCENE_H #define SCENE_H diff --git a/tests/manual/texture_property_updates/main.cpp b/tests/manual/texture_property_updates/main.cpp index cf5d3d7dc..7a052bda1 100644 --- a/tests/manual/texture_property_updates/main.cpp +++ b/tests/manual/texture_property_updates/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 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 <QQuickView> #include <QGuiApplication> diff --git a/tests/manual/texture_property_updates/main.qml b/tests/manual/texture_property_updates/main.qml index eb67f7bcb..3930b71b7 100644 --- a/tests/manual/texture_property_updates/main.qml +++ b/tests/manual/texture_property_updates/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 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.2 as QQ2 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/torus-qml/main.qml b/tests/manual/torus-qml/main.qml index 709b4664d..24bce6fd7 100644 --- a/tests/manual/torus-qml/main.qml +++ b/tests/manual/torus-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/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/transparency-qml-scene3d/Scene.qml b/tests/manual/transparency-qml-scene3d/Scene.qml index 9b1ffb385..6f8f588fb 100644 --- a/tests/manual/transparency-qml-scene3d/Scene.qml +++ b/tests/manual/transparency-qml-scene3d/Scene.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/transparency-qml-scene3d/main.cpp b/tests/manual/transparency-qml-scene3d/main.cpp index 492d34660..1c995c0ad 100644 --- a/tests/manual/transparency-qml-scene3d/main.cpp +++ b/tests/manual/transparency-qml-scene3d/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 <QGuiApplication> #include <QQmlApplicationEngine> diff --git a/tests/manual/transparency-qml-scene3d/main.qml b/tests/manual/transparency-qml-scene3d/main.qml index 2ce631f13..9a2844879 100644 --- a/tests/manual/transparency-qml-scene3d/main.qml +++ b/tests/manual/transparency-qml-scene3d/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 QtQuick 2.4 import QtQuick.Window 2.2 diff --git a/tests/manual/transparency-qml/main.cpp b/tests/manual/transparency-qml/main.cpp index 28c39f694..712a860b8 100644 --- a/tests/manual/transparency-qml/main.cpp +++ b/tests/manual/transparency-qml/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/transparency-qml/main.qml b/tests/manual/transparency-qml/main.qml index eec24c793..785d49587 100644 --- a/tests/manual/transparency-qml/main.qml +++ b/tests/manual/transparency-qml/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/wave/Background.qml b/tests/manual/wave/Background.qml index 1aee7010f..00f13a785 100644 --- a/tests/manual/wave/Background.qml +++ b/tests/manual/wave/Background.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/wave/BackgroundEffect.qml b/tests/manual/wave/BackgroundEffect.qml index bdd018c90..a583cb3e1 100644 --- a/tests/manual/wave/BackgroundEffect.qml +++ b/tests/manual/wave/BackgroundEffect.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/wave/BasicCamera.qml b/tests/manual/wave/BasicCamera.qml index b69c04f8e..f63ae61eb 100644 --- a/tests/manual/wave/BasicCamera.qml +++ b/tests/manual/wave/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/wave/Wave.qml b/tests/manual/wave/Wave.qml index f57aea38d..06f78f388 100644 --- a/tests/manual/wave/Wave.qml +++ b/tests/manual/wave/Wave.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.16 import Qt3D.Render 2.16 diff --git a/tests/manual/wave/WaveEffect.qml b/tests/manual/wave/WaveEffect.qml index 61e100ed0..272242884 100644 --- a/tests/manual/wave/WaveEffect.qml +++ b/tests/manual/wave/WaveEffect.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/wave/WaveForwardRenderer.qml b/tests/manual/wave/WaveForwardRenderer.qml index 44cd57122..d32a0f3fd 100644 --- a/tests/manual/wave/WaveForwardRenderer.qml +++ b/tests/manual/wave/WaveForwardRenderer.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/wave/WaveMaterial.qml b/tests/manual/wave/WaveMaterial.qml index 3ce910c90..9c807fdbc 100644 --- a/tests/manual/wave/WaveMaterial.qml +++ b/tests/manual/wave/WaveMaterial.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/wave/main.cpp b/tests/manual/wave/main.cpp index 32f862bac..a136cdb3c 100644 --- a/tests/manual/wave/main.cpp +++ b/tests/manual/wave/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/wave/main.qml b/tests/manual/wave/main.qml index 34894a94f..382f5e2c2 100644 --- a/tests/manual/wave/main.qml +++ b/tests/manual/wave/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/widgets-scene3d/main.cpp b/tests/manual/widgets-scene3d/main.cpp index ef5cc69e2..fa86f50c8 100644 --- a/tests/manual/widgets-scene3d/main.cpp +++ b/tests/manual/widgets-scene3d/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 <QApplication> #include <QMainWindow> |