Change to commercial license headers in preparation for release.

Reviewed-by: Trust Me

1 files changed, 26 insertions, 26 deletions

diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index 45de51c..1c7ea35 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -7,11 +7,11 @@
 ** 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.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
 ** rights.  These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -58,11 +58,11 @@ QString CppGenerator::copyrightHeader() const
     "** 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"
+    "** Commercial Usage\n"
+    "** Licensees holding valid Qt Commercial licenses may use this file in\n"
+    "** accordance with the Qt Commercial License Agreement provided with the\n"
+    "** Software or, alternatively, in accordance with the terms contained in\n"
+    "** a written agreement between you and Nokia.\n"
     "**\n"
     "** GNU Lesser General Public License Usage\n"
     "** Alternatively, this file may be used under the terms of the GNU Lesser\n"
@@ -76,16 +76,16 @@ QString CppGenerator::copyrightHeader() const
     "** 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"
+    "** 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"
     "** If you have questions regarding the use of this file, please contact\n"
     "** Nokia at qt-info@nokia.com.\n"
-    "**\n"
-    "**\n"
-    "**\n"
-    "**\n"
-    "**\n"
-    "**\n"
-    "**\n"
-    "**\n"
     "** $QT_END_LICENSE$\n"
     "**\n"
     "****************************************************************************/\n"