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>

2 files changed, 24 insertions, 34 deletions

diff --git a/src/linguist/lrelease/lrelease.1 b/src/linguist/lrelease/lrelease.1
index ec4bd76d7..a82531ef5 100644
--- a/src/linguist/lrelease/lrelease.1
+++ b/src/linguist/lrelease/lrelease.1
@@ -1,31 +1,26 @@
 .TH lrelease 1 "18 October 2001" "Digia Plc and/or its subsidiary(-ies)" \" -*- nroff -*-
 .\"
-.\" Copyright (C) 2015 The Qt Company Ltd.
-.\" Contact: http://www.qt.io/licensing/
+.\" Copyright (C) 2016 The Qt Company Ltd.
+.\" Contact: https://www.qt.io/licensing/
 .\"
 .\" This file is part of the QtGui module of the Qt Toolkit.
 .\"
-.\" $QT_BEGIN_LICENSE:LGPL21$
+.\" $QT_BEGIN_LICENSE:GPL-EXCEPT$
 .\" 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 The Qt Company. For licensing terms
-.\" and conditions see http://www.qt.io/terms-conditions. For further
-.\" information use the contact form at http://www.qt.io/contact-us.
+.\" and conditions see https://www.qt.io/terms-conditions. For further
+.\" information use the contact form at https://www.qt.io/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.
-.\"
-.\" As a special exception, The Qt Company gives you certain additional
-.\" rights. These rights are described in The Qt Company 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 as published by the Free Software
+.\" Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+.\" included in the packaging of this file. Please review the following
+.\" information to ensure the GNU General Public License requirements will
+.\" be met: https://www.gnu.org/licenses/gpl-3.0.html.
 .\"
 .\" $QT_END_LICENSE$
 .\"
diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp
index c8b91fcfd..6f635ca68 100644
--- a/src/linguist/lrelease/main.cpp
+++ b/src/linguist/lrelease/main.cpp
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Linguist of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ** 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 The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/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.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company 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 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **