From e241932c974f4b5e36052e4a37e718d9ec3c227b Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Wed, 8 Feb 2012 11:54:11 +1000 Subject: Remove some more QTest::qWait(10) calls. Since it seems to have changed slightly recently. Just use QTRY_COMPARE instead. Change-Id: I802c2e26acf5418bb5904fadd2a978a44fd9eb01 Reviewed-by: Jonas Rabbe --- tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/auto/unit/qmediarecorder') diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp index 713159538..220bb20c9 100644 --- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp @@ -718,8 +718,7 @@ void tst_QMediaRecorder::testSettingsApplied() //the settings are applied in the next event loop QMediaRecorder recorder(&object); QCOMPARE(recorderControl.m_settingAppliedCount, 0); - QTest::qWait(10); - QCOMPARE(recorderControl.m_settingAppliedCount, 1); + QTRY_COMPARE(recorderControl.m_settingAppliedCount, 1); QVideoEncoderSettings videoSettings; videoSettings.setResolution(640,480); @@ -732,8 +731,7 @@ void tst_QMediaRecorder::testSettingsApplied() recorder.setContainerFormat("mkv"); QCOMPARE(recorderControl.m_settingAppliedCount, 1); - QTest::qWait(10); - QCOMPARE(recorderControl.m_settingAppliedCount, 2); + QTRY_COMPARE(recorderControl.m_settingAppliedCount, 2); //encoder settings are applied before recording if changed audioSettings.setQuality(QtMultimedia::VeryHighQuality); -- cgit v1.2.3