diff --git a/REUSE.toml b/REUSE.toml index cb2d718f7..ba3390ef3 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -63,7 +63,8 @@ path = ["tests/manual/planets-qml/android/AndroidManifest.xml", "tests/manual/advancedcustommaterial/models/waterPlane.obj", "tests/manual/exampleresources/assets/textures/no-ao.png", "tests/manual/exampleresources/assets/test_scene.dae", - "tests/auto/render/gltexture/image.jpg"] + "tests/auto/render/gltexture/image.jpg", + "tests/**.json"] precedence = "closest" comment = "test" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." @@ -81,38 +82,39 @@ path = ["src/extras/shaders/**", "src/quick3d/imports/**", "src/quick3d/quick3dscene3d/shaders/*", "src/core/doc/Qt3DDoc", - "tools/utils/qtcreator/templates/wizards/classes/qt3d/*"] + "tools/utils/qtcreator/templates/wizards/classes/qt3d/*", + "src/**.json"] precedence = "closest" comment = "module and plugin" SPDX-FileCopyrightText = "Copyright (C) 2024 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" [[annotations]] -path = ["**.pro", "**.qrc", "**CMakeLists.txt", ".cmake.conf", "**.yaml", "**.json", +path = ["**.pro", "**.qrc", "**CMakeLists.txt", ".cmake.conf", "**.yaml", ".tag", "**.cfg", "**/qt_cmdline.cmake", "**/BLACKLIST", "**/Info.plist", "**.pri", - ".clang-format"] + "**ci_config_linux.json", "**configure.json"] precedence = "closest" comment = "build system" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "BSD-3-Clause" [[annotations]] -path = [".tag", "**/.gitattributes", "**.gitignore", "**/.gitreview"] +path = [".clang-format", "**/.gitattributes", "**.gitignore", "**/.gitreview", ".gitmodules"] precedence = "closest" -comment = "version control system. Licensed as build system" +comment = "version control system. Infrastructure" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." -SPDX-License-Identifier = "BSD-3-Clause" +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" [[annotations]] -path = ["**/doc/images/*", "doc/src/images/**", "examples/**", "**/doc/snippets/**"] +path = ["examples/**", "**/doc/snippets/**"] comment = "this must be after the build system table because example and snippets take precedence over build system" precedence = "closest" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" [[annotations]] -path = ["**/README*", "**.qdocconf", "**.patch", "**/readme.txt", - ".gitmodules", ".qt-license-check.exclude", "config_help.txt"] +path = ["**/doc/images/*", "doc/src/images/**", "**/README*", "**.qdocconf", "**.patch", "**/readme.txt", + ".qt-license-check.exclude", "config_help.txt", "**.qdocinc"] comment = "documentation" precedence = "closest" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." @@ -120,10 +122,10 @@ SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-on [[annotations]] path = ["**.toml", "licenseRule.json"] -comment = "documentation" +comment = "infrastructure" precedence = "override" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." -SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" [[annotations]] path = ["**/qt_attribution.json"] @@ -132,10 +134,3 @@ precedence = "override" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" -[[annotations]] -path = ["**LICENSE*", "**/license.txt"] -precedence = "override" -comment = "License file." -SPDX-FileCopyrightText = "None" -SPDX-License-Identifier = "CC0-1.0" - diff --git a/coin/module_config.yaml b/coin/module_config.yaml index c1dfac008..c9b5aa9c7 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -6,6 +6,9 @@ accept_configuration: instructions: Build: + - type: EnvironmentVariable + variableName: VERIFY_SOURCE_SBOM + variableValue: "ON" - type: Group instructions: - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" diff --git a/examples/qt3d/exampleresources/assets/cubemaps/miramar/REUSE.toml b/examples/qt3d/exampleresources/assets/cubemaps/miramar/REUSE.toml index 3646271d6..5e6ecd47e 100644 --- a/examples/qt3d/exampleresources/assets/cubemaps/miramar/REUSE.toml +++ b/examples/qt3d/exampleresources/assets/cubemaps/miramar/REUSE.toml @@ -1,7 +1,7 @@ version = 1 [[annotations]] -path = ["*.webp"] +path = ["*"] precedence = "closest" SPDX-FileCopyrightText = "Copyright (c) Jockum Skoglund aka hipshot" SPDX-License-Identifier = "LicenseRef-MIRAMAR" diff --git a/licenseRule.json b/licenseRule.json index b3b874ff3..c729a7ae3 100644 --- a/licenseRule.json +++ b/licenseRule.json @@ -1,6 +1,6 @@ [ { - "comment" : ["file_pattern_ending: strings matched against the end of a file name.", + "comment": ["file_pattern_ending: strings matched against the end of a file name.", "location keys: regular expression matched against the beginning of", "the file path (relative to the git submodule root).", "spdx: list of SPDX-License-Expression's allowed in the matching files.", @@ -9,84 +9,145 @@ "unless they are examples", "Files with other endings can also be build system files" ], - "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro"], - "location" : { - "" : { - "comment" : "File with other endings also belong to the build system file type", - "file type" : "build system", - "spdx" : ["BSD-3-Clause"] + "file_pattern_ending": ["CMakeLists.txt", ".cmake", ".pro", ".qrc", "Info.plist", + ".glsl", ".cmake.conf", ".tag", "ci_config_linux.json", + ".yaml", "configure.json", "BLACKLIST"], + "location": { + "": { + "comment": "File with other endings also belong to the build system file type", + "file type": "build system", + "spdx": ["BSD-3-Clause"] }, - "(.*)(examples/|snippets/)" : { - "comment" : "Example takes precedent", - "file type" : "example", - "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + "(.*)(examples/|snippets/)": { + "comment": "Example takes precedent", + "file type": "example", + "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] } } }, { - "comments" : ["Files with the following endings are Tool licensed,", + "comments": ["Files with the following endings are infrastructure licensed"], + "file_pattern_ending": [".gitattributes", ".gitignore", ".gitmodules", ".gitreview", + ".clang-format", "licenseRule.json", "REUSE.toml"], + "location":{ + "": { + "comment": "Default", + "file type": "infrastructure", + "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comments": ["Files with the following endings are Tool licensed,", "unless they are examples.", "Files with other endings can also be tool files."], - "file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], - "location" :{ - "" : { - "comment" : "Default", - "file type" : "tools", - "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + "file_pattern_ending": [".sh", ".py", ".pl", ".bat", ".ps1"], + "location":{ + "": { + "comment": "Default", + "file type": "tools", + "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] }, - "(.*)(examples/|snippets/)" : { - "comment" : "Example takes precedent", - "file type" : "example", - "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + "(.*)(examples/|snippets/)": { + "comment": "Example takes precedent", + "file type": "example", + "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] } } }, { - "comment" : "Files with the following endings are Documentation licensed.", - "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"], - "location" :{ - "" : { - "comment" : "", - "file type" : "documentation", - "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + "comment": "Files with the following endings are Documentation licensed.", + "file_pattern_ending": [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json", + "readme.txt", ".qt-license-check.exclude", "config_help.txt", + ".qdocinc"], + "location":{ + "": { + "comment": "", + "file type": "documentation", + "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] } } }, { - "comment" : ["All other files", + "comment": ["All other files", "The licensing is defined only by the file location in the Qt module repository.", "NO key for this case!", "This needs to be the last entry of the file."], - "location" : { - "" : { - "comment" : "Rule for the files with the above endings, anywhere in the tested directory", - "file type" : "module and plugin", - "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + "location": { + "": { + "comment": "Rule for the files with the above endings, anywhere in the tested directory", + "file type": "module and plugin", + "spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] }, - "src" : { - "comment" : "", - "file type" : "module and plugin", - "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + "dist/": { + "comment": "Default", + "file type": "documentation", + "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] }, - "tests" : { - "comment" : "", - "file type" : "test", - "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + "src": { + "comment": "", + "file type": "module and plugin", + "spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] }, - "(.*)(examples/|snippets/)" : { - "comment" : "", - "file type" : "documentation snippet", - "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + "tests": { + "comment": "", + "file type": "test", + "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] }, - "usecases" : { - "comment" : "", - "file type" : "tools", - "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + "(.*)(examples/|snippets/)": { + "comment": "", + "file type": "documentation snippet", + "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] }, - "config\\.test" : { - "comment" : "", - "file type" : "tools", - "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + "(.*|examples)(.*)/doc/images": { + "comment": "", + "file type": "documentation", + "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + }, + "usecases": { + "comment": "", + "file type": "tools", + "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "config\\.test": { + "comment": "", + "file type": "tools", + "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "tests/manual/wave/shaders/ribbon.vert": { + "comment": "", + "file type": "3rd party", + "spdx": ["MIT"] + }, + "tests/manual/planets-qml/planets-watchos/PlanetsClient/main.m": { + "comment": "", + "file type": "3rd party", + "spdx": ["MIT"] + }, + "tests/manual/planets-qml/images/solarsystemscope/": { + "comment": "", + "file type": "3rd party", + "spdx": ["CC-BY-4.0"] + }, + "examples/qt3d/exampleresources/assets/obj/": { + "comment": "", + "file type": "3rd party", + "spdx": ["CC-BY-4.0"] + }, + ".*/exampleresources/assets/cubemaps/miramar/": { + "comment": "", + "file type": "3rd party", + "spdx": ["LicenseRef-MIRAMAR"] + }, + "tests/manual/planets-qml/images/nasa/uranusringcolortrans.png": { + "comment": "", + "file type": "3rd party", + "spdx": ["LicenseRef-Image-Use-Policy"] + }, + "tests/manual/exampleresources/assets/gltf/wine/.*": { + "comment": "Motorola", + "file type": "3rd party", + "spdx": ["BSD-3-Clause"] } } } diff --git a/src/3rdparty/imgui/LICENSE_imstb.txt b/src/3rdparty/imgui/LICENSE.imstb.txt similarity index 100% rename from src/3rdparty/imgui/LICENSE_imstb.txt rename to src/3rdparty/imgui/LICENSE.imstb.txt diff --git a/src/3rdparty/imgui/LICENSE_proggyclean.txt b/src/3rdparty/imgui/LICENSE.proggyclean.txt similarity index 100% rename from src/3rdparty/imgui/LICENSE_proggyclean.txt rename to src/3rdparty/imgui/LICENSE.proggyclean.txt diff --git a/src/3rdparty/imgui/qt_attribution.json b/src/3rdparty/imgui/qt_attribution.json index 7b70b32e2..b4b2f3792 100644 --- a/src/3rdparty/imgui/qt_attribution.json +++ b/src/3rdparty/imgui/qt_attribution.json @@ -24,7 +24,7 @@ "Homepage": "https://github.com/bluescan/proggyfonts", "License": "MIT License", "LicenseId": "MIT", - "LicenseFile": "LICENSE_proggyclean.txt", + "LicenseFile": "LICENSE.proggyclean.txt", "Copyright": "Copyright (c) 2004, 2005 Tristan Grimmer" }, { @@ -38,7 +38,7 @@ "Homepage": "https://github.com/nothings/stb/", "License": "MIT License or Public Domain", "LicenseId": "MIT OR CC0-1.0", - "LicenseFile": "LICENSE_imstb.txt", + "LicenseFile": "LICENSE.imstb.txt", "Copyright": "Copyright (c) 2017 Sean Barrett" } ] diff --git a/tests/manual/exampleresources/assets/cubemaps/miramar/REUSE.toml b/tests/manual/exampleresources/assets/cubemaps/miramar/REUSE.toml new file mode 100644 index 000000000..5e6ecd47e --- /dev/null +++ b/tests/manual/exampleresources/assets/cubemaps/miramar/REUSE.toml @@ -0,0 +1,7 @@ +version = 1 + +[[annotations]] +path = ["*"] +precedence = "closest" +SPDX-FileCopyrightText = "Copyright (c) Jockum Skoglund aka hipshot" +SPDX-License-Identifier = "LicenseRef-MIRAMAR" diff --git a/tests/manual/planets-qml/CMakeLists.txt b/tests/manual/planets-qml/CMakeLists.txt index 0ebf217ff..64e393e5a 100644 --- a/tests/manual/planets-qml/CMakeLists.txt +++ b/tests/manual/planets-qml/CMakeLists.txt @@ -110,7 +110,7 @@ set(planets-qml-images_resource_files "images/solarsystemscope/earthspec2k.jpg" "images/solarsystemscope/galaxy_starfield.jpg" "images/solarsystemscope/jupitermap.jpg" - "images/solarsystemscope/license.txt" + "images/solarsystemscope/LICENSE.txt" "images/solarsystemscope/marsmap2k.jpg" "images/solarsystemscope/marsnormal2k.jpg" "images/solarsystemscope/mercurymap.jpg" diff --git a/tests/manual/planets-qml/images/nasa/license.txt b/tests/manual/planets-qml/images/nasa/LICENSE.txt similarity index 100% rename from tests/manual/planets-qml/images/nasa/license.txt rename to tests/manual/planets-qml/images/nasa/LICENSE.txt diff --git a/tests/manual/planets-qml/images/nasa/qt_attribution.json b/tests/manual/planets-qml/images/nasa/qt_attribution.json index 237580070..2f53efeca 100644 --- a/tests/manual/planets-qml/images/nasa/qt_attribution.json +++ b/tests/manual/planets-qml/images/nasa/qt_attribution.json @@ -10,6 +10,6 @@ "Homepage": "https://photojournal.jpl.nasa.gov/", "License": "JPL Image Use Policy", "LicenseId": "LicenseRef-Image-Use-Policy", - "LicenseFile": "license.txt", + "LicenseFile": "LICENSE.txt", "Copyright": "Copyright (c) 1996, Jet Propulsion Laboratory" } diff --git a/tests/manual/planets-qml/images/solarsystemscope/license.txt b/tests/manual/planets-qml/images/solarsystemscope/LICENSE.txt similarity index 100% rename from tests/manual/planets-qml/images/solarsystemscope/license.txt rename to tests/manual/planets-qml/images/solarsystemscope/LICENSE.txt diff --git a/tests/manual/planets-qml/images/solarsystemscope/qt_attribution.json b/tests/manual/planets-qml/images/solarsystemscope/qt_attribution.json index c603bbea1..7b0da3378 100644 --- a/tests/manual/planets-qml/images/solarsystemscope/qt_attribution.json +++ b/tests/manual/planets-qml/images/solarsystemscope/qt_attribution.json @@ -9,6 +9,6 @@ "Homepage": "https://www.solarsystemscope.com/textures", "License": "Creative Commons Attribution 4.0", "LicenseId": "CC-BY-4.0", - "LicenseFile": "license.txt", + "LicenseFile": "LICENSE.txt", "Copyright": "Copyright (c) 2010-2017, Solar System Scope" } diff --git a/tests/manual/planets-qml/planets-qml-images.qrc b/tests/manual/planets-qml/planets-qml-images.qrc index 6b6b30ec4..b3eb4d706 100644 --- a/tests/manual/planets-qml/planets-qml-images.qrc +++ b/tests/manual/planets-qml/planets-qml-images.qrc @@ -8,7 +8,7 @@ images/solarsystemscope/earthspec2k.jpg images/solarsystemscope/galaxy_starfield.jpg images/solarsystemscope/jupitermap.jpg - images/solarsystemscope/license.txt + images/solarsystemscope/LICENSE.txt images/solarsystemscope/marsmap2k.jpg images/solarsystemscope/marsnormal2k.jpg images/solarsystemscope/mercurymap.jpg