diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-12 16:27:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 00:58:30 +0100 |
| commit | 53d71baed324d43bf5bac1fd50fc2eb4764b3857 (patch) | |
| tree | d60dc8f9829959a555ad071e19a0d15b2d251339 /tests/auto/unit | |
| parent | a6268601c907c56555ae42668e983a447c0da2eb (diff) | |
Changed QCamera::captureMode property to QFlags
This enables the expression of extra camera modes like
viewfinder only or capture during video recording.
Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'tests/auto/unit')
| -rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 10 | ||||
| -rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameracontrol.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 60de17788..4ed64dc92 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -1123,7 +1123,7 @@ void tst_QCamera::testConstructorWithDefaultProvider() void tst_QCamera::testCaptureModeChanged_signal() { MockCameraControl *m_cameraControl= new MockCameraControl(this); - QSignalSpy spy(m_cameraControl, SIGNAL(captureModeChanged(QCamera::CaptureMode))); + QSignalSpy spy(m_cameraControl, SIGNAL(captureModeChanged(QCamera::CaptureModes))); QVERIFY(spy.size() == 0); m_cameraControl->setCaptureMode(QCamera::CaptureVideo); @@ -1331,7 +1331,7 @@ void tst_QCamera::testUnlockWithType() QVERIFY(lockStatus == QCamera::Unlocked); } -/* Test case for signal captureModeChanged(QCamera::CaptureMode) */ +/* Test case for signal captureModeChanged(QCamera::CaptureModes) */ void tst_QCamera::testCaptureModeChangedSignal() { MockCameraService service; @@ -1339,16 +1339,16 @@ void tst_QCamera::testCaptureModeChangedSignal() QCamera camera(0, provider); QVERIFY(camera.captureMode() == QCamera::CaptureStillImage); - qRegisterMetaType<QCamera::CaptureMode>("QCamera::CaptureMode"); + qRegisterMetaType<QCamera::CaptureModes>("QCamera::CaptureModes"); /* Spy the signal */ - QSignalSpy lockCaptureModeChangedSignal(&camera, SIGNAL(captureModeChanged(QCamera::CaptureMode))); + QSignalSpy lockCaptureModeChangedSignal(&camera, SIGNAL(captureModeChanged(QCamera::CaptureModes))); /* set the capture mode and Verify if the signal is emitted */ camera.setCaptureMode(QCamera::CaptureVideo); QVERIFY(camera.captureMode() == QCamera::CaptureVideo); QCOMPARE(lockCaptureModeChangedSignal.count(), 1); - QCamera::CaptureMode lockCaptureMode = qvariant_cast<QCamera::CaptureMode >(lockCaptureModeChangedSignal.at(0).at(0)); + QCamera::CaptureModes lockCaptureMode = qvariant_cast<QCamera::CaptureModes >(lockCaptureModeChangedSignal.at(0).at(0)); QVERIFY(lockCaptureMode == QCamera::CaptureVideo); } diff --git a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h index 18fb12ae2..a6c1ea1c9 100644 --- a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h @@ -89,8 +89,8 @@ public: QCamera::Status status() const { return m_status; } - QCamera::CaptureMode captureMode() const { return m_captureMode; } - void setCaptureMode(QCamera::CaptureMode mode) + QCamera::CaptureModes captureMode() const { return m_captureMode; } + void setCaptureMode(QCamera::CaptureModes mode) { if (m_captureMode != mode) { if (m_state == QCamera::ActiveState && !m_propertyChangesSupported) @@ -100,7 +100,7 @@ public: } } - bool isCaptureModeSupported(QCamera::CaptureMode mode) const + bool isCaptureModeSupported(QCamera::CaptureModes mode) const { return mode == QCamera::CaptureStillImage || mode == QCamera::CaptureVideo; } @@ -135,7 +135,7 @@ public: } QCamera::State m_state; - QCamera::CaptureMode m_captureMode; + QCamera::CaptureModes m_captureMode; QCamera::Status m_status; bool m_propertyChangesSupported; }; |