diff options
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo.cpp | 5 | ||||
| -rw-r--r-- | src/multimedia/audio/qsoundeffect_qmedia_p.cpp | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp index 695ab6cff..13e7fab88 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo.cpp @@ -63,8 +63,8 @@ class QAudioDeviceInfoPrivate : public QSharedData { public: QAudioDeviceInfoPrivate() - : info(0), - mode(QAudio::AudioOutput) + : mode(QAudio::AudioOutput) + , info(0) { } @@ -203,6 +203,7 @@ bool QAudioDeviceInfo::operator ==(const QAudioDeviceInfo &other) const && d->handle == other.d->handle && deviceName() == other.deviceName()) return true; + return false; } /*! diff --git a/src/multimedia/audio/qsoundeffect_qmedia_p.cpp b/src/multimedia/audio/qsoundeffect_qmedia_p.cpp index 11de26b04..dd83f60f1 100644 --- a/src/multimedia/audio/qsoundeffect_qmedia_p.cpp +++ b/src/multimedia/audio/qsoundeffect_qmedia_p.cpp @@ -212,6 +212,7 @@ void QSoundEffectPrivate::mediaStatusChanged(QMediaPlayer::MediaStatus status) void QSoundEffectPrivate::error(QMediaPlayer::Error err) { + Q_UNUSED(err); bool playingDirty = false; if (m_playing) { m_playing = false; |