summaryrefslogtreecommitdiffstats
path: root/util/qlalr/cppgenerator.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-09-09 04:29:13 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-09-09 04:29:13 (GMT)
commit04e3b306115b1a4631032e3ce5b79cc78145365b (patch)
treec7bf7f282d4dcfe11fbdd0a7c5de686d2c4f36ab /util/qlalr/cppgenerator.cpp
parent9fc309a822490ba93c4c7a1fa1221b288e145a3d (diff)
downloadQt-04e3b306115b1a4631032e3ce5b79cc78145365b.zip
Qt-04e3b306115b1a4631032e3ce5b79cc78145365b.tar.gz
Qt-04e3b306115b1a4631032e3ce5b79cc78145365b.tar.bz2
Update license headers again.
Reviewed-by: Trust Me
Diffstat (limited to 'util/qlalr/cppgenerator.cpp')
-rw-r--r--util/qlalr/cppgenerator.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index c1fa37a..710500e 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QLALR project on Qt Labs.
@@ -20,10 +21,9 @@
** 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 version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain 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.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
@@ -71,10 +71,9 @@ QString CppGenerator::trollCopyrightHeader() const
"** 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"
"**\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.1, included in the file LGPL_EXCEPTION.txt in this\n"
- "** package.\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"
+ "** 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"