Harmattan resource policy bug workaround for QCamera
Task-number: 264400 Reviewed-by: Michael Goddard (cherry picked from commit 505db43a64aa765dfaabb8e0463eff3c26895bdb) Change-Id: I9b73b0e3751debedcf2929a0aaa431b3bd08c20e Reviewed-on: http://codereview.qt.nokia.com/975 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard
This commit is contained in:
committed by
Qt by Nokia
parent
e94afd6cf2
commit
a3ec7105dc
@@ -222,6 +222,11 @@ void tst_QCameraBackend::testCameraStates()
|
|||||||
QTRY_COMPARE(camera.status(), QCamera::UnloadedStatus);
|
QTRY_COMPARE(camera.status(), QCamera::UnloadedStatus);
|
||||||
QCOMPARE(statusChangedSignal.last().first().value<QCamera::Status>(), QCamera::UnloadedStatus);
|
QCOMPARE(statusChangedSignal.last().first().value<QCamera::Status>(), QCamera::UnloadedStatus);
|
||||||
|
|
||||||
|
#ifdef Q_WS_MAEMO_6
|
||||||
|
//resource policy doesn't work correctly when resource is released and immediately requested again.
|
||||||
|
QTest::qWait(250);
|
||||||
|
#endif
|
||||||
|
|
||||||
camera.start();
|
camera.start();
|
||||||
QCOMPARE(camera.state(), QCamera::ActiveState);
|
QCOMPARE(camera.state(), QCamera::ActiveState);
|
||||||
QCOMPARE(stateChangedSignal.last().first().value<QCamera::State>(), QCamera::ActiveState);
|
QCOMPARE(stateChangedSignal.last().first().value<QCamera::State>(), QCamera::ActiveState);
|
||||||
@@ -620,6 +625,11 @@ void tst_QCameraBackend::testExposureMode()
|
|||||||
QTRY_COMPARE(camera.status(), QCamera::LoadedStatus);
|
QTRY_COMPARE(camera.status(), QCamera::LoadedStatus);
|
||||||
#endif // Q_OS_SYMBIAN
|
#endif // Q_OS_SYMBIAN
|
||||||
|
|
||||||
|
#ifdef Q_WS_MAEMO_6
|
||||||
|
//resource policy doesn't work correctly when resource is released and immediately requested again.
|
||||||
|
QTest::qWait(250);
|
||||||
|
#endif
|
||||||
|
|
||||||
// Auto
|
// Auto
|
||||||
exposure->setExposureMode(QCameraExposure::ExposureAuto);
|
exposure->setExposureMode(QCameraExposure::ExposureAuto);
|
||||||
QCOMPARE(exposure->exposureMode(), QCameraExposure::ExposureAuto);
|
QCOMPARE(exposure->exposureMode(), QCameraExposure::ExposureAuto);
|
||||||
|
|||||||
Reference in New Issue
Block a user