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

Change-Id: I1373622a6d1fd0e2d35df2da79860a373056387f
2015-10-02 13:48:43 +02:00
parent c5ebfb0c19 46a83d5b86
commit 87e5e24f52
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),