Correct AndroidManifest.xml licensing in REUSE.toml file

Task-number: QTBUG-124453 Task-number: QTBUG-125211 Pick-to: 6.8 Change-Id: I6f8c9a5951e3f8c70e03b3b9ec7b8ba6e30a4d4a Reviewed-by: Volker Hilsheimer <[email protected]>
qt · Nov 6, 2024 · 024280a · 024280a
1 parent 7b6f234
commit 024280a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 68 deletions.
diff --git a/LICENSES/Apache-2.0.txt b/LICENSES/Apache-2.0.txt
diff --git a/REUSE.toml b/REUSE.toml
@@ -1,7 +1,8 @@
 version = 1
 
 [[annotations]]
-path = ["src/tts/doc/QtTextToSpeechDoc"]
+path = ["src/tts/doc/QtTextToSpeechDoc",
+        "src/plugins/tts/android/jar/AndroidManifest.xml"]
 precedence = "closest"
 comment = "src and plugin"
 SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
@@ -36,12 +37,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 = ["**/AndroidManifest.xml"]
-precedence = "override"
-SPDX-FileCopyrightText = "Copyright 2006, The Android Open Source Project"
-SPDX-License-Identifier = "Apache-2.0"
-
 [[annotations]]
 path = ["**.toml", "licenseRule.json"]
 comment = "documentation"