diff --git a/REUSE.toml b/REUSE.toml
index 661aa126c43..86032783436 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", "src/3rdparty/CMakeLists.txt", "src/plugins/sqldrivers/mimer/CMakeLists.txt"]
+        "**.cfg", "**/Makefile", "**/CMakeLists.txt"]
 precedence = "closest"
 comment = "build system"
 SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
@@ -45,12 +45,18 @@ SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
 SPDX-License-Identifier = "BSD-3-Clause"
 
 [[annotations]]
-path = ["**/snippets/**", "**/doc/**/images/**", "examples/**"]
+path = ["**/snippets/**", "**/doc/**/images/**", "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/**"]
+precedence = "closest"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
+
 [[annotations]]
 path = ["**/README*", "src/plugins/**/README*", "examples/**/README*", "tests/**/README*",
         "src/widgets/doc/snippets/common-table-model/README", "cmake/README.md",
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 663425fd636..29f155624bc 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -16,7 +16,7 @@ instructions:
   Build:
     - type: EnvironmentVariable
       variableName: VERIFY_SOURCE_SBOM
-      variableValue: "OFF"
+      variableValue: "ON"
     - !include "{{qt/qtbase}}/coin_qtbase_build_template_v2.yaml"
 
   Test:
diff --git a/licenseRule.json b/licenseRule.json
index b57f877305d..9db19e5ee4c 100644
--- a/licenseRule.json
+++ b/licenseRule.json
@@ -10,7 +10,9 @@
                      "Files with other endings can also be build system files"
                      ],
         "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf",
-                     "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"],
+                     "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in",
+                     ".gitignore", ".gitattributes", "Makefile", ".conf", ".yml", ".cfg", ".yaml",
+                     ".tag", ".dynlist"],
         "location" : {
             "" : {
                 "comment" : "Default",
@@ -41,6 +43,11 @@
                 "comment" : "Exception. This is a test file.",
                 "file type" : "test",
                 "spdx"      : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+            },
+            "coin/instructions/qmake_examples/.*\\.yaml" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
             }
         }
     },
@@ -64,12 +71,24 @@
                 "comment" : "This is a test file",
                 "file type" : "test",
                 "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+            },
+            "tests/manual/rhi/computeimage/buildshaders.bat" : {
+                "comment" : "This is a test file",
+                "file type" : "test",
+                "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+            },
+            "space.bat" : {
+                "comment" : "Double check",
+                "file type" : "???",
+                "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
             }
         }
     },
     {
         "comment" : "Files with the following endings are Documentation licensed.",
-        "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"],
+        "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json",
+                                 "REUSE.toml", "README.md", "README.txt", "config_help.txt",
+                                 "licenseRule.json", "READ-THIS-BEFORE-MANUALLY-ADDING-FILES-TO-PACKAGE.txt"],
         "location" :{
             "" : {
                 "comment" : "",
@@ -80,6 +99,16 @@
                 "comment" : "Exception. This is a test file",
                 "file type" : "test",
                 "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+            },
+            "ests/auto/testlib/selftests/" : {
+            "comment" : "Exception. Those are test files",
+            "file type" : "test",
+            "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+            },
+            "util/unicode/data/(?!REUSE.toml)" : {
+            "comment" : "Exception. REUSE.toml is always documentation",
+            "file type" : "3rd party",
+            "spdx" : ["Unicode-3.0"]
             }
         }
     },
@@ -94,11 +123,101 @@
                 "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"]
