diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-07-07 16:21:09 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-08 07:59:00 +0200 |
| commit | a925bb4a9e5abe8a4738886f57447281b3f0e2e3 (patch) | |
| tree | fb3553e9ea93270e8cc0918c8eeb2e990f047b2c /src/multimediakit | |
| parent | 150f95a0d7c40046cd315356aa4b395dd3a94f8b (diff) | |
Update licenseheader text in source files for qtmultimediakit Qt module
Replace old license header with correct one.
Change-Id: Ibff8fbea6595bb80f1122d55db2194accd319308
Reviewed-on: http://codereview.qt.nokia.com/1318
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
Diffstat (limited to 'src/multimediakit')
| -rw-r--r-- | src/multimediakit/qaudionamespace.qdoc | 20 | ||||
| -rw-r--r-- | src/multimediakit/qtmedianamespace.qdoc | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/multimediakit/qaudionamespace.qdoc b/src/multimediakit/qaudionamespace.qdoc index 32ceb5c6c..a369e970c 100644 --- a/src/multimediakit/qaudionamespace.qdoc +++ b/src/multimediakit/qaudionamespace.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/src/multimediakit/qtmedianamespace.qdoc b/src/multimediakit/qtmedianamespace.qdoc index a5a642ff0..dd6a1e44b 100644 --- a/src/multimediakit/qtmedianamespace.qdoc +++ b/src/multimediakit/qtmedianamespace.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$ ** ****************************************************************************/ |