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/proparsing/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/proparsing/project.ts.result')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result index afe1b0b5f..fb9cc7719 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result @@ -4,49 +4,49 @@ <context> <name>QApplication</name> <message> - <location filename="main.cpp" line="39"/> + <location filename="main.cpp" line="34"/> <source>Hello world</source> <comment>Platform-independent file</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="main_mac.cpp" line="39"/> + <location filename="main_mac.cpp" line="34"/> <source>Hello macworld</source> <comment>mac-only file</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="main_unix.cpp" line="39"/> + <location filename="main_unix.cpp" line="34"/> <source>Hello unixworld</source> <comment>unix-only file</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="main_win.cpp" line="39"/> + <location filename="main_win.cpp" line="34"/> <source>Hello windowsworld</source> <comment>Windows-only file</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="wildcard/main1.cpp" line="39"/> + <location filename="wildcard/main1.cpp" line="34"/> <source>Hello world</source> <comment>wildcard/main1.cpp</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="wildcard/mainfile.cpp" line="39"/> + <location filename="wildcard/mainfile.cpp" line="34"/> <source>Hello world</source> <comment>wildcard/main2.cpp</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="wildcard1.cpp" line="39"/> + <location filename="wildcard1.cpp" line="34"/> <source>Hello world</source> <comment>wildcard1.cpp</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="wildcard99.cpp" line="39"/> + <location filename="wildcard99.cpp" line="34"/> <source>Hello world</source> <comment>wildcard99.cpp</comment> <translation type="unfinished"></translation> @@ -55,7 +55,7 @@ <context> <name>QCoreApplication</name> <message> - <location filename="vpaths/dependpath/main_dependpath.cpp" line="40"/> + <location filename="vpaths/dependpath/main_dependpath.cpp" line="35"/> <source>Hello from a VPATH</source> <comment>See if the VPATH thing works</comment> <translation type="unfinished"></translation> @@ -64,7 +64,7 @@ <context> <name>main</name> <message> - <location filename="main.qml" line="38"/> + <location filename="main.qml" line="33"/> <source>From QML file in root</source> <translation type="unfinished"></translation> </message> @@ -72,7 +72,7 @@ <context> <name>notmain</name> <message> - <location filename="qml/notmain.qml" line="38"/> + <location filename="qml/notmain.qml" line="33"/> <source>From QML file in qml</source> <translation type="unfinished"></translation> </message> |