summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-07-25 13:51:42 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-07-25 13:51:42 +0200
commit923dda6dd28cacbbe92e2649f336b68043133523 (patch)
tree010ed61f2ea0760924847b73d7ec74847560f8e3 /tests
parent8c6674fa84f5d8dcf2cabfac6b6182e92e0a9319 (diff)
parented6d2d42973b62271fd8de54db39ea8cf63e3d01 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error1
1 files changed, 0 insertions, 1 deletions
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'.