diff options
| author | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-05-21 09:13:03 +0300 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-05-28 13:57:03 +0200 |
| commit | 1bd82349f0b8eef67e04f9592ae2bae954683968 (patch) | |
| tree | cbcbf40ddd16734fac806752fdd4642655bd1542 /doc | |
| parent | 770354700d35a713fe5c35dc4e96ab5675443a20 (diff) | |
Fixed licenses
Updated licenses using replace-licenses.zsh from mkdist repo.
Possible copyright and contact changes will come later.
Change-Id: Ib9f0616600aa0a3461a1aa08b9da8545a85259e9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/index.qdoc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index a3e79d7..18976a7 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -7,20 +7,21 @@ ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** 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. +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** -** GNU Free Documentation License +** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ |