diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-10-21 07:45:43 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-24 14:34:31 +0300 |
commit | fdda1c3d4afc92cc93d1e406c7f2ffd44f199d1c (patch) | |
tree | 7ce660622669fa40e911c81e3607b8cd904225ed /src/multimedia/platform/qplatformvideosink_p.h | |
parent | 64d037affdcbf29eaae2f35a7f6d11f19433c4a6 (diff) |
Revert "Update commercial license headers"
This reverts commit 68156303e7341bf39f4b9f9aa21ec7b17d63311a.
Revert of commercial license headers is required for the
Qt 6.2.x opensource releases, Qt 6.2.5 onwards.
Task-number: QTBUG-107760
Change-Id: I966f99c73d0e8491bbcc7b1ca77e3f1ddc2336da
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/multimedia/platform/qplatformvideosink_p.h')
-rw-r--r-- | src/multimedia/platform/qplatformvideosink_p.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/multimedia/platform/qplatformvideosink_p.h b/src/multimedia/platform/qplatformvideosink_p.h index 6f4b32a8e..859b5afef 100644 --- a/src/multimedia/platform/qplatformvideosink_p.h +++ b/src/multimedia/platform/qplatformvideosink_p.h @@ -1,12 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2022 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $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 @@ -15,27 +14,28 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** $QT_END_LICENSE$ -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 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-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** +** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef QPLATFORMVIDEOSINK_H #define QPLATFORMVIDEOSINK_H |