diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2011-06-10 15:45:42 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-05 06:49:35 +0200 |
| commit | a3ec7105dc096309a844f36c13229d29270d3401 (patch) | |
| tree | aafcefe92307145f46a1ace2ae8f37b45b21c9db /tests/auto | |
| parent | e94afd6cf2004c7d5ece6fe15e4298560079c353 (diff) | |
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
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qcamerabackend/tst_qcamerabackend.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/qcamerabackend/tst_qcamerabackend.cpp index 3fe3c7520..5497edad0 100644 --- a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/qcamerabackend/tst_qcamerabackend.cpp @@ -222,6 +222,11 @@ void tst_QCameraBackend::testCameraStates() QTRY_COMPARE(camera.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(); QCOMPARE(camera.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); #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 exposure->setExposureMode(QCameraExposure::ExposureAuto); QCOMPARE(exposure->exposureMode(), QCameraExposure::ExposureAuto); |