diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-07-19 10:40:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-19 03:06:23 +0200 |
| commit | eccb43d73c08b85bab89d8f632d423b63592e14f (patch) | |
| tree | e16b44f1548a48f49b64c58263dd067b67232a8e /tests/auto/qcamerabackend | |
| parent | 1403a1c7be7892ad4d1c5d04c143a318055fb36b (diff) | |
Remove a few more obsolete parts.
Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d
Reviewed-on: http://codereview.qt.nokia.com/1797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'tests/auto/qcamerabackend')
| -rw-r--r-- | tests/auto/qcamerabackend/qcamerabackend.pro | 5 | ||||
| -rw-r--r-- | tests/auto/qcamerabackend/tst_qcamerabackend.cpp | 22 |
2 files changed, 2 insertions, 25 deletions
diff --git a/tests/auto/qcamerabackend/qcamerabackend.pro b/tests/auto/qcamerabackend/qcamerabackend.pro index 80e853d8b..3162b5443 100644 --- a/tests/auto/qcamerabackend/qcamerabackend.pro +++ b/tests/auto/qcamerabackend/qcamerabackend.pro @@ -7,9 +7,4 @@ QT += multimediakit-private SOURCES += tst_qcamerabackend.cpp -symbian { - TARGET.CAPABILITY = ALL -TCB - TARGET.EPOCHEAPSIZE = 0x20000 0x3000000 -} - maemo*:CONFIG += insignificant_test diff --git a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/qcamerabackend/tst_qcamerabackend.cpp index 5497edad0..ef900290c 100644 --- a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/qcamerabackend/tst_qcamerabackend.cpp @@ -538,7 +538,7 @@ void tst_QCameraBackend::testCameraCaptureMetadata() void tst_QCameraBackend::testExposureCompensation() { -#if !defined(Q_WS_MAEMO_6) && !defined(Q_WS_MAEMO_5) && !defined(Q_OS_SYMBIAN) +#if !defined(Q_WS_MAEMO_6) QSKIP("Capture exposure parameters are supported only on mobile platforms", SkipAll); #endif @@ -547,12 +547,6 @@ void tst_QCameraBackend::testExposureCompensation() QSignalSpy exposureCompensationSignal(exposure, SIGNAL(exposureCompensationChanged(qreal))); -#ifdef Q_OS_SYMBIAN - // Camera needs to be started, see: QTMOBILITY-1566 - camera.load(); - QTRY_COMPARE(camera.status(), QCamera::LoadedStatus); -#endif // Q_OS_SYMBIAN - //it should be possible to set exposure parameters in Unloaded state QCOMPARE(exposure->exposureCompensation()+1.0, 1.0); exposure->setExposureCompensation(1.0); @@ -591,7 +585,7 @@ void tst_QCameraBackend::testExposureCompensation() void tst_QCameraBackend::testExposureMode() { -#if !defined(Q_WS_MAEMO_6) && !defined(Q_WS_MAEMO_5) && !defined(Q_OS_SYMBIAN) +#if !defined(Q_WS_MAEMO_6) QSKIP("Capture exposure parameters are supported only on mobile platforms", SkipAll); #endif @@ -603,12 +597,6 @@ void tst_QCameraBackend::testExposureMode() #endif QCOMPARE(exposure->exposureMode(), QCameraExposure::ExposureAuto); -#ifdef Q_OS_SYMBIAN - // Camera needs to be started, see: QTMOBILITY-1566 - camera.load(); - QTRY_COMPARE(camera.status(), QCamera::LoadedStatus); -#endif // Q_OS_SYMBIAN - // Night exposure->setExposureMode(QCameraExposure::ExposureNight); QCOMPARE(exposure->exposureMode(), QCameraExposure::ExposureNight); @@ -619,12 +607,6 @@ void tst_QCameraBackend::testExposureMode() camera.unload(); QTRY_COMPARE(camera.status(), QCamera::UnloadedStatus); -#ifdef Q_OS_SYMBIAN - // Camera needs to be started, see: QTMOBILITY-1566 - camera.load(); - 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); |