diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-11-07 11:51:04 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-11-07 13:35:38 +0100 |
commit | cfe9f4be6f2c5529d42686fa67650bae43395e38 (patch) | |
tree | 9c421321ba4b3c3c4417ab075622b35b149d6a1e /doc/src/examples/audiodevices.qdoc | |
parent | 8de152a9e1deb533070663cccf6a98e0d374b1d6 (diff) |
Update to new license format
Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6
Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'doc/src/examples/audiodevices.qdoc')
-rw-r--r-- | doc/src/examples/audiodevices.qdoc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/doc/src/examples/audiodevices.qdoc b/doc/src/examples/audiodevices.qdoc index b65f83e979..b0bec4a52b 100644 --- a/doc/src/examples/audiodevices.qdoc +++ b/doc/src/examples/audiodevices.qdoc @@ -6,21 +6,21 @@ ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License +** 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 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** +** 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$ ** ****************************************************************************/ |