diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:51 +0200 |
| commit | 2cf8ac3398ce97273103bbef0f5538e57b57f66c (patch) | |
| tree | 66143b4501d1ddb37b4cbecdec682491d6339d4a /src/plugins/winrt/qwinrtcameravideorenderercontrol.h | |
| parent | a08bcb3279670f1920c774e9861c34d8f7653625 (diff) | |
| parent | 7fd0fec5e5e2906ee7c9fdfce9181ef81c09d9f1 (diff) | |
| download | qtmultimedia-2cf8ac3398ce97273103bbef0f5538e57b57f66c.tar.gz qtmultimedia-2cf8ac3398ce97273103bbef0f5538e57b57f66c.tar.bz2 qtmultimedia-2cf8ac3398ce97273103bbef0f5538e57b57f66c.zip | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I7ac7db69c37cc9e5c5241a25b9a874986a23a886
Diffstat (limited to 'src/plugins/winrt/qwinrtcameravideorenderercontrol.h')
| -rw-r--r-- | src/plugins/winrt/qwinrtcameravideorenderercontrol.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/plugins/winrt/qwinrtcameravideorenderercontrol.h b/src/plugins/winrt/qwinrtcameravideorenderercontrol.h index 55ea1266..68e9bd9f 100644 --- a/src/plugins/winrt/qwinrtcameravideorenderercontrol.h +++ b/src/plugins/winrt/qwinrtcameravideorenderercontrol.h @@ -5,7 +5,7 @@ ** ** This file is part of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -16,16 +16,19 @@ ** ** 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 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. +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** 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 2.0 or later 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 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. ** ** $QT_END_LICENSE$ ** |