diff options
Diffstat (limited to 'tests/auto/unit/qmultimedia_common')
3 files changed, 78 insertions, 1 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockcamera.pri b/tests/auto/unit/qmultimedia_common/mockcamera.pri index dbd7312b2..f6f97de1e 100644 --- a/tests/auto/unit/qmultimedia_common/mockcamera.pri +++ b/tests/auto/unit/qmultimedia_common/mockcamera.pri @@ -18,7 +18,8 @@ HEADERS *= \ ../qmultimedia_common/mockimageencodercontrol.h \ ../qmultimedia_common/mockcameracontrol.h \ ../qmultimedia_common/mockvideodeviceselectorcontrol.h \ - ../qmultimedia_common/mockcamerainfocontrol.h + ../qmultimedia_common/mockcamerainfocontrol.h \ + ../qmultimedia_common/mockcameraviewfindersettingscontrol.h include(mockvideo.pri) diff --git a/tests/auto/unit/qmultimedia_common/mockcameraservice.h b/tests/auto/unit/qmultimedia_common/mockcameraservice.h index f9ffcfdce..28fa0fd4d 100644 --- a/tests/auto/unit/qmultimedia_common/mockcameraservice.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraservice.h @@ -51,6 +51,7 @@ #include "../qmultimedia_common/mockvideowindowcontrol.h" #include "../qmultimedia_common/mockvideodeviceselectorcontrol.h" #include "../qmultimedia_common/mockcamerainfocontrol.h" +#include "../qmultimedia_common/mockcameraviewfindersettingscontrol.h" class MockSimpleCameraService : public QMediaService { @@ -101,6 +102,7 @@ public: windowControl = new MockVideoWindowControl(this); mockVideoDeviceSelectorControl = new MockVideoDeviceSelectorControl(this); mockCameraInfoControl = new MockCameraInfoControl(this); + mockViewfinderSettingsControl = new MockCameraViewfinderSettingsControl(this); rendererRef = 0; windowRef = 0; } @@ -162,6 +164,11 @@ public: return windowControl; } } + + if (qstrcmp(iid, QCameraViewfinderSettingsControl2_iid) == 0) { + return mockViewfinderSettingsControl; + } + return 0; } @@ -188,6 +195,7 @@ public: MockVideoWindowControl *windowControl; MockVideoDeviceSelectorControl *mockVideoDeviceSelectorControl; MockCameraInfoControl *mockCameraInfoControl; + MockCameraViewfinderSettingsControl *mockViewfinderSettingsControl; int rendererRef; int windowRef; }; diff --git a/tests/auto/unit/qmultimedia_common/mockcameraviewfindersettingscontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraviewfindersettingscontrol.h new file mode 100644 index 000000000..49b323202 --- /dev/null +++ b/tests/auto/unit/qmultimedia_common/mockcameraviewfindersettingscontrol.h @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $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 +** 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 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 +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MOCKCAMERAVIEWFINDERSETTINGSCONTROL_H +#define MOCKCAMERAVIEWFINDERSETTINGSCONTROL_H + +#include "qcameraviewfindersettingscontrol.h" + +class MockCameraViewfinderSettingsControl : public QCameraViewfinderSettingsControl2 +{ + Q_OBJECT +public: + MockCameraViewfinderSettingsControl(QObject *parent = 0): + QCameraViewfinderSettingsControl2(parent) + { + } + + ~MockCameraViewfinderSettingsControl() {} + + QCameraViewfinderSettings viewfinderSettings() const + { + return settings; + } + + void setViewfinderSettings(const QCameraViewfinderSettings &s) + { + settings = s; + } + + QList<QCameraViewfinderSettings> supportedViewfinderSettings() const + { + return QList<QCameraViewfinderSettings>(); + } + + QCameraViewfinderSettings settings; +}; + +#endif // MOCKCAMERAVIEWFINDERSETTINGSCONTROL_H |