diff options
| author | Nicolas Ettlin <nicolas.ettlin@me.com> | 2018-07-05 12:34:10 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-07-24 14:00:00 +0000 |
| commit | ed6d2d42973b62271fd8de54db39ea8cf63e3d01 (patch) | |
| tree | 8cc48cb59b09fd3f187f487572dc9a929b9cbeb7 | |
| parent | 1be80e9e6315e96262de838821a43eae3fbeb6f5 (diff) | |
| download | qttools-ed6d2d42973b62271fd8de54db39ea8cf63e3d01.tar.gz | |
Make the "Copyright" field in attribution files optional
Currently, the "Copyright" field in copyright attribution files is
mandatory. However, this obligation should be lifted so we could later
use README.chromium files with the qtattributionscanner tool (these
files do not contain a Copyright field ; in these cases, the copyright
owners can be found in the license file's body).
Change-Id: I569f8cd5d3f20fc85e5fcb873601053327841dda
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/qtattributionsscanner/scanner.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp index b07ca8f2f..fe59d9942 100644 --- a/src/qtattributionsscanner/scanner.cpp +++ b/src/qtattributionsscanner/scanner.cpp @@ -112,11 +112,8 @@ static Package readPackage(const QJsonObject &object, const QString &filePath, L missingPropertyWarning(filePath, QStringLiteral("Name")); if (p.id.isEmpty()) missingPropertyWarning(filePath, QStringLiteral("Id")); - if (p.license.isEmpty()) missingPropertyWarning(filePath, QStringLiteral("License")); - if (p.copyright.isEmpty()) - missingPropertyWarning(filePath, QStringLiteral("Copyright")); if (p.qtParts.isEmpty()) p.qtParts << QStringLiteral("libs"); diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error index 265e653b4..0acbdc7a9 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error +++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error @@ -1,4 +1,3 @@ File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Name'. File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Id'. File %{PWD}/qt_attribution_test.json: Missing mandatory property 'License'. -File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Copyright'. |