2 files changed, 33 insertions, 57 deletions
diff --git a/util/unicode/codecs/big5/main.cpp b/util/unicode/codecs/big5/main.cpp
index e0887f9317..1c52858772 100644
--- a/util/unicode/codecs/big5/main.cpp
+++ b/util/unicode/codecs/big5/main.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 utils 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/util/unicode/main.cpp b/util/unicode/main.cpp
index 0747238b8e..2ad9458eeb 100644
--- a/util/unicode/main.cpp
+++ b/util/unicode/main.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 utils 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$
 **
 ****************************************************************************/
@@ -2926,41 +2918,33 @@ int main(int, char **)
     QByteArray header =
         "/****************************************************************************\n"
         "**\n"
-        "** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).\n"
+        "** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).\n"
         "** Contact: http://www.qt-project.org/legal\n"
         "**\n"
         "** This file is part of the QtCore module of the Qt Toolkit.\n"
         "**\n"
-        "** $QT_BEGIN_LICENSE:LGPL$\n"
+        "** $QT_BEGIN_LICENSE:LGPL21$\n"
         "** Commercial License Usage\n"
         "** Licensees holding valid commercial Qt licenses may use this file in\n"
         "** accordance with the commercial license agreement provided with the\n"
         "** Software or, alternatively, in accordance with the terms contained in\n"
-        "** a written agreement between you and Digia.  For licensing terms and\n"
-        "** conditions see http://qt.digia.com/licensing.  For further information\n"
+        "** a written agreement between you and Digia. For licensing terms and\n"
+        "** conditions see http://qt.digia.com/licensing. For further information\n"
         "** use the contact form at http://qt.digia.com/contact-us.\n"
         "**\n"
         "** GNU Lesser General Public License Usage\n"
         "** Alternatively, this file may be used under the terms of the GNU Lesser\n"
-        "** General Public License version 2.1 as published by the Free Software\n"
-        "** Foundation and appearing in the file LICENSE.LGPL included in the\n"
-        "** packaging of this file.  Please review the following information to\n"
-        "** ensure the GNU Lesser General Public License version 2.1 requirements\n"
-        "** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n"
+        "** General Public License version 2.1 or version 3 as published by the Free\n"
+        "** Software Foundation and appearing in the file LICENSE.LGPLv21 and\n"
+        "** LICENSE.LGPLv3 included in the packaging of this file. Please review the\n"
+        "** following information to ensure the GNU Lesser General Public License\n"
+        "** requirements will be met: https://www.gnu.org/licenses/lgpl.html and\n"
+        "** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n"
         "**\n"
         "** In addition, as a special exception, Digia gives you certain additional\n"
-        "** rights.  These rights are described in the Digia Qt LGPL Exception\n"
+        "** rights. These rights are described in the Digia Qt LGPL Exception\n"
         "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n"
         "**\n"
-        "** GNU General Public License Usage\n"
-        "** Alternatively, this file may be used under the terms of the GNU\n"
-        "** General Public License version 3.0 as published by the Free Software\n"
-        "** Foundation and appearing in the file LICENSE.GPL included in the\n"
-        "** packaging of this file.  Please review the following information to\n"
-        "** ensure the GNU General Public License version 3.0 requirements will be\n"
-        "** met: http://www.gnu.org/copyleft/gpl.html.\n"
-        "**\n"
-        "**\n"
         "** $QT_END_LICENSE$\n"
         "**\n"
         "****************************************************************************/\n\n";