diff options
Diffstat (limited to 'tests/auto/unit/mockbackend/qmockimagecapture.cpp')
| -rw-r--r-- | tests/auto/unit/mockbackend/qmockimagecapture.cpp | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/tests/auto/unit/mockbackend/qmockimagecapture.cpp b/tests/auto/unit/mockbackend/qmockimagecapture.cpp index 9e2396113..96e53b2f4 100644 --- a/tests/auto/unit/mockbackend/qmockimagecapture.cpp +++ b/tests/auto/unit/mockbackend/qmockimagecapture.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <qmockimagecapture.h> #include <qmockcamera.h> @@ -32,6 +7,8 @@ #include <qimagecapture.h> #include <qcamera.h> +QT_BEGIN_NAMESPACE + QMockImageCapture::QMockImageCapture(QImageCapture *parent) : QPlatformImageCapture(parent) { @@ -48,7 +25,7 @@ int QMockImageCapture::capture(const QString &fileName) m_fileName = fileName; m_captureRequest++; emit readyForCaptureChanged(m_ready = false); - QTimer::singleShot(5, this, SLOT(captured())); + QTimer::singleShot(5, this, &QMockImageCapture::captured); return m_captureRequest; } else { emit error(-1, QImageCapture::NotReadyError, @@ -63,7 +40,7 @@ void QMockImageCapture::captured() emit imageCaptured(m_captureRequest, QImage()); QMediaMetaData metaData; - metaData.insert(QMediaMetaData::Author, QString::fromUtf8("Author")); + metaData.insert(QMediaMetaData::Author, QStringLiteral("Author")); metaData.insert(QMediaMetaData::Date, QDateTime(QDate(2021, 1, 1), QTime())); emit imageMetadataAvailable(m_captureRequest, metaData); @@ -76,3 +53,7 @@ void QMockImageCapture::captured() emit imageSaved(m_captureRequest, m_fileName); } + +QT_END_NAMESPACE + +#include "moc_qmockimagecapture.cpp" |