diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 09:50:11 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 09:50:11 +0100 |
commit | 02b8c7527a88d1cfaed296b856fce63fd62a6c9e (patch) | |
tree | 145ab0eb1bee64b07097279360c3bd66ab061c59 /tests/auto/integration/qaudiooutput | |
parent | c9a841a37614cc2b4f70df935fc097d4627f04a3 (diff) | |
parent | 8d84a30e4d5ebec6e9c921ca855fc0cc5f1d9269 (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I01940fe4f3d059fbb425492a1748e2b5d9b6804b
Diffstat (limited to 'tests/auto/integration/qaudiooutput')
-rw-r--r-- | tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index 81aa97d91..07043e9ce 100644 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp @@ -702,11 +702,11 @@ void tst_QAudioOutput::push() QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after receiving data"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after receiving data"); firstBuffer = false; + stateSignal.clear(); } } else QTest::qWait(20); } - stateSignal.clear(); // Wait until playback finishes QTest::qWait(3000); // 3 seconds should be plenty |