diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-19 10:33:07 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-19 10:33:07 (GMT) |
| commit | 527f67325c200940e403f32b0db8f8c2677a1159 (patch) | |
| tree | c12a152f12c3abcf9f46e4f0dc1784dee127340e /doc/src/snippets/code/doc_src_fdl.qdoc | |
| parent | a26d41fc2732e225dc9a1b5eb5224cc499ae87b4 (diff) | |
| parent | 72378ce571bcb88d0519a1b02d0e543b5237d613 (diff) | |
| download | Qt-527f67325c200940e403f32b0db8f8c2677a1159.zip Qt-527f67325c200940e403f32b0db8f8c2677a1159.tar.gz Qt-527f67325c200940e403f32b0db8f8c2677a1159.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into QTBUG-15333
Diffstat (limited to 'doc/src/snippets/code/doc_src_fdl.qdoc')
| -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 |