Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I469f258c4838f87edaedc8620d925a3c537d1619
2013-08-27 22:44:53 +02:00
parent 48a6a8a043 a2f078f108
commit cb1871d061
13 changed files with 115 additions and 45 deletions
--- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
@@ -369,7 +369,7 @@ void PrivateSoundSource::stateChanged(QAudio::State state)

 qint64 PrivateSoundSource::readData( char* data, qint64 len)
 {
-    if (m_runningCount > 0 && m_playing) {
+    if ((m_runningCount > 0  || m_runningCount == QSoundEffect::Infinite) && m_playing) {

        if (m_sample->state() != QSample::Ready)
            return 0;