diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-24 12:34:08 +0300 |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-24 12:34:08 +0300 |
| commit | f9f395c28b8ce66c0605607ea76ad1099d45a6c9 (patch) | |
| tree | 1d34c2179af5395247b3926ce4d6ea474ae99265 /header.LGPL | |
| parent | 60ab28f2995b166375979f53486e4f5335e7c83e (diff) | |
| download | qtbase-f9f395c28b8ce66c0605607ea76ad1099d45a6c9.tar.gz qtbase-f9f395c28b8ce66c0605607ea76ad1099d45a6c9.tar.bz2 qtbase-f9f395c28b8ce66c0605607ea76ad1099d45a6c9.zip | |
Update licenseheader text in source files for qtbase Qt module
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
Diffstat (limited to 'header.LGPL')
| -rw-r--r-- | header.LGPL | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/header.LGPL b/header.LGPL index efd73e428b..977ccaaa38 100644 --- a/header.LGPL +++ b/header.LGPL @@ -7,29 +7,29 @@ ** This file is part of the FOO module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** 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. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** +** 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. +** +** 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. ** ** ** |