summaryrefslogtreecommitdiffstats
path: root/util/qlalr/cppgenerator.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-31 09:49:31 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-31 09:49:31 (GMT)
commit309db73299db55a631f4aa2c44e0073c16c865a7 (patch)
tree31896cb730d781176dded02480c7e552328e5443 /util/qlalr/cppgenerator.cpp
parent624ea78d71dca5112272597f9f1ee165c2275c5c (diff)
downloadQt-309db73299db55a631f4aa2c44e0073c16c865a7.zip
Qt-309db73299db55a631f4aa2c44e0073c16c865a7.tar.gz
Qt-309db73299db55a631f4aa2c44e0073c16c865a7.tar.bz2
Update tech preview license header.
Reviewed-by: Trust Me
Diffstat (limited to 'util/qlalr/cppgenerator.cpp')
-rw-r--r--util/qlalr/cppgenerator.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index 222aaa4..671b4ab 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -9,8 +9,8 @@
** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** 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
@@ -21,20 +21,20 @@
** 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 version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** additional 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.
+**
+**
+**
+**
+**
+**
+**
**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -59,8 +59,8 @@ QString CppGenerator::copyrightHeader() const
"** 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 either Technology Preview License Agreement or the\n"
- "** Beta Release License Agreement.\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"
@@ -71,20 +71,20 @@ QString CppGenerator::copyrightHeader() const
"** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n"
"**\n"
"** In addition, as a special exception, Nokia gives you certain\n"
- "** additional rights. These rights are described in the Nokia Qt LGPL\n"
- "** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this\n"
+ "** additional rights. These rights are described in the Nokia Qt LGPL\n"
+ "** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this\n"
"** 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"
+ "** 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"
- "** If you are unsure which license is appropriate for your use, please\n"
- "** contact the sales department at http://qt.nokia.com/contact.\n"
"** $QT_END_LICENSE$\n"
"**\n"
"****************************************************************************/\n"