diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-24 10:52:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-24 11:55:36 +0200 |
| commit | 4399a1683a016794e22ecdd03eafca07b93af4e2 (patch) | |
| tree | d1a4da3ad9a57d60da2c7c71ae03a13701c67f16 /tests/auto/qtattributionsscanner | |
| parent | d91ecc26252f42641a23e25f6a6a18495e0e7700 (diff) | |
| parent | 97075ce49ee73609330804b8bbbc12fabbb30766 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/qdoc/qmlmarkupvisitor.h
src/qdoc/qmlvisitor.h
tests/auto/qtattributionsscanner/testdata/good/expected.json
Done-With: Kai Koehne <kai.koehne@qt.io>
Change-Id: I180ee214d1e5999fc1279b092bd9214b6bf8f858
Diffstat (limited to 'tests/auto/qtattributionsscanner')
5 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json b/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json index f8e7b1c68..8035cefab 100644 --- a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json +++ b/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json @@ -17,5 +17,6 @@ Usage", "Version": "1.0", "DownloadLocation": "www.qt.io/1.0", "LicenseId": "xxx", - "LicenseFile": "LICENSE" + "LicenseFile": "LICENSE", + "PackageComment": "just a test package" } diff --git a/tests/auto/qtattributionsscanner/testdata/good/expected.json b/tests/auto/qtattributionsscanner/testdata/good/expected.json index f4ad1b360..1f54c13e6 100644 --- a/tests/auto/qtattributionsscanner/testdata/good/expected.json +++ b/tests/auto/qtattributionsscanner/testdata/good/expected.json @@ -10,6 +10,7 @@ "LicenseFile": "", "LicenseId": "", "Name": "Test", + "PackageComment":"", "Path": "%{PWD}/chromium", "QDocModule": "qtwebengine", "QtParts": [ @@ -27,6 +28,7 @@ "LicenseFile": "%{PWD}/complete/LICENSE", "LicenseId": "xxx", "Name": "Complete", + "PackageComment":"just a test package", "Path": "%{PWD}/complete", "Files": "", "QDocModule": "qtest", @@ -44,6 +46,7 @@ "LicenseFile": "", "LicenseId": "", "Name": "Minimal", + "PackageComment":"", "Path": "%{PWD}/minimal", "Files": "", "QDocModule": "qtest", diff --git a/tests/auto/qtattributionsscanner/testdata/good/minimal/expected.json b/tests/auto/qtattributionsscanner/testdata/good/minimal/expected.json index 6a75269c0..8d9a5a31f 100644 --- a/tests/auto/qtattributionsscanner/testdata/good/minimal/expected.json +++ b/tests/auto/qtattributionsscanner/testdata/good/minimal/expected.json @@ -8,6 +8,7 @@ "LicenseFile": "", "LicenseId": "", "Name": "Minimal", + "PackageComment": "", "Path": "%{PWD}", "Files": "", "QDocModule": "qtest", diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json index a28547bfe..fa56f2976 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json +++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json @@ -8,6 +8,7 @@ "LicenseFile": "", "LicenseId": "", "Name": "", + "PackageComment": "", "Path": "%{PWD}", "Files": "", "QDocModule": "", diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json index 151af4093..18c1055f2 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json +++ b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json @@ -8,6 +8,7 @@ "LicenseFile": "", "LicenseId": "", "Name": "Unknown", + "PackageComment": "", "Path": "%{PWD}", "Files": "", "QDocModule": "qtest", |