Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: I01940fe4f3d059fbb425492a1748e2b5d9b6804b
2016-01-19 09:50:11 +01:00
parent c9a841a376 8d84a30e4d
commit 02b8c7527a
6 changed files with 8 additions and 10 deletions
--- 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