License headers, part 2

This commit is contained in:
con
2010-12-17 17:14:20 +01:00
parent 73b813fd16
commit 23c22b7c66
230 changed files with 2530 additions and 1610 deletions

View File

@@ -68,12 +68,12 @@ static const char copyrightHeader[] =
"**\n"
"** Contact: Nokia Corporation (qt-info@nokia.com)\n"
"**\n"
"** Commercial Usage\n"
"** No 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"
"** 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"
@@ -84,8 +84,12 @@ static const char copyrightHeader[] =
"** 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"
"** If you are unsure which license is appropriate for your use, please\n"
"** contact the sales department at http://qt.nokia.com/contact.\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"
"**\n"
"**************************************************************************/\n"
;