1 files changed, 34 insertions, 34 deletions
diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp
index 0cfcec2..8f318c6 100644
--- a/util/unicode/main.cpp
+++ b/util/unicode/main.cpp
@@ -7,29 +7,29 @@
 ** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
 ** 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.
+** 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, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
+** 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
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
 **
 **
 **
@@ -2605,29 +2605,29 @@ int main(int, char **)
         "** This file is part of the QtCore module of the Qt Toolkit.\n"
         "**\n"
         "** $QT_BEGIN_LICENSE:LGPL$\n"
-        "** No Commercial Usage\n"
-        "** This file contains pre-release code and may not be distributed.\n"
-        "** You may use this file in accordance with the terms and conditions\n"
-        "** contained in the Technology Preview License Agreement accompanying\n"
-        "** this package.\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"
+        "** This file may be used under the terms of the GNU Lesser General Public\n"
+        "** License version 2.1 as published by the Free Software Foundation and\n"
+        "** appearing in the file LICENSE.LGPL included in the packaging of this\n"
+        "** file. Please review the following information to ensure the GNU Lesser\n"
+        "** General Public License version 2.1 requirements will be met:\n"
+        "** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n"
         "**\n"
         "** In addition, as a special exception, Nokia gives you certain additional\n"
-        "** rights.  These rights are described in the Nokia Qt LGPL Exception\n"
+        "** rights. These rights are described in the Nokia Qt LGPL Exception\n"
         "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n"
         "**\n"
-        "** If you have questions regarding the use of this file, please contact\n"
-        "** Nokia at qt-info@nokia.com.\n"
-        "**\n"
-        "**\n"
+        "** GNU General Public License Usage\n"
+        "** Alternatively, this file may be used under the terms of the GNU General\n"
+        "** Public License version 3.0 as published by the Free Software Foundation\n"
+        "** and appearing in the file LICENSE.GPL included in the packaging of this\n"
+        "** file. Please review the following information to ensure the GNU General\n"
+        "** Public License version 3.0 requirements will be met:\n"
+        "** http://www.gnu.org/copyleft/gpl.html.\n"
         "**\n"
+        "** Other Usage\n"
+        "** Alternatively, this file may be used in accordance with the terms and\n"
+        "** conditions contained in a signed written agreement between you and Nokia.\n"
         "**\n"
         "**\n"
         "**\n"