+            },
+            "doc/" : {
+                "comment" : "Default",
+                "file type" : "documentation",
+                "spdx"      : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
+            },
+            "doc/global/template/scripts/.*\\.js" : {
+                "comment" : "This is a tool",
+                "file type" : "tools and utils",
+                "spdx"      : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
+            },
+            "coin/" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
+            "src/plugins/networkinformation/android/jar/build.gradle" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
+            "src/plugins/networkinformation/android/jar/settings.gradle" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
+            "libexec/" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
+            "cmake/" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
+            "cmake/modulecppexports.h.in" : {
+                "comment" : "Default Double check",
+                "file type" : "module and plugin",
+                "spdx"      : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
+            },
+            ".*PrivacyInfo.xcprivacy" : {
+                "comment" : "Exception. Unconditionally redistributable without any clauses",
+                "file type" : "build system",
+                "spdx"      : ["CC0-1.0"]
+            },
+            "cmake/qbatchedtestrunner\\.in\\.cpp" : {
+                "comment" : "Compiled into internal tests if QT_BUILD_TESTS_BATCHED is enabled.",
+                "file type" : "test",
+                "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+            },
+            "bin/" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
+            "src/printsupport/platform/.*\\.json" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
+            "mkspecs/(.*\\.plist.*)" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
+            "mkspecs/features/data/(configure.json|testserver/Dockerfile|dummy.cpp|macros.cpp)" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
+            "mkspecs/features/(mac/sdk.mk|uikit/xcodebuild.mk)" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
+            "mkspecs/(macx-ios-clang/LaunchScreen.storyboard|macx-xcode/(WorkspaceSettings.xcsettings|default.xcscheme))" : {
+                "comment" : "Default",
+                "file type" : "build system",
+                "spdx"      : ["BSD-3-Clause"]
+            },
             "src/" : {
                 "comment" : "Default",
                 "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/widgets/doc/macOS/AppKit/AppKit.h" : {
+                "comment" : "",
+                "file type" : "documentation",
+                "spdx"      : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
+            },
             "plugins/" : {
                 "comment" : "Default",
                 "file type" : "module and plugin",
@@ -144,16 +263,71 @@
                 "file type" : "test",
                 "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
             },
-            "cmake/qbatchedtestrunner\\.in\\.cpp" : {
-                "comment" : "Compiled into internal tests if QT_BUILD_TESTS_BATCHED is enabled.",
-                "file type" : "test",
-                "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
-            },
             "tests/auto/testlib/selftests/catch_p_p\\.h" : {
                 "comment" : "Exception",
                 "file type" : "test",
                 "spdx" : ["BSL-1.0"]
             },
+            "tests/manual/rhi/shared/cube\\.h" : {
+                "comment" : "Exception",
+                "file type" : "3rd party",
+                "spdx" : ["Apache-2.0"]
+            },
+            "tests/testserver/apache2/testdata/www/htdocs/protected/rfc3252\\.txt" : {
+                "comment" : "The Internet Society",
+                "file type" : "3rd party",
+                "spdx" : ["CC0-1.0"]
+            },
+            "tests/auto/gui/image/qimagereader/images/(?!REUSE.toml)" : {
+                "comment" : "Unknown",
+                "file type" : "tests",
+                "spdx" : ["CC0-1.0"]
+            },
+            "tests/(auto|benchmarks)/gui/image/qimagereader/images/black.xpm" : {
+                "comment" : "TU Braunschweig",
+                "file type" : "3rd party",
+                "spdx" : ["GPL-3.0-only"]
+            },
+            "tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/(japanese/japanese.xml|sun/sun)" : {
+                "comment" : "",
+                "file type" : "3rd party",
+                "spdx" : ["SPL-1.0"]
+            },
+            "tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/japanese/weekly" : {
+                "comment" : "Exception",
+                "file type" : "3rd party",
+                "spdx" : ["Xerox"]
+            },
+            "tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/sun/valid/out/pe00.xml" : {
+                "comment" : "Exception",
+                "file type" : "3rd party",
+                "spdx" : ["CC0-1.0"]
+            },
+            "tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/japanese/weekly-" : {
+                "comment" : "Exception",
+                "file type" : "3rd party",
+                "spdx" : ["Xerox"]
+            },
+            "tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/ibm_oasis" : {
+                "comment" : "Exception",
+                "file type" : "3rd party",
+                "spdx" : ["IPL-1.0"]
+            },
+            "tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/xml-1.1/ibm_" : {
+                "comment" : "Exception",
+                "file type" : "3rd party",
+                "spdx" : ["IPL-1.0"]
+            },
+            "tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/finalCatalog.xml" : {
+                "comment" : "Exception",
+                "file type" : "3rd party",
+                "spdx" : ["IPL-1.0"]
+            },
+            "tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/.*conf\\.xml" : {
+                "comment" : "Exception",
+                "file type" : "3rd party",
+                "spdx" : ["BSD-3-Clause"]
+            },
             "(.*)(examples/|snippets/)" : {
                 "comment" : "Default",
                 "file type" : "examples and snippets",
@@ -184,7 +358,17 @@
                 "file type" : "util",
                 "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
             },
-            "util/locale_database/testlocales/localemodel.cpp" : {
+            "util/unicode/data/.*\\.txt" : {
+            "comment" : "Exception.",
+            "file type" : "3rd party",
+            "spdx" : ["Unicode-3.0"]
+            },
+            "util/aglfn/data/aglfn\\.txt" : {
+            "comment" : "Exception.",
+            "file type" : "3rd party",
+            "spdx" : ["BSD-3-Clause"]
+            },
+            "util/locale_database/testlocales/localemodel\\.cpp" : {
                 "comment" : "Exception: this contains CLDR-generated code",
                 "file type" : "util",
                 "spdx" : ["Unicode-3.0"]
@@ -194,6 +378,21 @@
                 "file type" : "util",
                 "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
             },
+            "util/wasm/batchedtestrunner/" : {
+                "comment" : "Exception: this is a helper tool",
+                "file type" : "util",
+                "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
+            },
+            "util/lexgen/tests/testdata/" : {
+                "comment" : "Exception",
+                "file type" : "test",
+                "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+            },
+            "util/lexgen/test.lexgen" : {
+                "comment" : "Exception",
+                "file type" : "test",
+                "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
+            },
             "util/x86simdgen/header" : {
                 "comment" : "Exception for file generation",
                 "file type" : "util",
@@ -204,25 +403,144 @@
                 "file type" : "util",
                 "spdx"      : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
             },
-            "src/gui/painting/qimagescale.cpp" : {
+            "util/gradientgen/webgradients\\.css" : {
+                "comment" : "Exception",
+                "file type" : "3rd party",
+                "spdx"      : ["MIT"]
+            },
+            "src/gui/painting/qimagescale\\.cpp" : {
                 "comment" : "Info from qt_attribution.json",
                 "file type" : "module and plugin",
                 "spdx" : ["BSD-2-Clause AND Imlib2"]
             },
-            "src/gui/painting/qgrayraster.c" : {
+            "src/gui/painting/qgrayraster\\.c" : {
                 "comment" : "Info from qt_attribution.json",
                 "file type" : "module and plugin",
                 "spdx" : ["FTL OR GPL-2.0-only"]
             },
-            "src/corelib/kernel/qeventdispatcher_cf_p.h" : {
+            "src/corelib/kernel/qeventdispatcher_cf_p\\.h" : {
                 "comment" : "Info from qt_attribution.json",
                 "file type" : "module and plugin",
                 "spdx" : ["BSD-3-Clause"]
             },
-            "src/plugins/platforms/cocoa/qcocoa(application|eventdispatcher|introspection|systemtrayicon.mm)" : {
+            "src/plugins/platforms/cocoa/qcocoa(application|eventdispatcher|introspection|systemtrayicon\\.mm)" : {
                 "comment" : "Info from qt_attribution.json",
                 "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"]
+            },
+            "doc/.*/images/" : {
+                "comment" : "This is example and snippets",
+                "file type" : "examples and snippets",
+                "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
+            },
+            "tests/testserver/apache2/testdata/www/htdocs/rfcs/rfc2616\\.html" : {
+                "comment" : "The Internet Society",
+                "file type" : "3rd party",
+                "spdx" : ["CC0-1.0"]
+            },
+            "tests/manual/network_stresstest/qtest/bigfile" : {
+                "comment" : "The Internet Society",
+                "file type" : "3rd party",
+                "spdx" : ["CC0-1.0"]
+            },
+            "tests/auto/network/access/qnetworkreply/(bigfile|resource|rfc3252.txt)" : {
+                "comment" : "",
+                "file type" : "3rd party",
+                "spdx" : ["CC0-1.0"]
+            },
+            "tests/auto/corelib/serialization/qtextstream/rfc3261.txt" : {
+                "comment" : "",
+                "file type" : "3rd party",
+                "spdx" : ["CC0-1.0"]
+            },
+            "tests/auto/corelib/text/qbytearray_large/rfc3252.txt" : {
+                "comment" : "",
+                "file type" : "3rd party",
+                "spdx" : ["CC0-1.0"]
+            },
+            "tests/auto/other/qcomplextext/data/(?!REUSE.toml)" : {
+                "comment" : "Unicode",
+                "file type" : "3rd party",
+                "spdx" : ["Unicode-3.0"]
+            },
+            "tests/auto/corelib/text/qtextboundaryfinder/data/.*\\.txt" : {
+                "comment" : "Unicode",
+                "file type" : "3rd party",
+                "spdx" : ["Unicode-3.0"]
+            },
+            "tests/auto/corelib/text/qchar/data/NormalizationTest.txt" : {
+                "comment" : "Unicode",
+                "file type" : "3rd party",
+                "spdx" : ["Unicode-3.0"]
+            },
+            "tests/auto/corelib/io/qurluts46/testdata/IdnaTestV2.txt" : {
+                "comment" : "Unicode",
+                "file type" : "3rd party",
+                "spdx" : ["Unicode-3.0"]
+            },
+            "tests/auto/corelib/ipc/ipctestcommon.h" : {
+                "comment" : "Intel",
+                "file type" : "3rd party",
+                "spdx" : ["MIT"]
+            },
+            "src/plugins/platforminputcontexts/ibus/interfaces/" : {
+                "comment" : "KDE",
+                "file type" : "3rd party",
+                "spdx" : ["BSD-3-Clause"]
+            },
+            "src/gui/vulkan/vk.xml" : {
+                "comment" : "",
+                "file type" : "3rd party",
+                "spdx" : ["Apache-2.0 OR MIT"]
+            },
+            "src/gui/text/qfontsubset_agl.cpp" : {
+                "comment" : "Abode",
+                "file type" : "3rd party",
+                "spdx" : ["BSD-3-Clause"]
+            },
+            "src/gui/rhi/mipmap.hlsl" : {
+                "comment" : "Microsoft",
+                "file type" : "3rd party",
+                "spdx" : ["MIT"]
+            },
+            "src/gui/painting/qregion.cpp" : {
+                "comment" : ["X Consortium",
+                             "Need both spdx entries",
+                             "First one for testing source SBOM which aggregates in-file and REUSE.toml info",
+                             "Second one for license test when only the in-file info is read"],
+                "file type" : "module and plugin and 3rd party",
+                "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only AND X11 AND HPND",
+                          "LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
+            },
+            "src/gui/opengl/qopengles2ext.h" : {
+                "comment" : "The Khronos Group Inc.",
+                "file type" : "3rd party",
+                "spdx" : ["MIT-Khronos-old"]
+            },
+            "src/gui/opengl/qopenglext.h" : {
+                "comment" : "The Khronos Group Inc.",
+                "file type" : "3rd party",
+                "spdx" : ["MIT-Khronos-old"]
+            },
+            "src/corelib/tools/qhash_sip.cpp" : {
+                "comment" : "In file licensed",
+                "file type" : "3rd party",
+                "spdx" : ["CC0-1.0"]
+            },
+            "src/corelib/global/qconfig.cpp.in" : {
+                "comment" : "See REUSE.toml file",
+                "file type" : "build system",
+                "spdx" : ["BSD-3-Clause"]
+            },
+            "src/corelib/Qt6CoreConfigureFileTemplate.in" : {
+                "comment" : "See REUSE.toml file",
+                "file type" : "build system",
+                "spdx" : ["BSD-3-Clause"]
             }
         }
     }
diff --git a/src/corelib/kernel/QEVENTDISPATCHER_CF_LICENSE.txt b/src/corelib/kernel/LICENSE.QEVENTDISPATCHER_CF.txt
similarity index 100%
rename from src/corelib/kernel/QEVENTDISPATCHER_CF_LICENSE.txt
rename to src/corelib/kernel/LICENSE.QEVENTDISPATCHER_CF.txt
diff --git a/src/corelib/kernel/qt_attribution.json b/src/corelib/kernel/qt_attribution.json
index 32292460115..3fa6f179dfa 100644
--- a/src/corelib/kernel/qt_attribution.json
+++ b/src/corelib/kernel/qt_attribution.json
@@ -9,6 +9,6 @@
     "Description": "Implementation of QAbstractEventDispatcher for macOS.",
     "License": "BSD 3-clause \"New\" or \"Revised\" License",
     "LicenseId": "BSD-3-Clause",
-    "LicenseFile": "QEVENTDISPATCHER_CF_LICENSE.txt",
+    "LicenseFile": "LICENSE.QEVENTDISPATCHER_CF.txt",
     "Copyright": "Copyright (c) 2007-2008, Apple, Inc."
 }
diff --git a/src/dbus/LIBDBUS-1-LICENSE.txt b/src/dbus/LICENSE.LIBDBUS-1.txt
similarity index 100%
rename from src/dbus/LIBDBUS-1-LICENSE.txt
rename to src/dbus/LICENSE.LIBDBUS-1.txt
diff --git a/src/dbus/qt_attribution.json b/src/dbus/qt_attribution.json
index f97419942f4..aa1d74f1cf0 100644
--- a/src/dbus/qt_attribution.json
+++ b/src/dbus/qt_attribution.json
@@ -11,7 +11,7 @@
     "PURL": "pkg:github/d-bus/dbus@dbus-$<VERSION>",
     "LicenseId": "AFL-2.1 OR GPL-2.0-or-later",
     "License": "Academic Free License v2.1, or GNU General Public License v2.0 or later",
-    "LicenseFile": "LIBDBUS-1-LICENSE.txt",
+    "LicenseFile": "LICENSE.LIBDBUS-1.txt",
     "Comment": "Fragments from various upstream files, see comments in ...",
     "Files": "dbus_minimal_p.h",
     "Copyright": ["Copyright (C) 2002, 2003 CodeFactory AB",
diff --git a/src/gui/opengl/KHRONOS_LICENSE.txt b/src/gui/opengl/LICENSE.KHRONOS.txt
similarity index 100%
rename from src/gui/opengl/KHRONOS_LICENSE.txt
rename to src/gui/opengl/LICENSE.KHRONOS.txt
diff --git a/src/gui/opengl/qt_attribution.json b/src/gui/opengl/qt_attribution.json
index 64fdd22cf4e..e346e262862 100644
--- a/src/gui/opengl/qt_attribution.json
+++ b/src/gui/opengl/qt_attribution.json
@@ -12,7 +12,7 @@
         "PURL": "pkg:generic/khronos-opengl-headers?download_url=https://www.khronos.org/?revision=27684",
         "License": "MIT License",
         "LicenseId": "MIT",
-        "LicenseFile": "KHRONOS_LICENSE.txt",
+        "LicenseFile": "LICENSE.KHRONOS.txt",
         "Copyright": "Copyright (c) 2013-2014 The Khronos Group Inc.",
         "Comment": "no relevant CPE found"
     },
@@ -29,7 +29,7 @@
         "PURL": "pkg:generic/khronos-opengl-es2-headers?download_url=https://www.khronos.org/?revision=27673",
         "License": "MIT License",
         "LicenseId": "MIT",
-        "LicenseFile": "KHRONOS_LICENSE.txt",
+        "LicenseFile": "LICENSE.KHRONOS.txt",
         "Copyright": "Copyright (c) 2013-2014 The Khronos Group Inc.",
         "Comment": "no relevant CPE found"
     }
diff --git a/src/gui/painting/QIMAGETRANSFORM_LICENSE.txt b/src/gui/painting/LICENSE.QIMAGETRANSFORM.txt
similarity index 100%
rename from src/gui/painting/QIMAGETRANSFORM_LICENSE.txt
rename to src/gui/painting/LICENSE.QIMAGETRANSFORM.txt
diff --git a/src/gui/painting/XCONSORTIUM_LICENSE.txt b/src/gui/painting/LICENSE.XCONSORTIUM.txt
similarity index 100%
rename from src/gui/painting/XCONSORTIUM_LICENSE.txt
rename to src/gui/painting/LICENSE.XCONSORTIUM.txt
diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json
index 74ab387133d..f238cb56733 100644
--- a/src/gui/painting/qt_attribution.json
+++ b/src/gui/painting/qt_attribution.json
@@ -25,7 +25,7 @@
         "Description": "Normal smoothscale method, based on Imlib2's smoothscale.",
         "LicenseId": "BSD-2-Clause AND Imlib2",
         "License": "BSD 2-clause \"Simplified\" License and Imlib2 License",
-        "LicenseFile": "QIMAGETRANSFORM_LICENSE.txt",
+        "LicenseFile": "LICENSE.QIMAGETRANSFORM.txt",
         "Copyright": ["Copyright (C) 2004, 2005 Daniel M. Duley.",
         "(C) Carsten Haitzler and various contributors.",
         "(C) Willem Monsuwe <willem@stack.nl>"],
@@ -43,7 +43,7 @@
         "PURL": "pkg:generic/xserverhelper?download_url=https://www.x.org/",
         "License": "X11 License and Historical Permission Notice and Disclaimer",
         "LicenseId": "X11 AND HPND",
-        "LicenseFile": "XCONSORTIUM_LICENSE.txt",
+        "LicenseFile": "LICENSE.XCONSORTIUM.txt",
         "Copyright": ["Copyright (c) 1987, 1988 X Consortium",
         "Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts."],
         "Comment": "no relevant CPE found"
diff --git a/src/gui/rhi/MiniEngine_LICENSE.txt b/src/gui/rhi/LICENSE.MiniEngine.txt
similarity index 100%
rename from src/gui/rhi/MiniEngine_LICENSE.txt
rename to src/gui/rhi/LICENSE.MiniEngine.txt
diff --git a/src/gui/rhi/qt_attribution.json b/src/gui/rhi/qt_attribution.json
index 2a058d21b1e..e1094396af2 100644
--- a/src/gui/rhi/qt_attribution.json
+++ b/src/gui/rhi/qt_attribution.json
@@ -12,7 +12,7 @@
         "PURL": "pkg:github/microsoft/DirectX-Graphics-Samples@$<VERSION>",
         "License": "MIT License",
         "LicenseId": "MIT",
-        "LicenseFile": "MiniEngine_LICENSE.txt",
+        "LicenseFile": "LICENSE.MiniEngine.txt",
         "Copyright": "Copyright (c) 2015 Microsoft",
         "Comment": "no relevant CPE found"
     }
diff --git a/src/gui/text/AGLFN_LICENSE.txt b/src/gui/text/LICENSE.AGLFN.txt
similarity index 100%
rename from src/gui/text/AGLFN_LICENSE.txt
rename to src/gui/text/LICENSE.AGLFN.txt
diff --git a/src/gui/text/qt_attribution.json b/src/gui/text/qt_attribution.json
index 20f83808f77..47af803ee90 100644
--- a/src/gui/text/qt_attribution.json
+++ b/src/gui/text/qt_attribution.json
@@ -12,7 +12,7 @@
         "PURL": "pkg:github/adobe-type-tools/agl-aglfn@$<VERSION>",
         "License": "BSD 3-Clause \"New\" or \"Revised\" License",
         "LicenseId": "BSD-3-Clause",
-        "LicenseFile": "AGLFN_LICENSE.txt",
+        "LicenseFile": "LICENSE.AGLFN.txt",
         "Copyright": "Copyright 2002, 2003, 2005, 2006, 2008, 2010, 2015 Adobe Systems",
         "Comment": "no relevant CPE found"
     }
diff --git a/src/plugins/REUSE.toml b/src/plugins/REUSE.toml
index d0f99d5f90c..d017617236d 100644
--- a/src/plugins/REUSE.toml
+++ b/src/plugins/REUSE.toml
@@ -9,6 +9,12 @@ 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 = ["platforms/wasm/**"]
+precedence = "closest"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only"
+
 [[annotations]]
 path = ["**.qmake.conf", "networkinformation/android/jar/build.gradle",
         "networkinformation/android/jar/settings.gradle"]
diff --git a/src/plugins/platforminputcontexts/ibus/interfaces/REUSE.toml b/src/plugins/platforminputcontexts/ibus/interfaces/REUSE.toml
index 569ab313167..de330414688 100644
--- a/src/plugins/platforminputcontexts/ibus/interfaces/REUSE.toml
+++ b/src/plugins/platforminputcontexts/ibus/interfaces/REUSE.toml
@@ -2,7 +2,6 @@ version = 1
 
 [[annotations]]
 path = ["*.xml"]
-comment = "to be confirmed"
 precedence = "closest"
 SPDX-FileCopyrightText = "Copyright © 2011-2018 The KDE community"
 SPDX-License-Identifier = "BSD-3-Clause"
diff --git a/src/plugins/platforms/cocoa/COCOA_LICENSE.txt b/src/plugins/platforms/cocoa/LICENSE.COCOA.txt
similarity index 100%
rename from src/plugins/platforms/cocoa/COCOA_LICENSE.txt
rename to src/plugins/platforms/cocoa/LICENSE.COCOA.txt
diff --git a/src/plugins/platforms/cocoa/qt_attribution.json b/src/plugins/platforms/cocoa/qt_attribution.json
index 615f24d0381..927315c38ee 100644
--- a/src/plugins/platforms/cocoa/qt_attribution.json
+++ b/src/plugins/platforms/cocoa/qt_attribution.json
@@ -8,7 +8,7 @@
     "Description": "Allows Qt to integrate into Apple's Cocoa API.",
     "LicenseId": "BSD-3-Clause",
     "License": "BSD 3-clause \"New\" or \"Revised\" License",
-    "LicenseFile": "COCOA_LICENSE.txt",
+    "LicenseFile": "LICENSE.COCOA.txt",
     "Copyright": "Copyright (c) 2007-2008, Apple, Inc.",
     "Comment": "no relevant CPE or PURL found"
 }
