diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-04 13:42:52 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-04 13:42:52 (GMT) |
| commit | 7cc2e423d39c3b519279d21cd3881f1a135913fd (patch) | |
| tree | 26bc8b14cfd44db8a3815b9e4c6faff63043e4f8 /src/corelib/global | |
| parent | 43e6ec9f01693044f7bc1c3954e2d6bcd70dc148 (diff) | |
| parent | 8c054ec17ac04bf56052e0c163afe7922bf2a361 (diff) | |
| download | Qt-7cc2e423d39c3b519279d21cd3881f1a135913fd.zip Qt-7cc2e423d39c3b519279d21cd3881f1a135913fd.tar.gz Qt-7cc2e423d39c3b519279d21cd3881f1a135913fd.tar.bz2 | |
Merge branch '4.7' of ../qt-doc-team-licenses into 4.7
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qendian.qdoc | 10 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/global/qendian.qdoc b/src/corelib/global/qendian.qdoc index 795ff81..ecdaf9f 100644 --- a/src/corelib/global/qendian.qdoc +++ b/src/corelib/global/qendian.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 diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index b0c0e34..ad0ffd7 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.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 |