diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 09:12:26 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 09:12:26 (GMT) |
| commit | 34c8022c216f6e298b0b0f8250cdf17688534c5b (patch) | |
| tree | dca92c42618bb4c38bb2e0ac70d77598a9c2393d /demos/textedit | |
| parent | c04834ec186f7b2205b52176c11897bfdf8e1395 (diff) | |
| parent | 24c89f6d1c090ab670d4f883d06cd0413c2ecc65 (diff) | |
| download | Qt-34c8022c216f6e298b0b0f8250cdf17688534c5b.zip Qt-34c8022c216f6e298b0b0f8250cdf17688534c5b.tar.gz Qt-34c8022c216f6e298b0b0f8250cdf17688534c5b.tar.bz2 | |
Merge commit 'doc-team/4.7' into 4.7
Diffstat (limited to 'demos/textedit')
| -rw-r--r-- | demos/textedit/textedit.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/demos/textedit/textedit.qdoc b/demos/textedit/textedit.qdoc index f3ba4d7..c27589e 100644 --- a/demos/textedit/textedit.qdoc +++ b/demos/textedit/textedit.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 |