slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed crash when QCameraImageCapture is deleted before QMediaRecorder.

Browse Source 
Change-Id: I3bbb87f03f122378e9367e1f2c0cc5b61fce6ed7
Reviewed-on: http://codereview.qt.nokia.com/3550
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2011-08-25 13:56:05 +10:00
committed by Qt by Nokia
parent ba62df130c
commit 47a5dd4371
3 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp
View File

@@ -107,6 +107,7 @@ public slots:
private slots:
void constructor();
void mediaObject();
void deleteMediaObject();
void isReadyForCapture();
void capture();
void cancelCapture();
@@ -165,6 +166,29 @@ void tst_QCameraImageCapture::mediaObject()
QCOMPARE(medobj1, &camera1);
}
void tst_QCameraImageCapture::deleteMediaObject()
{
MockMediaServiceProvider *provider = new MockMediaServiceProvider;
provider->service = new MockCameraService;
QCamera *camera = new QCamera(0, provider);
QCameraImageCapture *capture = new QCameraImageCapture(camera);
QVERIFY(capture->mediaObject() == camera);
QVERIFY(capture->isAvailable());
delete camera;
delete provider->service;
delete provider;
//capture should detach from camera
QVERIFY(capture->mediaObject() == 0);
QVERIFY(!capture->isAvailable());
capture->capture();
delete capture;
}
//MaemoAPI-1825:test isReadyForCapture
void tst_QCameraImageCapture::isReadyForCapture()
{