Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6

2015-10-06 17:25:15 +00:00
parent c2c7171682 87e5e24f52
commit 3727a588ee
14 changed files with 489 additions and 132 deletions
--- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
@@ -297,6 +297,7 @@ void QSoundEffectPrivate::setCategory(const QString &category)
 }

 PrivateSoundSource::PrivateSoundSource(QSoundEffectPrivate* s):
+    QIODevice(s),
    m_loopCount(1),
    m_runningCount(0),
    m_playing(false),