diff options
author | Topi Reinio <topi.reinio@theqtcompany.com> | 2016-04-26 12:44:45 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@theqtcompany.com> | 2016-05-03 12:31:46 +0000 |
commit | 307b6bec8b73f780a14b13f8dccf0f2cb79bc63c (patch) | |
tree | 0dcfe3a8129370664f8981d4f9da7fc782805469 /basicsuite/mediaplayer/Effects/EffectToon.qml | |
parent | c5f8197bd3a4fef592f6b78e2e2b1dba17bd8d99 (diff) |
Update license headers
- Update Copyright year and holder, unify license text formatting
- Update BSD, LGPL licenses for files originating from Qt
repositories
Change-Id: Id77f62f754c3bb29bb4b1c816e3f984a087ee87e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'basicsuite/mediaplayer/Effects/EffectToon.qml')
-rwxr-xr-x | basicsuite/mediaplayer/Effects/EffectToon.qml | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/basicsuite/mediaplayer/Effects/EffectToon.qml b/basicsuite/mediaplayer/Effects/EffectToon.qml index 9a1eb56..5ee9a85 100755 --- a/basicsuite/mediaplayer/Effects/EffectToon.qml +++ b/basicsuite/mediaplayer/Effects/EffectToon.qml @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Mobility Components. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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://www.qt.io/licensing. For further information -** use the contact form at http://www.qt.io/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** 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. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company 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. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ |