summaryrefslogtreecommitdiff
path: root/src/multimedia
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2015-10-06 17:25:15 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-10-06 18:07:28 +0000
commit3727a588eeac37bf8830146efe76695361e6a343 (patch)
treeffaa435afe6d6b2a4a3adec44bf9ff6ae498e8c5 /src/multimedia
parentc2c71716825ef8923c63c11d71ace91a1362ce19 (diff)
parent87e5e24f52f0702620cd6ff656db540f01a28cc5 (diff)
downloadqtmultimedia-3727a588eeac37bf8830146efe76695361e6a343.tar.gz
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/audio/qsoundeffect_qaudio_p.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
index c4776b32d..e95e4e521 100644
--- 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),