diff options
| author | Antti Kokko <antti.kokko@theqtcompany.com> | 2016-01-21 13:34:27 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-06-10 14:45:50 +0000 |
| commit | 22ca635dce01f2a89006730b6a80e15ce54b0b3a (patch) | |
| tree | 328f4a06314be097a88b30da4db773e992e229c3 /tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result | |
| parent | d14b96ee6c5990c9d5c98bd1af4e1051dec1d5a9 (diff) | |
Updated license headers and license tests
From Qt 5.7 -> tools & applications are licensed under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one
(in those files which will be under GPL 3 with exceptions)
License header tests also updated to match current headers.
Change-Id: Ia6bdacaa3c5bbc9d31334e1a0cabfe502a484dc4
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result index 4849bf4bd..f10f9cced 100644 --- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result @@ -4,9 +4,9 @@ <context> <name></name> <message id="lollipop"> + <location filename="main.cpp" line="38"/> <location filename="main.cpp" line="43"/> - <location filename="main.cpp" line="48"/> - <location filename="main.cpp" line="67"/> + <location filename="main.cpp" line="62"/> <source>this is the source text</source> <extracomment>commented ---------- @@ -18,7 +18,7 @@ even more commented</extracomment> <context> <name>QObject</name> <message> - <location filename="main.cpp" line="59"/> + <location filename="main.cpp" line="54"/> <source>another message</source> <comment>here with a lot of noise in the comment so it is long enough</comment> <translation type="unfinished"></translation> @@ -28,9 +28,9 @@ even more commented</extracomment> <context> <name>context</name> <message> + <location filename="finddialog.cpp" line="29"/> <location filename="finddialog.cpp" line="34"/> - <location filename="finddialog.cpp" line="39"/> - <location filename="main.cpp" line="38"/> + <location filename="main.cpp" line="33"/> <source>just a message</source> <extracomment>This is one comment ---------- |