diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-04 12:39:56 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-04 12:39:56 (GMT) |
| commit | 8c054ec17ac04bf56052e0c163afe7922bf2a361 (patch) | |
| tree | e90f7b79dbbebb5930544530b5dcc2c661d533fb /doc/src/qt4-intro.qdoc | |
| parent | 95f52ed1f9a1b3049e6862cb466754931c1d760d (diff) | |
| download | Qt-8c054ec17ac04bf56052e0c163afe7922bf2a361.zip Qt-8c054ec17ac04bf56052e0c163afe7922bf2a361.tar.gz Qt-8c054ec17ac04bf56052e0c163afe7922bf2a361.tar.bz2 | |
Doc: Fixed the in-repository licenses for the documentation.
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
Diffstat (limited to 'doc/src/qt4-intro.qdoc')
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 919bb88..7d55f82 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -7,11 +7,11 @@ ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in a -** written agreement between you and Nokia. +** 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 |