diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-10-13 18:05:00 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-10-13 18:16:31 +0200 |
commit | 58cbea0f93af1e613eeeffec68d00c4df0ae4bf9 (patch) | |
tree | b5ff48093222e89c5f148e7fa201c6e07bb48ade /src/plugins/qt7/qt7serviceplugin.h | |
parent | 5e376b135e94dee85787e093d228e59284964ce7 (diff) | |
parent | 762ff94f67a58df6c7c6315268ea64a2d2151f95 (diff) | |
download | qtmultimedia-58cbea0f93af1e613eeeffec68d00c4df0ae4bf9.tar.gz |
Merge remote-tracking branch 'origin/dev' into wip/gstreamer-1.0
Change-Id: Iaa662e89471a1d263dc5a0813534381cee466cca
Diffstat (limited to 'src/plugins/qt7/qt7serviceplugin.h')
-rw-r--r-- | src/plugins/qt7/qt7serviceplugin.h | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/src/plugins/qt7/qt7serviceplugin.h b/src/plugins/qt7/qt7serviceplugin.h index 27475ee96..2e04297ff 100644 --- a/src/plugins/qt7/qt7serviceplugin.h +++ b/src/plugins/qt7/qt7serviceplugin.h @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. ** -** $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://qt.digia.com/licensing. For further information +** 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 ** 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 +** 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. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ |