diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-07-19 10:37:03 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-08-08 11:47:27 +0000 |
| commit | de8c576b24852764de2fe1a295b9c9def473ac80 (patch) | |
| tree | 814cc1e71e76349cfcb18950b0d90d4b388e59bd /tests/auto/qtattributionsscanner | |
| parent | 032a1a640b75bcff83ff2c43c1290f4017cf0e1f (diff) | |
qtattributionsscanner: Support setting & filtering qdoc module
This is needed e.g. for qtbase, where there are multiple help
projects.
Change-Id: Ia31ac4818ad6780a301fa6f7371a3f33ee21df48
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Diffstat (limited to 'tests/auto/qtattributionsscanner')
7 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json index 56ed8ca79..eaebdb9ef 100644 --- a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json +++ b/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json @@ -1,6 +1,7 @@ { "Id": "complete", "Name": "Complete", + "QDocModule": "qtest", "License": "License", "Copyright": "Copyright", diff --git a/tests/auto/qtattributionsscanner/testdata/good/expected.json b/tests/auto/qtattributionsscanner/testdata/good/expected.json index 7c11eb30f..ed6d94344 100644 --- a/tests/auto/qtattributionsscanner/testdata/good/expected.json +++ b/tests/auto/qtattributionsscanner/testdata/good/expected.json @@ -9,6 +9,7 @@ "LicenseId": "xxx", "Name": "Complete", "Path": "%{PWD}/complete", + "QDocModule": "qtest", "QtUsage": "Multi\nLine\nUsage", "Version": "1.0", "DownloadLocation": "www.qt.io/1.0" @@ -23,6 +24,7 @@ "LicenseId": "", "Name": "Minimal", "Path": "%{PWD}/minimal", + "QDocModule": "qtest", "QtUsage": "Usage", "Version": "", "DownloadLocation": "" diff --git a/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json index 65b43fbf9..2dc53f852 100644 --- a/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json +++ b/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json @@ -2,6 +2,7 @@ "Id": "minimal", "Name": "Minimal", + "QDocModule": "qtest", "QtUsage": "Usage", "License": "License", "Copyright": "Copyright" diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error index 8c08de783..e18d2976b 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error +++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error @@ -1,5 +1,6 @@ File %{PWD}/qt_attribution.json: Missing mandatory property 'Name'. File %{PWD}/qt_attribution.json: Missing mandatory property 'Id'. +File %{PWD}/qt_attribution.json: Missing mandatory property 'QDocModule'. File %{PWD}/qt_attribution.json: Missing mandatory property 'QtUsage'. File %{PWD}/qt_attribution.json: Missing mandatory property 'License'. File %{PWD}/qt_attribution.json: Missing mandatory property 'Copyright'. diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json index afe702bc0..0ee9ba07f 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json +++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json @@ -9,6 +9,7 @@ "LicenseId": "", "Name": "", "Path": "%{PWD}", + "QDocModule": "", "QtUsage": "", "Version": "", "DownloadLocation": "" diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json index 38b3fe720..7ce485b82 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json +++ b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json @@ -9,6 +9,7 @@ "LicenseId": "", "Name": "Unknown", "Path": "%{PWD}", + "QDocModule": "qtest", "QtUsage": "Usage", "Version": "", "DownloadLocation": "" diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json index b2e56503b..f1d55638c 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json +++ b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json @@ -1,6 +1,7 @@ { "Id": "unknown", "Name": "Unknown", + "QDocModule": "qtest", "QtUsage": "Usage", "License": "License", |