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 /doc/src/files-and-resources | |
| 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 'doc/src/files-and-resources')
| -rw-r--r-- | doc/src/files-and-resources/datastreamformat.qdoc | 20 | ||||
| -rw-r--r-- | doc/src/files-and-resources/resources.qdoc | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/doc/src/files-and-resources/datastreamformat.qdoc b/doc/src/files-and-resources/datastreamformat.qdoc index 086c74e..6fe888b 100644 --- a/doc/src/files-and-resources/datastreamformat.qdoc +++ b/doc/src/files-and-resources/datastreamformat.qdoc @@ -7,20 +7,20 @@ ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. +** Foundation and appearing in the file included in the packaging of +** this file. +** +** 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. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/src/files-and-resources/resources.qdoc b/doc/src/files-and-resources/resources.qdoc index 35e6a90..d6e320b 100644 --- a/doc/src/files-and-resources/resources.qdoc +++ b/doc/src/files-and-resources/resources.qdoc @@ -7,20 +7,20 @@ ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. +** Foundation and appearing in the file included in the packaging of +** this file. +** +** 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. ** $QT_END_LICENSE$ ** ****************************************************************************/ |