diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-11-18 10:46:58 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-11-18 10:46:58 (GMT) |
| commit | 7b11aaf3c4e95afd4eacd84296705557d8467a9d (patch) | |
| tree | c5d70b51358efaf8dd64ccedbdd5eda8af483579 /doc/src/snippets | |
| parent | 2c40c98a5b3ff4f16c4ad71b5707d5271945819e (diff) | |
| parent | 7727a0288c1ffb40ecff13e7bfc49ce99b984633 (diff) | |
| download | Qt-7b11aaf3c4e95afd4eacd84296705557d8467a9d.zip Qt-7b11aaf3c4e95afd4eacd84296705557d8467a9d.tar.gz Qt-7b11aaf3c4e95afd4eacd84296705557d8467a9d.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Diffstat (limited to 'doc/src/snippets')
| -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 |