diff --git a/src/printsupport/REUSE.toml b/src/printsupport/REUSE.toml
index 2596eb57470..2ade3821bf2 100644
--- a/src/printsupport/REUSE.toml
+++ b/src/printsupport/REUSE.toml
@@ -1,7 +1,7 @@
 version = 1
 
 [[annotations]]
-path = ["dialogs/images/*.png", "dialogs/*.ui", "widgets/*.ui"]
+path = ["dialogs/*.ui", "widgets/*.ui", "dialogs/images/*.png"]
 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"
@@ -12,9 +12,20 @@ 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"
 SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
 SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = ["doc/snippets/**"]
+precedence = "closest"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
diff --git a/src/widgets/REUSE.toml b/src/widgets/REUSE.toml
index 5eea18252e7..5611f3d8fa7 100644
--- a/src/widgets/REUSE.toml
+++ b/src/widgets/REUSE.toml
@@ -12,4 +12,15 @@ 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/**", "doc/snippets/**"]
+precedence = "closest"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
+
+[[annotations]]
+path = ["doc/snippets/common-table-model/README"]
+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/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite-LICENSE.txt b/tests/auto/corelib/serialization/qxmlstream/LICENSE.XML-Test-Suite.txt
similarity index 100%
rename from tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite-LICENSE.txt
rename to tests/auto/corelib/serialization/qxmlstream/LICENSE.XML-Test-Suite.txt
diff --git a/tests/auto/network/access/qnetworkreply/REUSE.toml b/tests/auto/network/access/qnetworkreply/REUSE.toml
index 94c554c183b..ffa279c1500 100644
--- a/tests/auto/network/access/qnetworkreply/REUSE.toml
+++ b/tests/auto/network/access/qnetworkreply/REUSE.toml
@@ -2,12 +2,12 @@ version = 1
 
 [[annotations]]
 path = ["bigfile", "rfc3252.txt"]
-precedence = "override"
+precedence = "closest"
 SPDX-FileCopyrightText = "Copyright (C) The Internet Society (2002).  All Rights Reserved."
 SPDX-License-Identifier = "CC0-1.0"
 
 [[annotations]]
 path = ["resource"]
-precedence = "override"
+precedence = "closest"
 SPDX-FileCopyrightText = "Copyright (C) The Internet Society (1998).  All Rights Reserved."
 SPDX-License-Identifier = "CC0-1.0"
diff --git a/tests/benchmarks/gui/image/qimagereader/images/REUSE.toml b/tests/benchmarks/gui/image/qimagereader/images/REUSE.toml
index 43651640939..a18b4f1cafe 100644
--- a/tests/benchmarks/gui/image/qimagereader/images/REUSE.toml
+++ b/tests/benchmarks/gui/image/qimagereader/images/REUSE.toml
@@ -1,12 +1,5 @@
 version = 1
 
-[[annotations]]
-path = ["*"]
-precedence = "closest"
-comment = "not sure about all those files"
-SPDX-FileCopyrightText = "Unknown"
-SPDX-License-Identifier = "CC0-1.0"
-
 [[annotations]]
 path = ["black.xpm"]
 precedence = "closest"
diff --git a/tests/manual/examples/widgets/scroller/CMakeLists.txt b/tests/manual/examples/widgets/scroller/CMakeLists.txt
index cd920bd3615..d51bf0e1feb 100644
--- a/tests/manual/examples/widgets/scroller/CMakeLists.txt
+++ b/tests/manual/examples/widgets/scroller/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright (C) 2024 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 qt_internal_add_example(graphicsview)
diff --git a/util/gradientgen/WEBGRADIENTS_LICENSE.txt b/util/gradientgen/LICENSE.WEBGRADIENTS.txt
similarity index 100%
rename from util/gradientgen/WEBGRADIENTS_LICENSE.txt
rename to util/gradientgen/LICENSE.WEBGRADIENTS.txt
diff --git a/util/gradientgen/qt_attribution.json b/util/gradientgen/qt_attribution.json
index 25c382c7d27..c6bd5746249 100644
--- a/util/gradientgen/qt_attribution.json
+++ b/util/gradientgen/qt_attribution.json
@@ -11,7 +11,7 @@
         "PURL": "pkg:generic/webgradients?download_url=https://webgradients.com/",
         "License": "MIT License",
         "LicenseId": "MIT",
-        "LicenseFile": "WEBGRADIENTS_LICENSE.txt",
+        "LicenseFile": "LICENSE.WEBGRADIENTS.txt",
         "Copyright": "Copyright (c) 2017 itmeo"
     }
 ]