summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2022-11-18 14:27:55 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-11-30 22:47:07 +0000
commit6ebe6ecbcd07a80c0bfcd78ddb12e1b23ccbcd79 (patch)
tree345479b96193669ea41314ce5f1c30034e6b8d90
parent954791b9639a62e09488a21d152aaa7ee59f877d (diff)
QUIP 7: Clarify how license files are specified
Add the missing LicenseFiles property, and explain the "SPDX mode" of specifying license files. Change-Id: I909b6efe4ef5d5ecf2c2c11b9018555269bcf060 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
-rw-r--r--quip-0007.rst28
1 files changed, 27 insertions, 1 deletions
diff --git a/quip-0007.rst b/quip-0007.rst
index 36104d1..df48f2d 100644
--- a/quip-0007.rst
+++ b/quip-0007.rst
@@ -61,7 +61,12 @@ LicenseId
SPDX License Identifier [1]_, or an SPDX Expression [2]_. Optional.
LicenseFile
Relative path to file containing the license text. Optional for code in the
- Public Domain, otherwise needed.
+ Public Domain. Required for code outside of the public domain if neither
+ LicenseFiles nor LicenseId are set.
+LicenseFiles
+ Array of relative file paths containing the license texts. Optional for code
+ in the Public Domain. Required for code outside of the public domain if
+ neither LicenseFile nor LicenseId are set.
Copyright
Aggregated list of copyright lines. Mandatory.
@@ -79,6 +84,27 @@ Copyright
is also acceptable.
+Specification of License Files
+------------------------------
+
+There are two ways of specifying license files for 3rd-party code.
+
+Using SPDX License Identifiers
+``````````````````````````````
+
+For licenses that can be expressed with a valid SPDX license expression [1]_,
+the corresponding license texts can be placed in
+``LICENSES/<SPDX_IDENTIFIER>.txt`` files. The *LicenseId* property is required
+in this case.
+
+*LicenseFiles* and *LicenseFile* are not required.
+
+Directly specifying the license file path
+`````````````````````````````````````````
+
+With *LicenseFiles* or *LicenseFile* one can specify a list or just one license
+file. The *LicenseId* property is optional in this case.
+
Related Work
============