diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-17 23:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-17 23:00:11 (GMT) |
| commit | 7727a0288c1ffb40ecff13e7bfc49ce99b984633 (patch) | |
| tree | d94518fa3c56bdfc07f015e2acf779904dbe648d /doc/src/snippets/code | |
| parent | 569b076bb650c5082109d6406616c7536ac9f79f (diff) | |
| parent | cca7c5b40751e2192ba2c7c7422557eeb5672a17 (diff) | |
| download | Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.zip Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.tar.gz Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_fdl.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
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 |