Update license headers and add new license files

- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3
- Removed LICENSE.GPL

Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>

3 files changed, 45 insertions, 53 deletions

diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs4/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/parsejs4/expectedoutput.txt
index 4743949e6..62491a84b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs4/expectedoutput.txt
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs4/expectedoutput.txt
@@ -1,29 +1,29 @@
-.*/lupdate/testdata/good/parsejs4/main.js:45: qsTranslate\(\) requires at least two arguments.
-.*/lupdate/testdata/good/parsejs4/main.js:46: qsTranslate\(\) requires at least two arguments.
-.*/lupdate/testdata/good/parsejs4/main.js:47: qsTranslate\(\): both arguments must be literal strings.
-.*/lupdate/testdata/good/parsejs4/main.js:48: qsTranslate\(\): both arguments must be literal strings.
-.*/lupdate/testdata/good/parsejs4/main.js:49: qsTranslate\(\): both arguments must be literal strings.
-.*/lupdate/testdata/good/parsejs4/main.js:51: QT_TRANSLATE_NOOP\(\) requires at least two arguments.
-.*/lupdate/testdata/good/parsejs4/main.js:52: QT_TRANSLATE_NOOP\(\) requires at least two arguments.
-.*/lupdate/testdata/good/parsejs4/main.js:53: QT_TRANSLATE_NOOP\(\): both arguments must be literal strings.
-.*/lupdate/testdata/good/parsejs4/main.js:54: QT_TRANSLATE_NOOP\(\): both arguments must be literal strings.
-.*/lupdate/testdata/good/parsejs4/main.js:55: QT_TRANSLATE_NOOP\(\): both arguments must be literal strings.
-.*/lupdate/testdata/good/parsejs4/main.js:57: qsTr\(\) requires at least one argument.
-.*/lupdate/testdata/good/parsejs4/main.js:58: qsTr\(\): text to translate must be a literal string.
-.*/lupdate/testdata/good/parsejs4/main.js:60: QT_TR_NOOP\(\) requires at least one argument.
-.*/lupdate/testdata/good/parsejs4/main.js:61: QT_TR_NOOP\(\): text to translate must be a literal string.
-.*/lupdate/testdata/good/parsejs4/main.js:63: qsTrId\(\) requires at least one argument.
-.*/lupdate/testdata/good/parsejs4/main.js:64: qsTrId\(\): identifier must be a literal string.
-.*/lupdate/testdata/good/parsejs4/main.js:66: QT_TRID_NOOP\(\) requires at least one argument.
-.*/lupdate/testdata/good/parsejs4/main.js:67: QT_TRID_NOOP\(\): identifier must be a literal string.
-.*/lupdate/testdata/good/parsejs4/main.js:69: Unexpected character in meta string
-.*/lupdate/testdata/good/parsejs4/main.js:70: Unexpected character in meta string
-.*/lupdate/testdata/good/parsejs4/main.js:71: Unterminated meta string
-.*/lupdate/testdata/good/parsejs4/main.js:72: Unterminated meta string
-.*/lupdate/testdata/good/parsejs4/main.js:75: //% cannot be used with qsTranslate\(\). Ignoring
-.*/lupdate/testdata/good/parsejs4/main.js:77: //% cannot be used with QT_TRANSLATE_NOOP\(\). Ignoring
-.*/lupdate/testdata/good/parsejs4/main.js:79: //% cannot be used with qsTr\(\). Ignoring
-.*/lupdate/testdata/good/parsejs4/main.js:81: //% cannot be used with QT_TR_NOOP\(\). Ignoring
-.*/lupdate/testdata/good/parsejs4/main.js:84: Discarding unconsumed meta data
-.*/lupdate/testdata/good/parsejs4/main.js:86: Discarding unconsumed meta data
-.*/lupdate/testdata/good/parsejs4/main.js:88: Discarding unconsumed meta data
+.*/lupdate/testdata/good/parsejs4/main.js:37: qsTranslate\(\) requires at least two arguments.
+.*/lupdate/testdata/good/parsejs4/main.js:38: qsTranslate\(\) requires at least two arguments.
+.*/lupdate/testdata/good/parsejs4/main.js:39: qsTranslate\(\): both arguments must be literal strings.
+.*/lupdate/testdata/good/parsejs4/main.js:40: qsTranslate\(\): both arguments must be literal strings.
+.*/lupdate/testdata/good/parsejs4/main.js:41: qsTranslate\(\): both arguments must be literal strings.
+.*/lupdate/testdata/good/parsejs4/main.js:43: QT_TRANSLATE_NOOP\(\) requires at least two arguments.
+.*/lupdate/testdata/good/parsejs4/main.js:44: QT_TRANSLATE_NOOP\(\) requires at least two arguments.
+.*/lupdate/testdata/good/parsejs4/main.js:45: QT_TRANSLATE_NOOP\(\): both arguments must be literal strings.
+.*/lupdate/testdata/good/parsejs4/main.js:46: QT_TRANSLATE_NOOP\(\): both arguments must be literal strings.
+.*/lupdate/testdata/good/parsejs4/main.js:47: QT_TRANSLATE_NOOP\(\): both arguments must be literal strings.
+.*/lupdate/testdata/good/parsejs4/main.js:49: qsTr\(\) requires at least one argument.
+.*/lupdate/testdata/good/parsejs4/main.js:50: qsTr\(\): text to translate must be a literal string.
+.*/lupdate/testdata/good/parsejs4/main.js:52: QT_TR_NOOP\(\) requires at least one argument.
+.*/lupdate/testdata/good/parsejs4/main.js:53: QT_TR_NOOP\(\): text to translate must be a literal string.
+.*/lupdate/testdata/good/parsejs4/main.js:55: qsTrId\(\) requires at least one argument.
+.*/lupdate/testdata/good/parsejs4/main.js:56: qsTrId\(\): identifier must be a literal string.
+.*/lupdate/testdata/good/parsejs4/main.js:58: QT_TRID_NOOP\(\) requires at least one argument.
+.*/lupdate/testdata/good/parsejs4/main.js:59: QT_TRID_NOOP\(\): identifier must be a literal string.
+.*/lupdate/testdata/good/parsejs4/main.js:61: Unexpected character in meta string
+.*/lupdate/testdata/good/parsejs4/main.js:62: Unexpected character in meta string
+.*/lupdate/testdata/good/parsejs4/main.js:63: Unterminated meta string
+.*/lupdate/testdata/good/parsejs4/main.js:64: Unterminated meta string
+.*/lupdate/testdata/good/parsejs4/main.js:67: //% cannot be used with qsTranslate\(\). Ignoring
+.*/lupdate/testdata/good/parsejs4/main.js:69: //% cannot be used with QT_TRANSLATE_NOOP\(\). Ignoring
+.*/lupdate/testdata/good/parsejs4/main.js:71: //% cannot be used with qsTr\(\). Ignoring
+.*/lupdate/testdata/good/parsejs4/main.js:73: //% cannot be used with QT_TR_NOOP\(\). Ignoring
+.*/lupdate/testdata/good/parsejs4/main.js:76: Discarding unconsumed meta data
+.*/lupdate/testdata/good/parsejs4/main.js:78: Discarding unconsumed meta data
+.*/lupdate/testdata/good/parsejs4/main.js:80: Discarding unconsumed meta data
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs4/main.js b/tests/auto/linguist/lupdate/testdata/good/parsejs4/main.js
index 2b382d602..fa21f2328 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs4/main.js
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs4/main.js
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the test suite of the Qt Toolkit.
+** This file is part of the Qt Linguist of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.ts.result
index c0546571c..329953d89 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.ts.result
@@ -4,12 +4,12 @@
 <context>
     <name>FooContext</name>
     <message>
-        <location filename="main.js" line="75"/>
+        <location filename="main.js" line="67"/>
         <source>Hello</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.js" line="77"/>
+        <location filename="main.js" line="69"/>
         <source>World</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17,12 +17,12 @@
 <context>
     <name>main</name>
     <message>
-        <location filename="main.js" line="79"/>
+        <location filename="main.js" line="71"/>
         <source>Hello</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.js" line="81"/>
+        <location filename="main.js" line="73"/>
         <source>World</source>
         <translation type="unfinished"></translation>
     </message>