diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:48:43 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:48:43 +0200 |
commit | 87e5e24f52f0702620cd6ff656db540f01a28cc5 (patch) | |
tree | 7f83b2423b1a06b21085a76da3347088ca30e8cf /src/multimedia/audio | |
parent | c5ebfb0c19deff34eea5099ba59750b746257d71 (diff) | |
parent | 46a83d5b86a792e62f14674e27c5d95695f2b44d (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I1373622a6d1fd0e2d35df2da79860a373056387f
Diffstat (limited to 'src/multimedia/audio')
-rw-r--r-- | src/multimedia/audio/qsoundeffect_qaudio_p.cpp | 1 |
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), |