diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-05-29 10:37:53 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-06-01 11:17:37 +0000 |
| commit | fa1b01a54bdf62be7f6a5e9f96d1a060b7425947 (patch) | |
| tree | 39b26f1260e84a6f553ca41965b4e7947680dd15 | |
| parent | 7a47b49fc2a186661774686bf95ee870e9258f60 (diff) | |
| download | qttools-fa1b01a54bdf62be7f6a5e9f96d1a060b7425947.tar.gz | |
qtattributionsscanner: Make QDocModule, QtUsage entries optional
For Qt modules these should really be filled, but they might not make
sense in other contexts, like Qt for Python. Therefore make them
optional.
http://quips-qt-io.herokuapp.com/quip-0007.html should be adapted, too.
Change-Id: Ic4837052f29df21291c4ffcde175e7ff0946d46a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/qtattributionsscanner/scanner.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp index 86450dd9e..b07ca8f2f 100644 --- a/src/qtattributionsscanner/scanner.cpp +++ b/src/qtattributionsscanner/scanner.cpp @@ -112,10 +112,7 @@ static Package readPackage(const QJsonObject &object, const QString &filePath, L missingPropertyWarning(filePath, QStringLiteral("Name")); if (p.id.isEmpty()) missingPropertyWarning(filePath, QStringLiteral("Id")); - if (p.qdocModule.isEmpty()) - missingPropertyWarning(filePath, QStringLiteral("QDocModule")); - if (p.qtUsage.isEmpty()) - missingPropertyWarning(filePath, QStringLiteral("QtUsage")); + if (p.license.isEmpty()) missingPropertyWarning(filePath, QStringLiteral("License")); if (p.copyright.isEmpty()) diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error index 7095bf1a2..265e653b4 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error +++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error @@ -1,6 +1,4 @@ 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 'QDocModule'. -File %{PWD}/qt_attribution_test.json: Missing mandatory property 'QtUsage'. File %{PWD}/qt_attribution_test.json: Missing mandatory property 'License'. File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Copyright'. |