summaryrefslogtreecommitdiffstats
path: root/util/qlalr/cppgenerator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'util/qlalr/cppgenerator.cpp')
-rw-r--r--util/qlalr/cppgenerator.cpp85
1 files changed, 42 insertions, 43 deletions
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index 520b44f0b3..4b31699293 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -49,47 +49,46 @@
QString CppGenerator::trollCopyrightHeader() const
{
return QLatin1String(
-
-"/****************************************************************************\n"
-"**\n"
-"** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
-"** Contact: Nokia Corporation (qt-info@nokia.com)\n"
-"**\n"
-"** 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 either Technology Preview License Agreement or the\n"
-"** Beta Release License Agreement.\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"
-"**\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"
-"** 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 are unsure which license is appropriate for your use, please\n"
-"** contact the sales department at http://www.qtsoftware.com/contact.\n"
-"** $QT_END_LICENSE$\n"
-"**\n"
-"****************************************************************************/\n"
+ "/****************************************************************************\n"
+ "**\n"
+ "** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
+ "** Contact: Nokia Corporation (qt-info@nokia.com)\n"
+ "**\n"
+ "** 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 either Technology Preview License Agreement or the\n"
+ "** Beta Release License Agreement.\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"
+ "**\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"
+ "** 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 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"
"\n");
}