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

Conflicts:
	tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp

Change-Id: I4a30fc030c25e7b8da3eb9f386c4a5fa468df141

6 files changed, 11 insertions, 11 deletions

diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp
index bc6b6215b..07165240b 100644
--- a/src/multimedia/audio/qaudioinput.cpp
+++ b/src/multimedia/audio/qaudioinput.cpp
@@ -338,7 +338,8 @@ int QAudioInput::notifyInterval() const
 */
 void QAudioInput::setVolume(qreal volume)
 {
-    d->setVolume(volume);
+    qreal v = qBound(qreal(0.0), volume, qreal(1.0));
+    d->setVolume(v);
 }
 
 /*!
diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp
index 585855ace..e96d24dd7 100644
--- a/src/multimedia/audio/qaudiooutput.cpp
+++ b/src/multimedia/audio/qaudiooutput.cpp
@@ -355,7 +355,8 @@ QAudio::State QAudioOutput::state() const
 */
 void QAudioOutput::setVolume(qreal volume)
 {
-    d->setVolume(volume);
+    qreal v = qBound(qreal(0.0), volume, qreal(1.0));
+    d->setVolume(v);
 }
 
 /*!
diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp
index f653de86e..f7237679b 100644
--- a/src/multimedia/audio/qsoundeffect.cpp
+++ b/src/multimedia/audio/qsoundeffect.cpp
@@ -279,11 +279,7 @@ qreal QSoundEffect::volume() const
  */
 void QSoundEffect::setVolume(qreal volume)
 {
-    if (volume < qreal(0.0) || volume > qreal(1.0)) {
-        qWarning("SoundEffect: volume should be between 0.0 and 1.0");
-        return;
-    }
-
+    volume = qBound(qreal(0.0), volume, qreal(1.0));
     if (qFuzzyCompare(d->volume(), volume))
         return;
 
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
index 67ce123d8..7de90d9a1 100644
--- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
+++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
@@ -74,7 +74,7 @@ void QMediaNetworkPlaylistProviderPrivate::_q_handleParserError(QPlaylistFilePar
 
     QMediaPlaylist::Error playlistError = QMediaPlaylist::NoError;
 
-    switch ((QPlaylistFileParser::ParserError)err) {
+    switch (err) {
     case QPlaylistFileParser::NoError:
         return;
     case QPlaylistFileParser::FormatError:
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index edccd30ef..08f194be7 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -962,8 +962,8 @@ void QMediaPlayer::setPlaybackRate(qreal rate)
     Sets the current \a media source.
 
     If a \a stream is supplied; media data will be read from it instead of resolving the media
-    source.  In this case the media source may still be used to resolve additional information
-    about the media such as mime type.
+    source. In this case the media source may still be used to resolve additional information
+    about the media such as mime type. The \a stream must be open and readable.
 
     Setting the media to a null QMediaContent will cause the player to discard all
     information relating to the current media source and to cease all I/O operations related
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index a5f4c15ce..65eaed159 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -569,8 +569,10 @@ void QMediaRecorder::setVolume(qreal volume)
 {
     Q_D(QMediaRecorder);
 
-    if (d->control)
+    if (d->control) {
+        volume = qMax(qreal(0.0), volume);
         d->control->setVolume(volume);
+    }
 }
 
 /*!