diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-14 12:21:07 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-14 12:21:07 (GMT) |
| commit | 6fa7d094f5250c8f8ceb77453280c79b2d227fad (patch) | |
| tree | bc7bc4486962bb4212c4937fa60ee14f43284f2d /doc/src/development/activeqt-dumpcpp.qdoc | |
| parent | 305a764f1db228a49a94a86fabbb5d6b3aa3f8c4 (diff) | |
| parent | f103ad276181090da8c70bd29f4474ea7657e03f (diff) | |
| download | Qt-6fa7d094f5250c8f8ceb77453280c79b2d227fad.zip Qt-6fa7d094f5250c8f8ceb77453280c79b2d227fad.tar.gz Qt-6fa7d094f5250c8f8ceb77453280c79b2d227fad.tar.bz2 | |
Merge commit 'doc-team/4.7' into 4.7
Diffstat (limited to 'doc/src/development/activeqt-dumpcpp.qdoc')
| -rw-r--r-- | doc/src/development/activeqt-dumpcpp.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/development/activeqt-dumpcpp.qdoc b/doc/src/development/activeqt-dumpcpp.qdoc index 5d689eb..843d40d 100644 --- a/doc/src/development/activeqt-dumpcpp.qdoc +++ b/doc/src/development/activeqt-dumpcpp.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 |