summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2012-02-06 14:58:47 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-06 06:32:03 +0100
commit0d9a5cc5b39db46701af1a6944c8c6f31e75ae6f (patch)
tree6ad5f1cb8f913ef5dca8ae8c916a0f3ba8683190
parent809bbc35c67f085e91db9202795cccab0a5ae548 (diff)
Fix some warnings.
Change-Id: I2ea7f6f016d34490a41e4c9449cbc92bd040de49 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
-rw-r--r--src/multimedia/audio/qaudiodeviceinfo.cpp5
-rw-r--r--src/multimedia/audio/qsoundeffect_qmedia_p.cpp1
2 files changed, 4 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 695ab6cf..13e7fab8 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 11de26b0..dd83f60f 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;