diff options
Diffstat (limited to 'src/tools/gen-cpp-ast/generate-ast.cpp')
| -rw-r--r-- | src/tools/gen-cpp-ast/generate-ast.cpp | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/src/tools/gen-cpp-ast/generate-ast.cpp b/src/tools/gen-cpp-ast/generate-ast.cpp index af98290725..c59bda9a2c 100644 --- a/src/tools/gen-cpp-ast/generate-ast.cpp +++ b/src/tools/gen-cpp-ast/generate-ast.cpp @@ -4,28 +4,27 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** 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. ** +** 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. +** ** If you have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. ** @@ -66,27 +65,26 @@ static const char copyrightHeader[] = "**\n" "** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).\n" "**\n" -"** Contact: Nokia Corporation (qt-info@nokia.com)\n" +"** Contact: Nokia Corporation (info@qt.nokia.com)\n" "**\n" -"** No Commercial Usage\n" -"**\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" "**\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 file.\n" +"** Please review the following information to ensure the GNU Lesser General\n" +"** 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" -"** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\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. +** +** 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.\n" "**\n" "** If you have questions regarding the use of this file, please contact\n" "** Nokia at qt-info@nokia.com.\n" |