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

Remove some more QTest::qWait(10) calls.

Browse Source 
Since it seems to have changed slightly recently.  Just use
QTRY_COMPARE instead.

Change-Id: I802c2e26acf5418bb5904fadd2a978a44fd9eb01
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-02-08 11:54:11 +10:00
committed by Qt by Nokia
parent 6de7c31040
commit e241932c97
3 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
View File

@@ -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);