diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-03-05 11:00:10 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-05 03:08:42 +0100 |
commit | 362e4438966ec0d643702db5ce6c9f517a2a5ffa (patch) | |
tree | aaedb551bb3742a2eb6be5cdf17ecf8a2803ed29 /tests/auto | |
parent | 707be633619906e0e53ac8e2b577714447179a3e (diff) |
Fix some memory leaks.
Adjusted a unit test or two to make leaks easier to find, and then fixed
a few leaks.
Change-Id: I47a20df8de7cac113d34a2015f76a65ab957dedd
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp | 4 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp index 17162b48c..dbea83f3f 100644 --- a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp @@ -891,6 +891,8 @@ void tst_QMediaPlayer::testPlaylist() QCOMPARE(player->media(), content2); } + delete playlist; + delete playlist2; } void tst_QMediaPlayer::testPlayerFlags() @@ -1081,6 +1083,8 @@ void tst_QMediaPlayer::testPositionPropertyWatch() positionSpy.clear(); QTRY_COMPARE(positionSpy.count(), 0); + + delete playlist; } void tst_QMediaPlayer::debugEnums() diff --git a/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h b/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h index 7d2307316..4ff8c0772 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h +++ b/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h @@ -62,11 +62,11 @@ public: mockAvailabilityControl(availability), hasControls(true) { - mockAudioEndpointSelector = new MockAudioEndpointSelector(parent); - mockAudioEncoderControl = new MockAudioEncoderControl(parent); - mockFormatControl = new MockMediaContainerControl(parent); - mockVideoEncoderControl = new MockVideoEncoderControl(parent); - mockMetaDataControl = new MockMetaDataWriterControl(parent); + mockAudioEndpointSelector = new MockAudioEndpointSelector(this); + mockAudioEncoderControl = new MockAudioEncoderControl(this); + mockFormatControl = new MockMediaContainerControl(this); + mockVideoEncoderControl = new MockVideoEncoderControl(this); + mockMetaDataControl = new MockMetaDataWriterControl(this); } QMediaControl* requestControl(const char *name) |