summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-11-21 15:44:43 +0100
committerKai Koehne <kai.koehne@qt.io>2016-11-28 13:45:22 +0000
commitc3b5247161eff3b521381a9ada14b180e330a037 (patch)
tree4411a75b2d11b6b8569a199c4eacc339a7701968 /tests
parent1ba2796c6b32e33824230fe85300f4ee4d615ab5 (diff)
downloadqttools-c3b5247161eff3b521381a9ada14b180e330a037.tar.gz
qtattributionscanner: Support optional QtParts property
We'd like to differentiate between code that ends up in the Qt libraries or plugins, or code that only is added to examples, tests, or (host) tools. This can now be specified with the JSON property 'QtParts'. If 'QtParts' does not contain 'libs', the page will not show up in the list of attributions generated by module with e.g. \generatelist{groupsbymodule attributions-qtcore} nor in the global list generated by \generatelist annotatedattributions Instead, third party code in examples or tests can now be documented separately using e.g. \generatelist{groupsbymodule attributions-examples} and \annotatedlist attributions-examples Change-Id: Iba72f76b63e4435af54a61b7b4a2cf4617746ba6 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json1
-rw-r--r--tests/auto/qtattributionsscanner/testdata/good/expected.json4
-rw-r--r--tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json1
-rw-r--r--tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json1
4 files changed, 7 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 eaebdb9ef..f8e7b1c68 100644
--- a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json
+++ b/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json
@@ -2,6 +2,7 @@
"Id": "complete",
"Name": "Complete",
"QDocModule": "qtest",
+ "QtParts": ["examples"],
"License": "License",
"Copyright": "Copyright",
diff --git a/tests/auto/qtattributionsscanner/testdata/good/expected.json b/tests/auto/qtattributionsscanner/testdata/good/expected.json
index 2a076d650..2914dcc4b 100644
--- a/tests/auto/qtattributionsscanner/testdata/good/expected.json
+++ b/tests/auto/qtattributionsscanner/testdata/good/expected.json
@@ -11,6 +11,7 @@
"Path": "%{PWD}/complete",
"Files": "",
"QDocModule": "qtest",
+ "QtParts": [ "examples" ],
"QtUsage": "Multi\nLine\nUsage",
"Version": "1.0",
"DownloadLocation": "www.qt.io/1.0"
@@ -27,6 +28,9 @@
"Path": "%{PWD}/minimal",
"Files": "",
"QDocModule": "qtest",
+ "QtParts": [
+ "libs"
+ ],
"QtUsage": "Usage",
"Version": "",
"DownloadLocation": ""
diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json
index 5ddb2d32d..a28547bfe 100644
--- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json
+++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json
@@ -11,6 +11,7 @@
"Path": "%{PWD}",
"Files": "",
"QDocModule": "",
+ "QtParts": [ "libs" ],
"QtUsage": "",
"Version": "",
"DownloadLocation": ""
diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json
index da2febe18..151af4093 100644
--- a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json
+++ b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json
@@ -11,6 +11,7 @@
"Path": "%{PWD}",
"Files": "",
"QDocModule": "qtest",
+ "QtParts": [ "libs" ],
"QtUsage": "Usage",
"Version": "",
"DownloadLocation": ""