diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-02-08 11:54:11 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 04:38:16 +0100 |
commit | e241932c974f4b5e36052e4a37e718d9ec3c227b (patch) | |
tree | 741c280363e085a2477a4aae8ddd43f0897d2995 /tests/auto/unit/qmediarecorder | |
parent | 6de7c3104006c3aa919a697bc94ec99a3f0c4140 (diff) |
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 <jonas.rabbe@nokia.com>
Diffstat (limited to 'tests/auto/unit/qmediarecorder')
-rw-r--r-- | tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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); |