diff options
author | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-05-21 09:08:26 +0300 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-05-23 11:18:16 +0200 |
commit | 93f609ee36a03ad4ff2162cf45e381f4eb78c78b (patch) | |
tree | 4629ca8ff52930def02c882085b27614e9960e5c /simpletest | |
parent | caff2617fc831a3a3b6c8ef43a2b7b098df16a03 (diff) |
Fixed licenses
Updated licenses using replace-licenses.zsh from mkdist repo.
Possible copyright and contact changes will come later.
Reviewed-by: Janne Anttila <janne.anttila@digia.com>;
Sergio Ahumada <sergio.ahumada@digia.com>
Change-Id: Ibc6f318932ef6fbd46a9a01f133124ba7a80424f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'simpletest')
-rw-r--r-- | simpletest/tst_simple_mimetypes.cpp | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/simpletest/tst_simple_mimetypes.cpp b/simpletest/tst_simple_mimetypes.cpp index 4d18c8d..bd356c3 100644 --- a/simpletest/tst_simple_mimetypes.cpp +++ b/simpletest/tst_simple_mimetypes.cpp @@ -7,32 +7,33 @@ ** This file is part of the QtMimeTypes addon of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** 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. -** -** -** +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. ** ** ** $QT_END_LICENSE$ |