diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-10-04 14:17:55 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-10-04 14:17:55 (GMT) |
| commit | 1a1567964cb78ea966c3b856091def5c77863486 (patch) | |
| tree | b635cd4475494052a2d92115340c994314f226cc /doc/src/declarative/javascriptblocks.qdoc | |
| parent | 8540ceb8c98fa225394385b6147b662adb67b58c (diff) | |
| parent | 3ea28c383846a4af67ddd0c7d33dad0537a9972e (diff) | |
| download | Qt-1a1567964cb78ea966c3b856091def5c77863486.zip Qt-1a1567964cb78ea966c3b856091def5c77863486.tar.gz Qt-1a1567964cb78ea966c3b856091def5c77863486.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src/declarative/javascriptblocks.qdoc')
| -rw-r--r-- | doc/src/declarative/javascriptblocks.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/declarative/javascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc index d290690..b6fad5b 100644 --- a/doc/src/declarative/javascriptblocks.qdoc +++ b/doc/src/declarative/javascriptblocks.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 |