diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-13 14:24:24 (GMT) |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-13 14:24:24 (GMT) |
| commit | 1eea52e5b18ef2167d375285e3838bd7883cfd7d (patch) | |
| tree | 5411eba050dd15d038da558e6ffe8ece44329a48 /src/gui/text/qtextobject_p.h | |
| parent | 50ea2454c0ad9b28be6dd5125c74466f0f96d16a (diff) | |
| download | Qt-1eea52e5b18ef2167d375285e3838bd7883cfd7d.zip Qt-1eea52e5b18ef2167d375285e3838bd7883cfd7d.tar.gz Qt-1eea52e5b18ef2167d375285e3838bd7883cfd7d.tar.bz2 | |
Update licenseheader text in source files for qt4.8
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
Diffstat (limited to 'src/gui/text/qtextobject_p.h')
| -rw-r--r-- | src/gui/text/qtextobject_p.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/gui/text/qtextobject_p.h b/src/gui/text/qtextobject_p.h index 7db85b6..798b9d1 100644 --- a/src/gui/text/qtextobject_p.h +++ b/src/gui/text/qtextobject_p.h @@ -7,29 +7,29 @@ ** This file is part of the QtGui 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. ** ** ** |