diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-17 05:36:21 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-17 05:36:21 (GMT) |
| commit | 24c075c1a2d57c2a3158d251daad7b8578cc93e1 (patch) | |
| tree | 8abc8d6ef75293924af2956cbc006f6cfce1f4d6 /doc/src | |
| parent | ce06345c23d0f66bfa9cb5da1279a9efcb002474 (diff) | |
| download | Qt-24c075c1a2d57c2a3158d251daad7b8578cc93e1.zip Qt-24c075c1a2d57c2a3158d251daad7b8578cc93e1.tar.gz Qt-24c075c1a2d57c2a3158d251daad7b8578cc93e1.tar.bz2 | |
Fix license text.
Reviewed-by: Trust Me
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/whatsnew.qdoc | 10 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_fdl.qdoc | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc index f8d1d0e..df0e999 100644 --- a/doc/src/declarative/whatsnew.qdoc +++ b/doc/src/declarative/whatsnew.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 diff --git a/doc/src/snippets/code/doc_src_fdl.qdoc b/doc/src/snippets/code/doc_src_fdl.qdoc index 3c15dfe..b55e663 100644 --- a/doc/src/snippets/code/doc_src_fdl.qdoc +++ b/doc/src/snippets/code/doc_src_fdl.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 |