diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:06 +0200 |
| commit | 4c57631f3093cd6817a13d3ba780c9411b9c679e (patch) | |
| tree | e4dfdbd99dc035ef442f74651245687885cc5c80 /tests | |
| parent | 26027a9b13491a4851c42e12d06af87f7e864a51 (diff) | |
| parent | 577e6b2c2a7a0f241874ac6668a8661814f0d4a4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I91242ffea8752c3006c2aa28ac953ce74f4b6750
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error | 2 |
1 files changed, 0 insertions, 2 deletions
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'. |