From a7c23d86362efad27b8dbfd1bc570299dd606fbb Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 31 Oct 2016 10:14:14 +0100 Subject: Cleanup all maemo/meego specific code Change-Id: I6c6f28084c6b030928eebc53c5d0009b168ede6a Reviewed-by: Yoann Lopes --- .../qcamerabackend/tst_qcamerabackend.cpp | 31 ---------------------- 1 file changed, 31 deletions(-) (limited to 'tests') diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 9529f1bc4..5035cb6b1 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -229,11 +229,6 @@ void tst_QCameraBackend::testCameraStates() QTRY_COMPARE(camera.status(), QCamera::UnloadedStatus); QCOMPARE(statusChangedSignal.last().first().value(), 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::ActiveState); @@ -386,10 +381,6 @@ void tst_QCameraBackend::testCaptureToBuffer() camera.load(); -#ifdef Q_WS_MAEMO_6 - QVERIFY(imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer)); -#endif - if (!imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer)) QSKIP("Buffer capture not supported"); @@ -454,11 +445,6 @@ void tst_QCameraBackend::testCaptureToBuffer() imageAvailableSignal.clear(); savedSignal.clear(); - //Capture to yuv buffer -#ifdef Q_WS_MAEMO_6 - QVERIFY(imageCapture.supportedBufferFormats().contains(QVideoFrame::Format_UYVY)); -#endif - if (imageCapture.supportedBufferFormats().contains(QVideoFrame::Format_UYVY)) { imageCapture.setBufferFormat(QVideoFrame::Format_UYVY); QCOMPARE(imageCapture.bufferFormat(), QVideoFrame::Format_UYVY); @@ -493,9 +479,6 @@ void tst_QCameraBackend::testCaptureToBuffer() QTRY_VERIFY(imageCapture.isReadyForCapture()); //Try to capture to both buffer and file -#ifdef Q_WS_MAEMO_6 - QVERIFY(imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile)); -#endif if (imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile)) { imageCapture.setCaptureDestination(QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile); @@ -524,9 +507,7 @@ void tst_QCameraBackend::testCaptureToBuffer() void tst_QCameraBackend::testCameraCaptureMetadata() { -#ifndef Q_WS_MAEMO_6 QSKIP("Capture metadata is supported only on harmattan"); -#endif QCamera camera; QCameraImageCapture imageCapture(&camera); @@ -547,9 +528,7 @@ void tst_QCameraBackend::testCameraCaptureMetadata() void tst_QCameraBackend::testExposureCompensation() { -#if !defined(Q_WS_MAEMO_6) QSKIP("Capture exposure parameters are supported only on mobile platforms"); -#endif QCamera camera; QCameraExposure *exposure = camera.exposure(); @@ -594,16 +573,11 @@ void tst_QCameraBackend::testExposureCompensation() void tst_QCameraBackend::testExposureMode() { -#if !defined(Q_WS_MAEMO_6) QSKIP("Capture exposure parameters are supported only on mobile platforms"); -#endif QCamera camera; QCameraExposure *exposure = camera.exposure(); -#ifdef Q_WS_MAEMO_6 - QEXPECT_FAIL("", "Camerabin reports Manual exposure instead of Auto", Continue); -#endif QCOMPARE(exposure->exposureMode(), QCameraExposure::ExposureAuto); // Night @@ -616,11 +590,6 @@ void tst_QCameraBackend::testExposureMode() camera.unload(); QTRY_COMPARE(camera.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 - // Auto exposure->setExposureMode(QCameraExposure::ExposureAuto); QCOMPARE(exposure->exposureMode(), QCameraExposure::ExposureAuto); -- cgit v1.2.3