diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-06 05:33:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-06 05:33:52 (GMT) |
| commit | a70ccc4aaad74dbf28569c78479d4668781bb0fe (patch) | |
| tree | b45502bbbcdcbf9359995ba3ae7f093da11300c9 | |
| parent | 4a00c77f1e7c93519a8bb7cea09849d911b51607 (diff) | |
| parent | d3dc2ab3e0ee6bca8eca374e3cb3b3f4c7d0c34e (diff) | |
| download | Qt-a70ccc4aaad74dbf28569c78479d4668781bb0fe.zip Qt-a70ccc4aaad74dbf28569c78479d4668781bb0fe.tar.gz Qt-a70ccc4aaad74dbf28569c78479d4668781bb0fe.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix license header.
| -rw-r--r-- | doc/src/examples/wheel.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/examples/wheel.qdoc b/doc/src/examples/wheel.qdoc index 1ea85fc..992aba6 100644 --- a/doc/src/examples/wheel.qdoc +++ b/doc/src/examples/wheel.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 |