diff --git a/REUSE.toml b/REUSE.toml index 86032783436..9129b59d6c8 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -26,7 +26,7 @@ path = ["bin/*", "coin/**","libexec/*","**_clang-format", "**.cmake", "**.conf", "**.pro", "**.pri", "**.yaml", "cmake/**.in", "cmake/ios/LaunchScreen.storyboard", "cmake/**md", "**.yml", "**.dynlist", "cmake/**.plist", "src/corelib/global/qconfig.cpp.in", "src/corelib/Qt6CoreConfigureFileTemplate.in", - "**.cfg", "**/Makefile", "**/CMakeLists.txt"] + "**.cfg", "**/Makefile", "**/CMakeLists.txt", "**.qrc"] precedence = "closest" comment = "build system" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." @@ -45,14 +45,14 @@ SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "BSD-3-Clause" [[annotations]] -path = ["**/snippets/**", "**/doc/**/images/**", "examples/**", "src/tools/qlalr/examples/**"] +path = ["**/snippets/**", "examples/**", "src/tools/qlalr/examples/**"] 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 = ["tests/manual/examples/**"] +path = ["tests/manual/examples/**", "**/snippets/**"] precedence = "closest" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" @@ -62,12 +62,19 @@ path = ["**/README*", "src/plugins/**/README*", "examples/**/README*", "tests/** "src/widgets/doc/snippets/common-table-model/README", "cmake/README.md", "lib/README", "coin/instructions/README.md", "src/3rdparty/README", "**.qdocconf", "**.qdocinc", "config_help.txt", - "doc/global/template/style/*"] + "doc/global/template/style/*", "**/doc/**/images/**"] comment = "documentation" precedence = "closest" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" +[[annotations]] +path = ["src/gui/doc/snippets/textdocument-images/images.qrc"] +precedence = "closest" +comment = "falls under **/doc/**/images/**, which is wrong" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" + [[annotations]] path = ["src/assets/icons/**.png", "src/assets/icons/**.svg", "src/android/**.xml", "src/gui/**.xml", @@ -79,6 +86,13 @@ precedence = "closest" 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 = ["tests/auto/tools/rcc/data/legal/legal.qrc"] +precedence = "override" +comment = "license in file not referring to the file itself" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "BSD-3-Clause" + [[annotations]] path = ["**/qt_attribution.json"] precedence = "override" diff --git a/licenseRule.json b/licenseRule.json index 9db19e5ee4c..f593f7366ec 100644 --- a/licenseRule.json +++ b/licenseRule.json @@ -12,7 +12,7 @@ "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in", ".gitignore", ".gitattributes", "Makefile", ".conf", ".yml", ".cfg", ".yaml", - ".tag", ".dynlist"], + ".tag", ".dynlist", ".qrc"], "location" : { "" : { "comment" : "Default", @@ -48,6 +48,13 @@ "comment" : "Default", "file type" : "build system", "spdx" : ["BSD-3-Clause"] + }, + "tests/auto/tools/rcc/data/legal/legal.qrc" : { + "comment" : ["In file licensing not related. Relicensed with reuse.", + "License test can't see the relicensing", + "need first spdx entry to keep in-file license test from failing"], + "file type" : "build system", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only","BSD-3-Clause"] } } }, @@ -428,15 +435,15 @@ "file type" : "module and plugin", "spdx" : ["BSD-3-Clause"] }, - "(src|qmake).*/doc/images/" : { - "comment" : "This is example and snippets", - "file type" : "examples and snippets", - "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + "(src|qmake|examples|tests).*/doc/images/" : { + "comment" : "Default", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] }, - "doc/.*/images/" : { - "comment" : "This is example and snippets", - "file type" : "examples and snippets", - "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + ".*/doc/(snippets|.*).*/images/" : { + "comment" : "Default", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] }, "tests/testserver/apache2/testdata/www/htdocs/rfcs/rfc2616\\.html" : { "comment" : "The Internet Society", diff --git a/src/corelib/doc/REUSE.toml b/src/corelib/doc/REUSE.toml index 7742b0bf28f..254251a0b6b 100644 --- a/src/corelib/doc/REUSE.toml +++ b/src/corelib/doc/REUSE.toml @@ -7,7 +7,7 @@ SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" [[annotations]] -path = ["**qdocinc"] +path = ["**qdocinc", "**/images/**"] precedence = "closest" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" diff --git a/src/printsupport/REUSE.toml b/src/printsupport/REUSE.toml index 2ade3821bf2..8b6274a751a 100644 --- a/src/printsupport/REUSE.toml +++ b/src/printsupport/REUSE.toml @@ -12,12 +12,6 @@ precedence = "closest" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" -[[annotations]] -path = ["doc/images/**"] -precedence = "closest" -SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." -SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" - [[annotations]] path = ["**.json"] precedence = "closest" diff --git a/src/widgets/REUSE.toml b/src/widgets/REUSE.toml index 5611f3d8fa7..98653c588bb 100644 --- a/src/widgets/REUSE.toml +++ b/src/widgets/REUSE.toml @@ -13,7 +13,7 @@ SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" [[annotations]] -path = ["doc/images/**", "doc/snippets/**"] +path = ["doc/snippets/**"] precedence = "closest" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"