slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved zoom related properties out of QCameraFocusControl

Browse Source 
Change-Id: I16f9b80ebbacc0b325530e81c291dc030763b65e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-01-24 10:56:52 +10:00
committed by Qt by Nokia
parent 817fb006c7
commit 155c48b97e
11 changed files with 539 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/unit/qcamera/tst_qcamera.cpp
View File

@@ -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);
}