diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-24 10:56:52 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-27 08:26:47 +0100 |
| commit | 155c48b97e7ff5f4d70b777e0a954f42826276f0 (patch) | |
| tree | 69caa387b99025df91fe57e8617e1dbc55c82f89 /tests/auto/unit/qcamera/tst_qcamera.cpp | |
| parent | 817fb006c7583a852ca07df004994d1a5226d162 (diff) | |
Moved zoom related properties out of QCameraFocusControl
Change-Id: I16f9b80ebbacc0b325530e81c291dc030763b65e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto/unit/qcamera/tst_qcamera.cpp')
| -rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index c244bfa50..5e9399b7d 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -290,7 +290,7 @@ void tst_QCamera::testSimpleCameraFocus() QVERIFY(!cameraFocus->isFocusModeSupported(QCameraFocus::InfinityFocus)); QCOMPARE(cameraFocus->focusMode(), QCameraFocus::AutoFocus); - QTest::ignoreMessage(QtWarningMsg, "Focus points mode selection is not supported"); + QTest::ignoreMessage(QtWarningMsg, "Focus mode selection is not supported"); cameraFocus->setFocusMode(QCameraFocus::ContinuousFocus); QCOMPARE(cameraFocus->focusMode(), QCameraFocus::AutoFocus); @@ -308,7 +308,7 @@ void tst_QCamera::testSimpleCameraFocus() QVERIFY(!cameraFocus->isFocusPointModeSupported(QCameraFocus::FocusPointAuto)); QCOMPARE(cameraFocus->focusPointMode(), QCameraFocus::FocusPointAuto); - + QTest::ignoreMessage(QtWarningMsg, "Focus points mode selection is not supported"); cameraFocus->setFocusPointMode( QCameraFocus::FocusPointCenter ); QCOMPARE(cameraFocus->focusPointMode(), QCameraFocus::FocusPointAuto); @@ -1751,7 +1751,7 @@ void tst_QCamera::testfocusZonesChangedSignal() QVERIFY(cameraFocus != 0); QSignalSpy spy(cameraFocus,SIGNAL(focusZonesChanged())); - cameraFocus->zoomTo(5.0,6.0); + cameraFocus->setCustomFocusPoint(QPointF(0.1, 0.1)); QVERIFY(spy.count() == 1); } |