Update license headers and add new license files

- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3
- Removed LICENSE.GPL
- Added test reference file header.LGPL21

Change-Id: Ie950b82ff5eebc17cd7f3ce3cbc218d3862a4512
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>

9 files changed, 132 insertions, 212 deletions

diff --git a/scripts/t/license-testdata/bad/multiple-header-one-wrong.s b/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
index 2a6bf17a..228ed584 100644
--- a/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
+++ b/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
@@ -1,40 +1,32 @@
 ;/****************************************************************************
 ;**
-;** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-;** Contact: http://www.qt-project.org/legal
+;** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+;** Contact: Nokia Corporation (qt-info@nokia.com)
 ;**
 ;** This file is part of the (whatever) 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$
 ;**
 ;****************************************************************************/
@@ -48,36 +40,28 @@
 ;**
 ;** This file is part of the (whatever) 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 Llama Goat Porpoise Lemon 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$
 ;**
 ;****************************************************************************/
@@ -88,41 +72,33 @@
 
 ;/****************************************************************************
 ;**
-;** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-;** Contact: http://www.qt-project.org/legal
+;** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+;** Contact: Nokia Corporation (qt-info@nokia.com)
 ;**
 ;** This file is part of the (whatever) 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/scripts/t/license-testdata/bad/old-contact-info.cpp b/scripts/t/license-testdata/bad/old-contact-info.cpp
index 8bd03b7f..c8376403 100644
--- a/scripts/t/license-testdata/bad/old-contact-info.cpp
+++ b/scripts/t/license-testdata/bad/old-contact-info.cpp
@@ -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: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the (whatever) 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/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
index c13be966..51e99a5a 100644
--- a/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
+++ b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
@@ -1,39 +1,31 @@
 ############################################################################
 ##
-## 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 (whatever) 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.
-##
 ## Other usage
 ## $QT_END_LICENSE$
 ##
diff --git a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
index de0d2f2b..4e999c1a 100644
--- a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
+++ b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
@@ -6,36 +6,28 @@
 --
 -- This file is part of the (whatever) 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/scripts/t/license-testdata/good/multiple-headers.cpp b/scripts/t/license-testdata/good/multiple-headers.cpp
index 7f7252f3..3ba983d6 100644
--- a/scripts/t/license-testdata/good/multiple-headers.cpp
+++ b/scripts/t/license-testdata/good/multiple-headers.cpp
@@ -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 (whatever) 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/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp b/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp
index 9dbe332e..c2625a52 100644
--- a/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp
+++ b/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp
@@ -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 (whatever) 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/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp b/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
index 9dbe332e..c2625a52 100644
--- a/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
+++ b/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
@@ -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 (whatever) 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/scripts/t/license-testdata/reference/header.LGPL b/scripts/t/license-testdata/reference/header.LGPL
deleted file mode 100644
index 667a2f04..00000000
--- a/scripts/t/license-testdata/reference/header.LGPL
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the FOO module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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
-** 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.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** 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/scripts/t/license-testdata/reference/header.LGPL21 b/scripts/t/license-testdata/reference/header.LGPL21
new file mode 100644
index 00000000..3148af4c
--- /dev/null
+++ b/scripts/t/license-testdata/reference/header.LGPL21
@@ -0,0 +1,33 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the FOO module of the Qt Toolkit.
+**
+** $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
+** 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 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
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+