From 108dda7a90bd0f0337358b0db47ae55acd16dea6 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 20 Nov 2014 17:54:18 +0100 Subject: GStreamer: port to 1.0. 0.10 is still used by default. To enable GStreamer 1.0, pass GST_VERSION=1.0 to qmake for qtmultimedia.pro. Contributions from: Andrew den Exter Ilya Smelykh Jim Hodapp Sergio Schvezov Change-Id: I72a46d1170a8794a149bdb5e20767afcc5b7587c Reviewed-by: Andrew den Exter --- tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp') diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 344f1f5ff..2711ae016 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -495,6 +495,8 @@ void tst_QCameraBackend::testCaptureToBuffer() QCOMPARE(imageCapture.bufferFormat(), QVideoFrame::Format_Jpeg); } + QTRY_VERIFY(imageCapture.isReadyForCapture()); + //Try to capture to both buffer and file #ifdef Q_WS_MAEMO_6 QVERIFY(imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile)); @@ -651,11 +653,11 @@ void tst_QCameraBackend::testVideoRecording() { QFETCH(QByteArray, device); - QCamera *camera = device.isEmpty() ? new QCamera : new QCamera(device); + QScopedPointer camera(device.isEmpty() ? new QCamera : new QCamera(device)); - QMediaRecorder recorder(camera); + QMediaRecorder recorder(camera.data()); - QSignalSpy errorSignal(camera, SIGNAL(error(QCamera::Error))); + QSignalSpy errorSignal(camera.data(), SIGNAL(error(QCamera::Error))); QSignalSpy recorderErrorSignal(&recorder, SIGNAL(error(QMediaRecorder::Error))); QSignalSpy recorderStatusSignal(&recorder, SIGNAL(statusChanged(QMediaRecorder::Status))); @@ -702,8 +704,6 @@ void tst_QCameraBackend::testVideoRecording() camera->setCaptureMode(QCamera::CaptureStillImage); QTRY_COMPARE(recorder.status(), QMediaRecorder::UnloadedStatus); QCOMPARE(recorderStatusSignal.last().first().value(), recorder.status()); - - delete camera; } QTEST_MAIN(tst_QCameraBackend) -- cgit v1.2.3