diff options
Diffstat (limited to 'src/plugins/multimedia/android/common/qandroidvideosink.cpp')
| -rw-r--r-- | src/plugins/multimedia/android/common/qandroidvideosink.cpp | 47 |
1 files changed, 6 insertions, 41 deletions
diff --git a/src/plugins/multimedia/android/common/qandroidvideosink.cpp b/src/plugins/multimedia/android/common/qandroidvideosink.cpp index 7cc0fefe4..3da5eab31 100644 --- a/src/plugins/multimedia/android/common/qandroidvideosink.cpp +++ b/src/plugins/multimedia/android/common/qandroidvideosink.cpp @@ -1,44 +1,8 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 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$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qandroidvideosink_p.h" -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QtCore/qdebug.h> @@ -46,8 +10,6 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcMediaVideoSink, "qt.multimedia.videosink") - QAndroidVideoSink::QAndroidVideoSink(QVideoSink *parent) : QPlatformVideoSink(parent) { @@ -65,6 +27,9 @@ void QAndroidVideoSink::setRhi(QRhi *rhi) return; m_rhi = rhi; + emit rhiChanged(rhi); } QT_END_NAMESPACE + +#include "moc_qandroidvideosink_p.cpp" |